From ccc86839b9774934882fec4cbf3428003cf75fd5 Mon Sep 17 00:00:00 2001 From: Duke Date: Fri, 5 Jan 2024 12:48:35 -0800 Subject: [PATCH 001/108] More details about p2p encryption --- doc/overview.md | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/doc/overview.md b/doc/overview.md index 334cfe84b..531f17294 100644 --- a/doc/overview.md +++ b/doc/overview.md @@ -14,7 +14,15 @@ Equihash (200,9) (ASIC) ## P2P -TLS1.3 via WolfSSL is enforced for all network connections as of v3.6.1 +TLS1.3 via WolfSSL is enforced for all network connections as of v3.6.1 . +Many ciphersuites are technically supported by TLS1.3 but many of them +are ancient, proved to be less secure than intended or likely backdoored. + +Hush P2P connections are randomly choosen between these two ciphersuites each +time a new connection to a peer is created: + + * `TLS_AES_256_GCM_SHA384` + * `TLS_CHACHA20_POLY1305_SHA256` ## RPC From a358acab0b1a589cebc45846ab54f7fa751c4820 Mon Sep 17 00:00:00 2001 From: Duke Date: Fri, 5 Jan 2024 13:02:36 -0800 Subject: [PATCH 002/108] More info about ciphersuites --- doc/overview.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/doc/overview.md b/doc/overview.md index 531f17294..7468a2622 100644 --- a/doc/overview.md +++ b/doc/overview.md @@ -17,8 +17,9 @@ Equihash (200,9) (ASIC) TLS1.3 via WolfSSL is enforced for all network connections as of v3.6.1 . Many ciphersuites are technically supported by TLS1.3 but many of them are ancient, proved to be less secure than intended or likely backdoored. +Hush only uses what are widely considered to be the most secure and [best ciphersuites](https://ciphersuite.info/cs/). -Hush P2P connections are randomly choosen between these two ciphersuites each +New Hush P2P connections randomly choose between these two ciphersuites each time a new connection to a peer is created: * `TLS_AES_256_GCM_SHA384` From 4ed576a7e256abb46e15d8f3606dc30ac276d461 Mon Sep 17 00:00:00 2001 From: Duke Date: Fri, 5 Jan 2024 13:06:21 -0800 Subject: [PATCH 003/108] Explain the importance of p2p encryption --- doc/overview.md | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/doc/overview.md b/doc/overview.md index 7468a2622..27d991754 100644 --- a/doc/overview.md +++ b/doc/overview.md @@ -25,6 +25,14 @@ time a new connection to a peer is created: * `TLS_AES_256_GCM_SHA384` * `TLS_CHACHA20_POLY1305_SHA256` +Encrypted P2P connections are important because it means passive network spies, +such as ISPs, cannot tell what nodes are communicating to each other and also +prevents certain attacks against privacy at the network level, such as looking +for which node was the first to relay a transaction. Bitcoin has no protection +against this which is why it's trivial for network spies to tell which node +(and hence which IP address) created a certain transaction and hence which +IP address owns which addresses. + ## RPC Inherited many RPC's from Bitcoin and Zcash with many new ones From 38dc994731fe9a5d9fd9730307ad4c1403d0d17a Mon Sep 17 00:00:00 2001 From: Duke Date: Sat, 6 Jan 2024 21:49:17 -0500 Subject: [PATCH 004/108] Remove unused code --- src/cc/prices.cpp | 71 ----------------------------------------------- 1 file changed, 71 deletions(-) diff --git a/src/cc/prices.cpp b/src/cc/prices.cpp index 3c9bb2556..852ea5eb4 100644 --- a/src/cc/prices.cpp +++ b/src/cc/prices.cpp @@ -26,39 +26,6 @@ #define NVOUT_CCMARKER 1 #define NVOUT_NORMALMARKER 3 -typedef struct OneBetData { - int64_t positionsize; - int32_t firstheight; - int64_t costbasis; - int64_t profits; - - OneBetData() { positionsize = 0; firstheight = 0; costbasis = 0; profits = 0; } -} onebetdata; - -typedef struct BetInfo { - uint256 txid; - int64_t averageCostbasis, firstprice, lastprice, liquidationprice, equity; - int64_t exitfee; - int32_t lastheight; - int16_t leverage; - bool isOpen, isRekt; - uint256 tokenid; - - std::vector vecparsed; - std::vector bets; - CPubKey pk; - - bool isUp; - - BetInfo() { - averageCostbasis = firstprice = lastprice = liquidationprice = equity = 0; - lastheight = 0; - leverage = 0; - exitfee = 0; - isOpen = isRekt = isUp = false; - } -} BetInfo; - typedef struct MatchedBookTotal { int64_t diffLeveragedPosition; @@ -250,23 +217,12 @@ int32_t prices_syntheticprofits(int64_t &costbasis, int32_t firstheight, int32_t return 0; } -// makes result json object -void prices_betjson(UniValue &result, std::vector bets, int16_t leverage, int32_t endheight, int64_t lastprice) -{ -} - // retrieves costbasis from a tx spending bettx vout1 (deprecated) int64_t prices_costbasis(CTransaction bettx, uint256 &txidCostbasis) { return 0; } -// enumerates and retrieves added bets, returns the last baton txid -int64_t prices_enumaddedbets(uint256 &batontxid, std::vector &bets, uint256 bettxid) -{ - return 0; -} - // pricesbet rpc impl: make betting tx UniValue PricesBet(int64_t txfee, int64_t amount, int16_t leverage, std::vector synthetic) { @@ -281,11 +237,6 @@ UniValue PricesAddFunding(int64_t txfee, uint256 bettxid, int64_t amount) return(result); } -// scan chain from the initial bet's first position upto the chain tip and calculate bet's costbasises and profits, breaks if rekt detected -int32_t prices_scanchain(std::vector &bets, int16_t leverage, std::vector vec, int64_t &lastprice, int32_t &endheight) { - return 0; -} - // pricescostbasis rpc impl: set cost basis (open price) for the bet (deprecated) UniValue PricesSetcostbasis(int64_t txfee, uint256 bettxid) { @@ -302,11 +253,6 @@ UniValue PricesRefillFund(int64_t amount) } -int32_t prices_getbetinfo(uint256 bettxid, BetInfo &betinfo) -{ - return (-420); -} - // pricesrekt rpc: anyone can rekt a bet at some block where losses reached limit, collecting fee UniValue PricesRekt(int64_t txfee, uint256 bettxid, int32_t rektheight) { @@ -337,30 +283,13 @@ UniValue PricesList(uint32_t filter, CPubKey mypk) } -static bool prices_addbookentry(uint256 txid, std::vector &book) -{ - return false; -} - - static bool prices_ispositionup(const std::vector &vecparsed, int16_t leverage) { return false; } -static bool prices_isopposite(BetInfo p1, BetInfo p2) { - return false; -} -static std::string findMatchedBook(const std::vector &vecparsed, const std::map > & bookmatched) { - return std::string(""); -} - - -void prices_getorderbook(std::map > & bookmatched, std::map &matchedTotals, TotalFund &fundTotals) { -} - static bool prices_isacceptableamount(const std::vector &vecparsed, int64_t amount, int16_t leverage) { return false; } From 21530ba15925933f8cbc0ca2fc5c6baf4a93cb9c Mon Sep 17 00:00:00 2001 From: Duke Leto Date: Sat, 6 Jan 2024 19:15:28 -0800 Subject: [PATCH 005/108] Remove unused code --- src/Makefile.am | 7 +- src/cc/CCcustom.cpp | 4 +- src/cc/pegs.cpp | 81 +-------- src/cc/prices.cpp | 307 ----------------------------------- src/rpc/testtransactions.cpp | 19 --- src/wallet/rpcwallet.cpp | 82 ---------- 6 files changed, 4 insertions(+), 496 deletions(-) delete mode 100644 src/cc/prices.cpp diff --git a/src/Makefile.am b/src/Makefile.am index 7869af310..021c53b1b 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -287,7 +287,6 @@ libbitcoin_server_a_SOURCES = \ cc/fsm.cpp \ cc/heir.cpp \ cc/oracles.cpp \ - cc/prices.cpp \ cc/pegs.cpp \ cc/payments.cpp \ cc/gateways.cpp \ @@ -471,10 +470,6 @@ if GLIBC_BACK_COMPAT libbitcoin_util_a_SOURCES += compat/glibc_compat.cpp endif -if ENABLE_TESTS -libbitcoin_server_a_SOURCES += rpc/testtransactions.cpp -endif - # cli libbitcoin_cli_a_CPPFLAGS = $(AM_CPPFLAGS) $(BITCOIN_INCLUDES) @@ -721,7 +716,7 @@ endif $(AM_V_GEN) $(PROTOC) --cpp_out=$(@D) --proto_path=$(abspath $(normaladdr,PricesNormaladdr); strcpy(cp->CChexstr,PricesCChexstr); memcpy(cp->CCpriv,PricesCCpriv,32); - cp->validate = PricesValidate; - cp->ismyvin = IsPricesInput; + //cp->validate = PricesValidate; + //cp->ismyvin = IsPricesInput; break; case EVAL_PEGS: strcpy(cp->unspendableCCaddr,PegsCCaddr); diff --git a/src/cc/pegs.cpp b/src/cc/pegs.cpp index a9aa9e9ab..beb98bc82 100644 --- a/src/cc/pegs.cpp +++ b/src/cc/pegs.cpp @@ -21,74 +21,7 @@ #include "key_io.h" #include - -/* -pegs CC is able to create a coin backed (by any supported coin with gateways CC deposits) and pegged to any synthetic price that is able to be calculated based on prices CC - - First, the prices CC needs to be understood, so the extensive comments at the top of ~/src/cc/prices.cpp needs to be understood. - - The second aspect is the ability to import coins, as used by the crosschain burn/import and the -ac_import chains. - - - - OK, now we are ready to describe the pegs CC. Let us imagine an -ac_import sidechain with HUSH gateways CC. Now we have each native coin fungible with the real HUSH via the gateways deposit/withdraw mechanism. Let us start with that and make a pegged and backed USD chain. - - - - Here the native coin is HUSH, but we want USD, so there needs to be a way to convert the HUSH amounts into USD amounts. Something like "HUSHBTC, BTCUSD, *, 1" which is the prices CC syntax to calculate HUSH/USD, which is exactly what we need. So now we can assume that we have a block by block usable HUSH/USD price. implementationwise, there can be an -ac option like -ac_peg="HUSHBTC, BTCUSD, *, 1" and in conjunction with -ac_import=HUSH gateways CC sidechain, we now have a chain where deposit of HUSH issues the correct USD coins and redeem of USD coins releases the correct number of HUSH coins. - - Are we done yet? - - Not quite, as the prices of HUSH will be quite volatile relative to USD, which is good during bull markets, not so happy during bear markets. There are 2 halves to this problem, how to deal with massive price increase (easy to solve), how to solve 90% price drop (a lot harder). - - In order to solve both, what is needed is an "account" based tracking which updates based on both price change, coins issued, payments made. So let us create an account that is based on a specific pubkey, where all relevant deposits, issuances, withdraws are tracked via appropriate vin/vout markers. - - Let us modify the USD chain above so that only 80% of the possible USD is issued and 20% held in reserve. This 80% should be at least some easily changeable #define, or even an -ac parameter. We want the issued coins to be released without any encumberances, but the residual 20% value is still controlled (owned) but the depositor. This account has the amount of HUSH deposited and USD issued. At the moment of deposit, there will still be 20% equity left. Let us start with 1000 HUSH deposit, $1.5 per HUSH -> 800 HUSH converted to 1200 USD into depositor pubkey and the account of (1000 HUSH, -1200 USD) = 200 HUSH or $300 equity. - - Now it becomes easy for the bull market case, which is to allow (for a fee like 1%) issuance of more USD as the equity increases, so let us imagine HUSH at $10: - - (1000 HUSH, -1200 USD, 200HUSH reserve) -> $2000 equity, issue 80% -> $1600 using 160 HUSH - (1000 HUSH, -1200 USD, 200HUSH reserve, -160HUSH, issue $1600 USD, 40 HUSH reserve) - - we have $2800 USD in circulation, 40 HUSH reserve left against $10000 marketcap of the original deposit. It it easy to see that there are never any problems with lack of HUSH to redeem the issued USD in a world where prices only go up. Total USD issuance can be limited by using a decentralized account tracking based on each deposit. - - What is evident though is that with the constantly changing price and the various times that all the various deposits issue USD, the global reserves are something that will be hard to predict and in fact needs to be specifically tracked. Let us combine all accounts exposure in to a global reserves factor. This factor will control various max/min/ allowed and fee percentages. - - Now we are prepared to handle the price goes down scenario. We can rely on the global equity/reserve ratio to be changing relatively slowly as the reference price is the smooted trustless oracles price. This means there will be enough blocks to adjust the global reserves percentage. What we need to do is liquidate specific positions that have the least reserves. - - What does liquidation mean? It means a specific account will be purchased at below its current value and the HUSH withdrawn. Let us assume the price drops to $5: - - (1000 HUSH, -1200 USD, 200HUSH reserve, -160HUSH, issue $1600 USD, 40 HUSH reserve) 1000 HUSH with 2800 USD issued so $2200 reserves. Let us assume it can be liquidated at a 10% discount, so for $2000 in addition to the $2800, the 5000 HUSH is able to be withdrawn. This removes 4800 USD coins for 1000 HUSH, which is a very low reserve amount of 4%. If a low reserve amount is removed from the system, then the global reserve amount must be improved. - - In addition to the global reserves calculation, there needs to be a trigger percentage that enables positions to be liquidated. We also want to liquidate the worst positions, so in addition to the trigger percentage, there should be a liquidation threshold, and the liquidator would need to find 3 or more better positions that are beyond the liquidation threshold, to be able to liquidate. This will get us to at most 3 accounts that could be liquidated but are not able to, so some method to allow those to also be liquidated. The liquidating nodes are making instant profits, so they should be expected to do whatever blockchain scanning and proving to make things easy for the rest of the nodes. - - One last issue is the normal redemption case where we are not liquidating. In this case, it should be done at the current marketprice, should improve the global reserves metrics and not cause anybody whose position was modified to have cause for complaint. Ideally, there would be an account that has the identical to the global reserve percentage and also at the same price as current marketprice, but this is not realistic, so we need to identify classes of accounts and consider which ones can be fully or partially liquidated to satisfy the constraints. - - looking at our example account: - (1000 HUSH, -1200 USD, 200HUSH reserve, -160HUSH, issue $1600 USD, 40 HUSH reserve) - - what sort of non-liquidation withdraw would be acceptable? if the base amount 1000 HUSH is reduced along with USD owed, then the reserve status will go up for the account. but that would seem to allow extra USD to be able to be issued. there should be no disadvantage from funding a withdraw, but also not any large advantage. it needs to be a neutral event.... - - One solution is to allow for the chance for any account to be liquidated, but the equity compensated for with a premium based on the account reserves. So in the above case, a premium of 5% on the 40HUSH reserve is paid to liquidate its account. Instead of 5% premium, a lower 1% can be done if based on the MAX(correlated[daywindow],smoothed) so we get something that is close to the current marketprice. To prevent people taking advantage of the slowness of the smoothed price to adjust, there would need to be a one day delay in the withdraw. - - From a practical sense, it seems a day is a long time, so maybe having a way to pay a premium like 10%, or wait a day to get the MAX(correlated[daywindow],smoothed) price. This price "jumping" might also be taken advantage of in the deposit side, so similar to prices CC it seems good to have the MAX(correlated[daywindow],smoothed) method. - - Now, we have a decentralized mechanism to handle the price going lower! Combined with the fully decentralized method new USD coins are issued, makes this argubably the first decentralized blockchain that is both backed and pegged. There is the reliance on the gateways CC multisig signers, so there is a fundamental federated trust for chains without intrinsic value. - - Also, notice that the flexibly syntax of prices CC allows to define pegs easily for virtually any type of synthetic, and all the ECB fiats can easily get a backed and pegged coin. - - Let us now consider how to enforce a peg onto a specific gateways CC token. If this can also be achieved, then a full DEX for all the different gateways CC supported coins can be created onto a single fiat denominated chain. - - I think just having a pegscreate rpc call that binds an existing gateways create to a price CC syntax price will be almost enough to support this. Let us assume a USD stablechain and we have a BTC token, then pegscreate "BTCUSD, 1" - that will specify using the BTCUSD price, so now we need to create a based way to do tokenbid/tokenask. For a based price, the smoothed price is substituted. - - There is the issue of the one day delay, so it might make sense to allow specific bid/ask to be based on some simple combinations of the three possible prices. it might even be possible to go a bit overboard and make a forth like syntax to define the dynamic price for a bid, which maybe at times wont be valid, like it is only valid if the three prices are within 1% of each other. But all that seems over complex and for initial release it can just use the mined, correlated or smoothed price, with some specified percentage offset - - Implementation notes: - make sure that fees and markers that can be sent to an unspendable address are sent to: RNdqHx26GWy9bk8MtmH1UiXjQcXE4RKK2P, this is the address for BOTS - - - */ +//NOTE: in process of removal // start of consensus code #ifndef PEGS_THRESHOLDS @@ -105,8 +38,6 @@ extern uint64_t ASSETCHAINS_PEGSCCPARAMS[3]; extern uint8_t DecodeGatewaysBindOpRet(char *depositaddr,const CScript &scriptPubKey,uint256 &tokenid,std::string &coin,int64_t &totalsupply,uint256 &oracletxid,uint8_t &M,uint8_t &N,std::vector &gatewaypubkeys,uint8_t &taddr,uint8_t &prefix,uint8_t &prefix2,uint8_t &wiftype); extern int64_t GetTokenBalance(CPubKey pk, uint256 tokenid); extern int32_t hush_currentheight(); -extern int32_t prices_syntheticvec(std::vector &vec, std::vector synthetic); -extern int64_t prices_syntheticprice(std::vector vec, int32_t height, int32_t minmax, int16_t leverage); CScript EncodePegsCreateOpRet(std::vector bindtxids) { @@ -522,16 +453,6 @@ char PegsFindAccount(struct CCcontract_info *cp,CPubKey pk,uint256 pegstxid, uin int64_t PegsGetTokenPrice(uint256 tokenid) { - int64_t price; CTransaction tokentx; uint256 hashBlock; std::vector exp; - std::string name,desc; std::vector vorigpubkey; int32_t numvouts; - - if (myGetTransaction(tokenid,tokentx,hashBlock)!=0 && (numvouts=tokentx.vout.size())>0 && DecodeTokenCreateOpRet(tokentx.vout[numvouts-1].scriptPubKey,vorigpubkey,name,desc)=='c') - { - std::vector vexpr; - SplitStr(desc, vexpr); - if (prices_syntheticvec(exp, vexpr)>=0 && (price = prices_syntheticprice(exp, hush_currentheight(), 0, 1))>=0) - return (price); - } return (0); } diff --git a/src/cc/prices.cpp b/src/cc/prices.cpp deleted file mode 100644 index 852ea5eb4..000000000 --- a/src/cc/prices.cpp +++ /dev/null @@ -1,307 +0,0 @@ -// Copyright (c) 2016-2023 The Hush developers -// Distributed under the GPLv3 software license, see the accompanying -// file COPYING or https://www.gnu.org/licenses/gpl-3.0.en.html -/****************************************************************************** - * Copyright © 2014-2019 The SuperNET Developers. * - * * - * See the AUTHORS, DEVELOPER-AGREEMENT and LICENSE files at * - * the top-level directory of this distribution for the individual copyright * - * holder information and the developer policies on copyright and licensing. * - * * - * Unless otherwise agreed in a custom licensing agreement, no part of the * - * SuperNET software, including this file may be copied, modified, propagated * - * or distributed except according to the terms contained in the LICENSE file * - * * - * Removal or modification of this copyright notice is prohibited. * - * * - *****************************************************************************/ -//TODO: Finish deleting all this jl777 garbage. This CC will never function - -#include "CCassets.h" -#include "CCPrices.h" -#include -#include - -#define IS_CHARINSTR(c, str) (std::string(str).find((char)(c)) != std::string::npos) -#define NVOUT_CCMARKER 1 -#define NVOUT_NORMALMARKER 3 - -typedef struct MatchedBookTotal { - - int64_t diffLeveragedPosition; - -} MatchedBookTotal; - -typedef struct TotalFund { - int64_t totalFund; - int64_t totalActiveBets; - int64_t totalCashout; - int64_t totalRekt; - int64_t totalEquity; - - TotalFund() { - totalFund = totalActiveBets = totalCashout = totalRekt = totalEquity = 0; - } - -} TotalFund; - -int32_t prices_syntheticprofits(int64_t &costbasis, int32_t firstheight, int32_t height, int16_t leverage, std::vector vec, int64_t positionsize, int64_t &profits, int64_t &outprice); -static bool prices_isacceptableamount(const std::vector &vecparsed, int64_t amount, int16_t leverage); - -// helpers: - -// returns true if there are only digits and no alphas or slashes in 's' -inline bool is_weight_str(std::string s) { - return false; -} - - -// start of consensus code - -CScript prices_betopret(CPubKey mypk,int32_t height,int64_t amount,int16_t leverage,int64_t firstprice,std::vector vec,uint256 tokenid) -{ - CScript opret; - opret << OP_RETURN << E_MARSHAL(ss << EVAL_PRICES << 'B' << mypk << height << amount << leverage << firstprice << vec << tokenid); - return(opret); -} - -uint8_t prices_betopretdecode(CScript scriptPubKey,CPubKey &pk,int32_t &height,int64_t &amount,int16_t &leverage,int64_t &firstprice,std::vector &vec,uint256 &tokenid) -{ - return(0); -} - -CScript prices_addopret(uint256 bettxid,CPubKey mypk,int64_t amount) -{ - CScript opret; - return(opret); -} - -uint8_t prices_addopretdecode(CScript scriptPubKey,uint256 &bettxid,CPubKey &pk,int64_t &amount) -{ - return(0); -} - -CScript prices_costbasisopret(uint256 bettxid,CPubKey mypk,int32_t height,int64_t costbasis) -{ - CScript opret; - return(opret); -} - -uint8_t prices_costbasisopretdecode(CScript scriptPubKey,uint256 &bettxid,CPubKey &pk,int32_t &height,int64_t &costbasis) -{ - return(0); -} - -CScript prices_finalopret(bool isRekt, uint256 bettxid, CPubKey pk, int32_t lastheight, int64_t costbasis, int64_t lastprice, int64_t liquidationprice, int64_t equity, int64_t exitfee, uint32_t nonce) -{ - CScript opret; - return(opret); -} - -uint8_t prices_finalopretdecode(CScript scriptPubKey, uint256 &bettxid, CPubKey &pk, int32_t &lastheight, int64_t &costbasis, int64_t &lastprice, int64_t &liquidationprice, int64_t &equity, int64_t &exitfee) -{ - return(0); -} - -// price opret basic validation and retrieval -static uint8_t PricesCheckOpret(const CTransaction & tx, vscript_t &opret) -{ - return (uint8_t)0; -} - -// validate bet tx helper -static bool ValidateBetTx(struct CCcontract_info *cp, Eval *eval, const CTransaction & bettx) -{ - return true; -} - -// validate add funding tx helper -static bool ValidateAddFundingTx(struct CCcontract_info *cp, Eval *eval, const CTransaction & addfundingtx, const CTransaction & vintx) -{ - return true; -} - - -// validate final tx helper -static bool ValidateFinalTx(struct CCcontract_info *cp, Eval *eval, const CTransaction & finaltx, const CTransaction & bettx) -{ - return true; -} - -bool PricesValidate(struct CCcontract_info *cp,Eval* eval,const CTransaction &tx, uint32_t nIn) -{ - return true; -} -// helper functions for rpc calls in rpcwallet.cpp - -int64_t AddPricesInputs(struct CCcontract_info *cp, CMutableTransaction &mtx, char *destaddr, int64_t total, int32_t maxinputs) -{ - int64_t totalinputs = 0; - return(totalinputs); -} - -double prices_minmarginpercent(int16_t leverage) -{ - return 0.0; -} - - -UniValue prices_rawtxresult(UniValue &result, std::string rawtx, int32_t broadcastflag) -{ - return(result); -} - -static std::string prices_getsourceexpression(const std::vector &vec) { - std::string expr; - return expr; -} - -// helper functions to get synthetic expression reduced: - -// return s true and needed operand count if string is opcode -static bool prices_isopcode(const std::string &s, int &need) -{ - return false; -} - -// split pair onto two quotes divided by "_" -static void prices_splitpair(const std::string &pair, std::string &upperquote, std::string &bottomquote) -{ -} - -// invert pair like BTS_USD -> USD_BTC -static std::string prices_invertpair(const std::string &pair) -{ - std::string s; - return s; -} - -// invert pairs in operation accordingly to "/" operator, convert operator to * or *** -static void prices_invertoperation(const std::vector &vexpr, int p, std::vector &voperation) -{ -} - -// reduce pairs in the operation, change or remove opcode if reduced -static int prices_reduceoperands(std::vector &voperation) -{ - return 0; -} - -// substitute reduced operation in vectored expr -static void prices_substitutereduced(std::vector &vexpr, int p, std::vector voperation) -{ -} - -// try to reduce synthetic expression by substituting "BTC_USD, BTC_EUR, 30, /" with "EUR_USD, 30" etc -static std::string prices_getreducedexpr(const std::string &expr) -{ - std::string reduced; - return reduced; -} - -// parse synthetic expression into vector of codes -int32_t prices_syntheticvec(std::vector &vec, std::vector synthetic) -{ - return(0); -} - -// calculates price for synthetic expression -int64_t prices_syntheticprice(std::vector vec, int32_t height, int32_t minmax, int16_t leverage) -{ - return 0; -} - -// calculates costbasis and profit/loss for the bet -int32_t prices_syntheticprofits(int64_t &costbasis, int32_t firstheight, int32_t height, int16_t leverage, std::vector vec, int64_t positionsize, int64_t &profits, int64_t &outprice) -{ - return 0; -} - -// retrieves costbasis from a tx spending bettx vout1 (deprecated) -int64_t prices_costbasis(CTransaction bettx, uint256 &txidCostbasis) -{ - return 0; -} - -// pricesbet rpc impl: make betting tx -UniValue PricesBet(int64_t txfee, int64_t amount, int16_t leverage, std::vector synthetic) -{ - UniValue result(UniValue::VOBJ); - return(result); -} - -// pricesaddfunding rpc impl: add yet another bet -UniValue PricesAddFunding(int64_t txfee, uint256 bettxid, int64_t amount) -{ - UniValue result(UniValue::VOBJ); - return(result); -} - -// pricescostbasis rpc impl: set cost basis (open price) for the bet (deprecated) -UniValue PricesSetcostbasis(int64_t txfee, uint256 bettxid) -{ - UniValue result(UniValue::VOBJ); - return(result); -} - - -// pricesaddfunding rpc impl: add yet another bet -UniValue PricesRefillFund(int64_t amount) -{ - UniValue result(UniValue::VOBJ); - return(result); -} - - -// pricesrekt rpc: anyone can rekt a bet at some block where losses reached limit, collecting fee -UniValue PricesRekt(int64_t txfee, uint256 bettxid, int32_t rektheight) -{ - UniValue result(UniValue::VOBJ); - return(result); -} - -// pricescashout rpc impl: bettor can cashout hit bet if it is not rekt -UniValue PricesCashout(int64_t txfee, uint256 bettxid) -{ - UniValue result(UniValue::VOBJ); - return result; -} - - -// pricesinfo rpc impl -UniValue PricesInfo(uint256 bettxid, int32_t refheight) -{ - UniValue result(UniValue::VOBJ); - return(result); -} - -// priceslist rpc impl -UniValue PricesList(uint32_t filter, CPubKey mypk) -{ - UniValue result(UniValue::VARR); - return(result); -} - - -static bool prices_ispositionup(const std::vector &vecparsed, int16_t leverage) { - return false; -} - - - - -static bool prices_isacceptableamount(const std::vector &vecparsed, int64_t amount, int16_t leverage) { - return false; -} - - -// walk through uxtos on the global address -// calculate the balance: -// + rekt positions -// = opposite positions -// - unbalanced positions -UniValue PricesGetOrderbook() -{ - UniValue result(UniValue::VOBJ); - return result; -} diff --git a/src/rpc/testtransactions.cpp b/src/rpc/testtransactions.cpp index 50f60af4e..a9c685c16 100644 --- a/src/rpc/testtransactions.cpp +++ b/src/rpc/testtransactions.cpp @@ -222,7 +222,6 @@ UniValue test_proof(const UniValue& params, bool fHelp, const CPubKey& mypk) return result; } -extern CScript prices_costbasisopret(uint256 bettxid, CPubKey mypk, int32_t height, int64_t costbasis); UniValue test_pricesmarker(const UniValue& params, bool fHelp, const CPubKey& mypk) { // make fake token tx: @@ -249,21 +248,3 @@ UniValue test_pricesmarker(const UniValue& params, bool fHelp, const CPubKey& my return(FinalizeCCTx(0, cp, mtx, myPubkey, 10000, prices_costbasisopret(bettxid, myPubkey, 100, 100))); } - -static const CRPCCommand commands[] = -{ // category name actor (function) okSafeMode - // --------------------- ------------------------ ----------------------- ---------- - - /* Not shown in help */ - { "hidden", "test_ac", &test_ac, true }, - { "hidden", "test_heirmarker", &test_heirmarker, true }, - { "hidden", "test_proof", &test_proof, true }, - { "hidden", "test_burntx", &test_burntx, true }, - { "hidden", "test_pricesmarker", &test_pricesmarker, true } -}; - -void RegisterTesttransactionsRPCCommands(CRPCTable &tableRPC) -{ - for (unsigned int vcidx = 0; vcidx < ARRAYLEN(commands); vcidx++) - tableRPC.appendCommand(commands[vcidx].name, &commands[vcidx]); -} diff --git a/src/wallet/rpcwallet.cpp b/src/wallet/rpcwallet.cpp index 491cab182..76aecf2b3 100644 --- a/src/wallet/rpcwallet.cpp +++ b/src/wallet/rpcwallet.cpp @@ -6474,30 +6474,6 @@ UniValue oraclesaddress(const UniValue& params, bool fHelp, const CPubKey& mypk) return(CCaddress(cp,(char *)"Oracles",pubkey)); } -UniValue pricesaddress(const UniValue& params, bool fHelp, const CPubKey& mypk) -{ - UniValue result(UniValue::VOBJ); struct CCcontract_info *cp,C,*assetscp,C2; std::vector pubkey; CPubKey pk,planpk,pricespk; char myaddr[64],houseaddr[64],exposureaddr[64]; - cp = CCinit(&C,EVAL_PRICES); - assetscp = CCinit(&C2,EVAL_PRICES); - if ( fHelp || params.size() > 1 ) - throw runtime_error("pricesaddress [pubkey]\n"); - if ( ensure_CCrequirements(cp->evalcode) < 0 ) - throw runtime_error(CC_REQUIREMENTS_MSG); - if ( params.size() == 1 ) - pubkey = ParseHex(params[0].get_str().c_str()); - result = CCaddress(cp,(char *)"Prices",pubkey); - if (mypk.IsValid()) pk=mypk; - else pk = pubkey2pk(Mypubkey()); - pricespk = GetUnspendable(cp,0); - GetCCaddress(assetscp,myaddr,pk); - GetCCaddress1of2(assetscp,houseaddr,pricespk,planpk); - GetCCaddress1of2(assetscp,exposureaddr,pricespk,pricespk); - result.push_back(Pair("myaddr",myaddr)); // for holding my asssets - result.push_back(Pair("houseaddr",houseaddr)); // globally accessible house assets - result.push_back(Pair("exposureaddr",exposureaddr)); // tracking of exposure - return(result); -} - UniValue pegsaddress(const UniValue& params, bool fHelp, const CPubKey& mypk) { struct CCcontract_info *cp,C; std::vector pubkey; @@ -7534,64 +7510,6 @@ UniValue faucetget(const UniValue& params, bool fHelp, const CPubKey& mypk) return(result); } -uint32_t pricesGetParam(UniValue param) { - uint32_t filter = 0; - if (STR_TOLOWER(param.get_str()) == "all") - filter = 0; - else if (STR_TOLOWER(param.get_str()) == "open") - filter = 1; - else if (STR_TOLOWER(param.get_str()) == "closed") - filter = 2; - else - throw runtime_error("incorrect parameter\n"); - return filter; -} - -UniValue priceslist(const UniValue& params, bool fHelp, const CPubKey& mypk) -{ - if ( fHelp || params.size() != 0 && params.size() != 1) - throw runtime_error("priceslist [all|open|closed]\n"); - if ( ensure_CCrequirements(EVAL_PRICES) < 0 ) - throw runtime_error(CC_REQUIREMENTS_MSG); - uint32_t filter = 0; - if (params.size() == 1) - filter = pricesGetParam(params[0]); - - CPubKey emptypk; - - return(PricesList(filter, emptypk)); -} - -UniValue mypriceslist(const UniValue& params, bool fHelp, const CPubKey& mypk) -{ - if (fHelp || params.size() != 0 && params.size() != 1) - throw runtime_error("mypriceslist [all|open|closed]\n"); - if (ensure_CCrequirements(EVAL_PRICES) < 0) - throw runtime_error(CC_REQUIREMENTS_MSG); - - uint32_t filter = 0; - if (params.size() == 1) - filter = pricesGetParam(params[0]); - CPubKey pk; - if (mypk.IsValid()) pk=mypk; - else pk = pubkey2pk(Mypubkey()); - - return(PricesList(filter, pk)); -} - -UniValue pricesinfo(const UniValue& params, bool fHelp, const CPubKey& mypk) -{ - uint256 bettxid; int32_t height; - if ( fHelp || params.size() != 1 && params.size() != 2) - throw runtime_error("pricesinfo bettxid [height]\n"); - if ( ensure_CCrequirements(EVAL_PRICES) < 0 ) - throw runtime_error(CC_REQUIREMENTS_MSG); - bettxid = Parseuint256((char *)params[0].get_str().c_str()); - height = 0; - if (params.size() == 2) - height = atoi(params[1].get_str().c_str()); - return(PricesInfo(bettxid, height)); -} UniValue dicefund(const UniValue& params, bool fHelp, const CPubKey& mypk) { From 0e0b1cca971874da26e0a629a1c4656b566c7ce4 Mon Sep 17 00:00:00 2001 From: Duke Leto Date: Sat, 6 Jan 2024 21:33:23 -0800 Subject: [PATCH 006/108] Attempt to try different randomx flags --- src/miner.cpp | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/src/miner.cpp b/src/miner.cpp index 5b0544200..2197cb533 100644 --- a/src/miner.cpp +++ b/src/miner.cpp @@ -1099,11 +1099,19 @@ void static RandomXMiner() // flags |= RANDOMX_FLAG_LARGE_PAGES; flags |= RANDOMX_FLAG_FULL_MEM; //flags |= RANDOMX_FLAG_JIT; - randomx_cache *randomxCache = randomx_alloc_cache(flags); + randomx_cache *randomxCache = randomx_alloc_cache(flags | RANDOMX_FLAG_LARGE_PAGES | RANDOMX_FLAG_JIT | RANDOMX_FLAG_HARD_AES); if (randomxCache == NULL) { - LogPrintf("RandomX cache is null, something is wrong, cannot mine!\n"); - return; + LogPrintf("RandomX cache is null, trying without large pages and without jit ...\n"); + randomxCache = randomx_alloc_cache(flags | RANDOMX_FLAG_HARD_AES); + if (randomxCache == NULL) { + LogPrintf("RandomX cache is null, trying without hardware AES...\n"); + } + randomxCache = randomx_alloc_cache(flags); + if (randomxCache == NULL) { + LogPrintf("RandomX cache is null, cannot mine!\n"); + } } + rxdebug("%s: created randomx flags + cache\n"); randomx_dataset *randomxDataset = randomx_alloc_dataset(flags); rxdebug("%s: created dataset\n"); From 56ef56b13625616a5f82168fda8cb02feec6b526 Mon Sep 17 00:00:00 2001 From: Duke Date: Sat, 6 Jan 2024 22:23:58 -0800 Subject: [PATCH 007/108] randomx_get_flags() automatically sets all flags except RANDOMX_FLAG_FULL_MEM, RANDOMX_FLAG_LARGE_PAGES and RANDOMX_FLAG_SECURE --- src/miner.cpp | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/src/miner.cpp b/src/miner.cpp index 2197cb533..4ba24ec29 100644 --- a/src/miner.cpp +++ b/src/miner.cpp @@ -1095,16 +1095,13 @@ void static RandomXMiner() miningTimer.start(); randomx_flags flags = randomx_get_flags(); - // TODO: attempt to use large pages and fall back to no large pages - // flags |= RANDOMX_FLAG_LARGE_PAGES; flags |= RANDOMX_FLAG_FULL_MEM; - //flags |= RANDOMX_FLAG_JIT; - randomx_cache *randomxCache = randomx_alloc_cache(flags | RANDOMX_FLAG_LARGE_PAGES | RANDOMX_FLAG_JIT | RANDOMX_FLAG_HARD_AES); + randomx_cache *randomxCache = randomx_alloc_cache(flags | RANDOMX_FLAG_LARGE_PAGES | RANDOMX_FLAG_SECURE ); if (randomxCache == NULL) { - LogPrintf("RandomX cache is null, trying without large pages and without jit ...\n"); - randomxCache = randomx_alloc_cache(flags | RANDOMX_FLAG_HARD_AES); + LogPrintf("RandomX cache is null, trying without large pages...\n"); + randomxCache = randomx_alloc_cache(flags | RANDOMX_FLAG_SECURE); if (randomxCache == NULL) { - LogPrintf("RandomX cache is null, trying without hardware AES...\n"); + LogPrintf("RandomX cache is null, trying without secure...\n"); } randomxCache = randomx_alloc_cache(flags); if (randomxCache == NULL) { From 1b5422eb2ddcedd9aabdf4f039144f9eef5c6f95 Mon Sep 17 00:00:00 2001 From: Duke Date: Sat, 6 Jan 2024 22:54:14 -0800 Subject: [PATCH 008/108] Dynamically determine thread count for dataset init --- src/miner.cpp | 31 ++++++++++++++++++++++--------- 1 file changed, 22 insertions(+), 9 deletions(-) diff --git a/src/miner.cpp b/src/miner.cpp index 4ba24ec29..6f5c1e971 100644 --- a/src/miner.cpp +++ b/src/miner.cpp @@ -1201,14 +1201,27 @@ void static RandomXMiner() rxdebug("%s: initialized cache with keyHeight=%d, randomxBlockKey=%s\n", keyHeight, randomxBlockKey.ToString().c_str()); } - //TODO: this is hardcoded to use 2 threads instead of the number of mining threads - rxdebug("%s: initializing dataset with 2 threads\n"); - std::thread t1(&randomx_init_dataset, randomxDataset, randomxCache, 0, datasetItemCount / 2); - std::thread t2(&randomx_init_dataset, randomxDataset, randomxCache, datasetItemCount / 2, datasetItemCount - datasetItemCount / 2); - t1.join(); - t2.join(); + int initThreadCount = std::thread::hardware_concurrency(); + if(initThreadCount > 1) { + rxdebug("%s: initializing dataset with %d threads\n", initThreadCount); + std::vector threads; + uint32_t startItem = 0; + auto perThread = datasetItemCount / initThreadCount; + auto remainder = datasetItemCount % initThreadCount; + for (int i = 0; i < initThreadCount; ++i) { + auto count = perThread + (i == initThreadCount - 1 ? remainder : 0); + threads.push_back(std::thread(&randomx_init_dataset, randomxDataset, randomxCache, startItem, count)); + startItem += count; + } + for (unsigned i = 0; i < threads.size(); ++i) { + threads[i].join(); + } + threads.clear(); + } else { + rxdebug("%s: initializing dataset with 1 thread\n"); + randomx_init_dataset(randomxDataset, randomxCache, 0, datasetItemCount); + } - // randomx_init_dataset(randomxDataset, randomxCache, 0, datasetItemCount); rxdebug("%s: dataset initialized\n"); myVM = randomx_create_vm(flags, nullptr, randomxDataset); @@ -1463,8 +1476,8 @@ void static RandomXMiner() randomx_release_dataset(randomxDataset); rxdebug("%s: released dataset in normal exit\n"); - randomx_release_cache(randomxCache); - rxdebug("%s: released cache in normal exit\n"); + //randomx_release_cache(randomxCache); + //rxdebug("%s: released cache in normal exit\n"); miningTimer.stop(); c.disconnect(); } From 765487bb14856c3a6f3ed05941de4c861df5146f Mon Sep 17 00:00:00 2001 From: Duke Date: Sat, 6 Jan 2024 23:30:19 -0800 Subject: [PATCH 009/108] Remove unused code --- src/rpc/server.cpp | 15 --- src/rpc/server.h | 11 --- src/wallet/rpcwallet.cpp | 200 --------------------------------------- 3 files changed, 226 deletions(-) diff --git a/src/rpc/server.cpp b/src/rpc/server.cpp index 9eb9076e7..c50d702a3 100644 --- a/src/rpc/server.cpp +++ b/src/rpc/server.cpp @@ -473,9 +473,6 @@ static const CRPCCommand vRPCCommands[] = { "oracles", "oraclessample", &oraclessample, true }, { "oracles", "oraclessamples", &oraclessamples, true }, - // Pegs - { "pegs", "pegsaddress", &pegsaddress, true }, - // Payments { "payments", "paymentsaddress", &paymentsaddress, true }, { "payments", "paymentstxidopret", &payments_txidopret, true }, @@ -539,18 +536,6 @@ static const CRPCCommand vRPCCommands[] = //{ "tokens", "tokenfillswap", &tokenfillswap, true }, { "tokens", "tokenconvert", &tokenconvert, true }, - // pegs - { "pegs", "pegscreate", &pegscreate, true }, - { "pegs", "pegsfund", &pegsfund, true }, - { "pegs", "pegsget", &pegsget, true }, - { "pegs", "pegsredeem", &pegsredeem, true }, - { "pegs", "pegsliquidate", &pegsliquidate, true }, - { "pegs", "pegsexchange", &pegsexchange, true }, - { "pegs", "pegsaccounthistory", &pegsaccounthistory, true }, - { "pegs", "pegsaccountinfo", &pegsaccountinfo, true }, - { "pegs", "pegsworstaccounts", &pegsworstaccounts, true }, - { "pegs", "pegsinfo", &pegsinfo, true }, - /* Address index */ { "addressindex", "getaddressmempool", &getaddressmempool, true }, { "addressindex", "getaddressutxos", &getaddressutxos, false }, diff --git a/src/rpc/server.h b/src/rpc/server.h index 8f88cb238..3b229d6f3 100644 --- a/src/rpc/server.h +++ b/src/rpc/server.h @@ -270,7 +270,6 @@ extern UniValue oraclessubscribe(const UniValue& params, bool fHelp, const CPubK extern UniValue oraclesdata(const UniValue& params, bool fHelp, const CPubKey& mypk); extern UniValue oraclessample(const UniValue& params, bool fHelp, const CPubKey& mypk); extern UniValue oraclessamples(const UniValue& params, bool fHelp, const CPubKey& mypk); -extern UniValue pegsaddress(const UniValue& params, bool fHelp, const CPubKey& mypk); extern UniValue paymentsaddress(const UniValue& params, bool fHelp, const CPubKey& mypk); extern UniValue payments_release(const UniValue& params, bool fHelp, const CPubKey& mypk); extern UniValue payments_fund(const UniValue& params, bool fHelp, const CPubKey& mypk); @@ -333,16 +332,6 @@ extern UniValue FSMcreate(const UniValue& params, bool fHelp, const CPubKey& myp extern UniValue FSMlist(const UniValue& params, bool fHelp, const CPubKey& mypk); extern UniValue FSMinfo(const UniValue& params, bool fHelp, const CPubKey& mypk); extern UniValue auctionaddress(const UniValue& params, bool fHelp, const CPubKey& mypk); -extern UniValue pegscreate(const UniValue& params, bool fHelp, const CPubKey& mypk); -extern UniValue pegsfund(const UniValue& params, bool fHelp, const CPubKey& mypk); -extern UniValue pegsget(const UniValue& params, bool fHelp, const CPubKey& mypk); -extern UniValue pegsredeem(const UniValue& params, bool fHelp, const CPubKey& mypk); -extern UniValue pegsliquidate(const UniValue& params, bool fHelp, const CPubKey& mypk); -extern UniValue pegsexchange(const UniValue& params, bool fHelp, const CPubKey& mypk); -extern UniValue pegsaccounthistory(const UniValue& params, bool fHelp, const CPubKey& mypk); -extern UniValue pegsaccountinfo(const UniValue& params, bool fHelp, const CPubKey& mypk); -extern UniValue pegsworstaccounts(const UniValue& params, bool fHelp, const CPubKey& mypk); -extern UniValue pegsinfo(const UniValue& params, bool fHelp, const CPubKey& mypk); extern UniValue getnewaddress(const UniValue& params, bool fHelp, const CPubKey& mypk); // in rpcwallet.cpp //extern UniValue getnewaddress64(const UniValue& params, bool fHelp, const CPubKey& mypk); // in rpcwallet.cpp diff --git a/src/wallet/rpcwallet.cpp b/src/wallet/rpcwallet.cpp index 76aecf2b3..1dcc1525c 100644 --- a/src/wallet/rpcwallet.cpp +++ b/src/wallet/rpcwallet.cpp @@ -6102,7 +6102,6 @@ int32_t hush_notaryvin(CMutableTransaction &txNew,uint8_t *notarypub33, void *pT #include "../cc/CCPrices.h" #include "../cc/CCHeir.h" #include "../cc/CCPayments.h" -#include "../cc/CCPegs.h" int32_t ensure_CCrequirements(uint8_t evalcode) { CCerror = ""; @@ -6474,19 +6473,6 @@ UniValue oraclesaddress(const UniValue& params, bool fHelp, const CPubKey& mypk) return(CCaddress(cp,(char *)"Oracles",pubkey)); } -UniValue pegsaddress(const UniValue& params, bool fHelp, const CPubKey& mypk) -{ - struct CCcontract_info *cp,C; std::vector pubkey; - cp = CCinit(&C,EVAL_PEGS); - if ( fHelp || params.size() > 1 ) - throw runtime_error("pegssaddress [pubkey]\n"); - if ( ensure_CCrequirements(cp->evalcode) < 0 ) - throw runtime_error(CC_REQUIREMENTS_MSG); - if ( params.size() == 1 ) - pubkey = ParseHex(params[0].get_str().c_str()); - return(CCaddress(cp,(char *)"Pegs",pubkey)); -} - UniValue paymentsaddress(const UniValue& params, bool fHelp, const CPubKey& mypk) { struct CCcontract_info *cp,C; std::vector pubkey; @@ -8381,192 +8367,6 @@ UniValue heirlist(const UniValue& params, bool fHelp, const CPubKey& mypk) return (HeirList()); } -UniValue pegscreate(const UniValue& params, bool fHelp, const CPubKey& mypk) -{ - UniValue result(UniValue::VOBJ); int32_t i; std::vector txids; - uint8_t N; uint256 txid; int64_t amount; - - if ( fHelp || params.size()<3) - throw runtime_error("pegscreate amount N bindtxid1 [bindtxid2 ...]\n"); - if ( ensure_CCrequirements(EVAL_PEGS) < 0 ) - throw runtime_error(CC_REQUIREMENTS_MSG); - const CKeyStore& keystore = *pwalletMain; - Lock2NSPV(mypk); - amount = atof((char *)params[0].get_str().c_str()) * COIN + 0.00000000499999; - N = atoi((char *)params[1].get_str().c_str()); - if ( params.size() < N+1 ) - { - Unlock2NSPV(mypk); - throw runtime_error("not enough parameters for N pegscreate\n"); - } - for (i=0; i 0 ) - { - result.push_back(Pair("result", "success")); - } - Unlock2NSPV(mypk); - return(result); -} - -UniValue pegsfund(const UniValue& params, bool fHelp, const CPubKey& mypk) -{ - UniValue result(UniValue::VOBJ); uint256 pegstxid,tokenid; int64_t amount; - - - if ( fHelp || params.size()!=3) - throw runtime_error("pegsfund pegstxid tokenid amount\n"); - if ( ensure_CCrequirements(EVAL_PEGS) < 0 ) - throw runtime_error(CC_REQUIREMENTS_MSG); - const CKeyStore& keystore = *pwalletMain; - Lock2NSPV(mypk); - pegstxid = Parseuint256(params[0].get_str().c_str()); - tokenid = Parseuint256(params[1].get_str().c_str()); - amount = atof((char *)params[2].get_str().c_str()) * COIN + 0.00000000499999; - result = PegsFund(mypk,0,pegstxid,tokenid,amount); - if ( result[JSON_HEXTX].getValStr().size() > 0 ) - { - result.push_back(Pair("result", "success")); - } - Unlock2NSPV(mypk); - return(result); -} - -UniValue pegsget(const UniValue& params, bool fHelp, const CPubKey& mypk) -{ - UniValue result(UniValue::VOBJ); uint256 pegstxid,tokenid; int64_t amount; - - if ( fHelp || params.size()!=3) - throw runtime_error("pegsget pegstxid tokenid amount\n"); - if ( ensure_CCrequirements(EVAL_PEGS) < 0 ) - throw runtime_error(CC_REQUIREMENTS_MSG); - Lock2NSPV(mypk); - pegstxid = Parseuint256(params[0].get_str().c_str()); - tokenid = Parseuint256(params[1].get_str().c_str()); - amount = atof((char *)params[2].get_str().c_str()) * COIN + 0.00000000499999; - result = PegsGet(mypk,0,pegstxid,tokenid,amount); - if ( result[JSON_HEXTX].getValStr().size() > 0 ) - { - result.push_back(Pair("result", "success")); - } - Unlock2NSPV(mypk); - return(result); -} - -UniValue pegsredeem(const UniValue& params, bool fHelp, const CPubKey& mypk) -{ - UniValue result(UniValue::VOBJ); uint256 pegstxid,tokenid; int64_t amount; - - if ( fHelp || params.size()!=2) - throw runtime_error("pegsredeem pegstxid tokenid\n"); - if ( ensure_CCrequirements(EVAL_PEGS) < 0 ) - throw runtime_error(CC_REQUIREMENTS_MSG); - Lock2NSPV(mypk); - pegstxid = Parseuint256(params[0].get_str().c_str()); - tokenid = Parseuint256(params[1].get_str().c_str()); - result = PegsRedeem(mypk,0,pegstxid,tokenid); - if ( result[JSON_HEXTX].getValStr().size() > 0 ) - { - result.push_back(Pair("result", "success")); - } - Unlock2NSPV(mypk); - return(result); -} - -UniValue pegsliquidate(const UniValue& params, bool fHelp, const CPubKey& mypk) -{ - UniValue result(UniValue::VOBJ); uint256 pegstxid,tokenid,accounttxid; - - if ( fHelp || params.size()!=3) - throw runtime_error("pegsliquidate pegstxid tokenid accounttxid\n"); - if ( ensure_CCrequirements(EVAL_PEGS) < 0 ) - throw runtime_error(CC_REQUIREMENTS_MSG); - Lock2NSPV(mypk); - pegstxid = Parseuint256(params[0].get_str().c_str()); - tokenid = Parseuint256(params[1].get_str().c_str()); - accounttxid = Parseuint256(params[2].get_str().c_str()); - result = PegsLiquidate(mypk,0,pegstxid,tokenid,accounttxid); - if ( result[JSON_HEXTX].getValStr().size() > 0 ) - { - result.push_back(Pair("result", "success")); - } - Unlock2NSPV(mypk); - return(result); -} - -UniValue pegsexchange(const UniValue& params, bool fHelp, const CPubKey& mypk) -{ - UniValue result(UniValue::VOBJ); uint256 pegstxid,tokenid,accounttxid; int64_t amount; - - if ( fHelp || params.size()!=3) - throw runtime_error("pegsexchange pegstxid tokenid amount\n"); - if ( ensure_CCrequirements(EVAL_PEGS) < 0 ) - throw runtime_error(CC_REQUIREMENTS_MSG); - Lock2NSPV(mypk); - pegstxid = Parseuint256(params[0].get_str().c_str()); - tokenid = Parseuint256(params[1].get_str().c_str()); - amount = atof((char *)params[2].get_str().c_str()) * COIN + 0.00000000499999; - result = PegsExchange(mypk,0,pegstxid,tokenid,amount); - if ( result[JSON_HEXTX].getValStr().size() > 0 ) - { - result.push_back(Pair("result", "success")); - } - Unlock2NSPV(mypk); - return(result); -} - -UniValue pegsaccounthistory(const UniValue& params, bool fHelp, const CPubKey& mypk) -{ - uint256 pegstxid; - - if ( fHelp || params.size() != 1 ) - throw runtime_error("pegsaccounthistory pegstxid\n"); - if ( ensure_CCrequirements(EVAL_GATEWAYS) < 0 ) - throw runtime_error(CC_REQUIREMENTS_MSG); - pegstxid = Parseuint256((char *)params[0].get_str().c_str()); - return(PegsAccountHistory(mypk,pegstxid)); -} - -UniValue pegsaccountinfo(const UniValue& params, bool fHelp, const CPubKey& mypk) -{ - uint256 pegstxid; - - if ( fHelp || params.size() != 1 ) - throw runtime_error("pegsaccountinfo pegstxid\n"); - if ( ensure_CCrequirements(EVAL_GATEWAYS) < 0 ) - throw runtime_error(CC_REQUIREMENTS_MSG); - pegstxid = Parseuint256((char *)params[0].get_str().c_str()); - return(PegsAccountInfo(mypk,pegstxid)); -} - -UniValue pegsworstaccounts(const UniValue& params, bool fHelp, const CPubKey& mypk) -{ - uint256 pegstxid; - - if ( fHelp || params.size() != 1 ) - throw runtime_error("pegsworstaccounts pegstxid\n"); - if ( ensure_CCrequirements(EVAL_GATEWAYS) < 0 ) - throw runtime_error(CC_REQUIREMENTS_MSG); - pegstxid = Parseuint256((char *)params[0].get_str().c_str()); - return(PegsWorstAccounts(pegstxid)); -} - -UniValue pegsinfo(const UniValue& params, bool fHelp, const CPubKey& mypk) -{ - uint256 pegstxid; - - if ( fHelp || params.size() != 1 ) - throw runtime_error("pegsinfo pegstxid\n"); - if ( ensure_CCrequirements(EVAL_GATEWAYS) < 0 ) - throw runtime_error(CC_REQUIREMENTS_MSG); - pegstxid = Parseuint256((char *)params[0].get_str().c_str()); - return(PegsInfo(pegstxid)); -} - extern UniValue dumpprivkey(const UniValue& params, bool fHelp, const CPubKey& mypk); // in rpcdump.cpp extern UniValue convertpassphrase(const UniValue& params, bool fHelp, const CPubKey& mypk); extern UniValue importprivkey(const UniValue& params, bool fHelp, const CPubKey& mypk); From b9937bc5d29007cc9f52b88ead1f26c4590eafe2 Mon Sep 17 00:00:00 2001 From: Duke Date: Sat, 6 Jan 2024 23:37:48 -0800 Subject: [PATCH 010/108] Release randomx cache in normal exit --- src/miner.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/miner.cpp b/src/miner.cpp index 6f5c1e971..8b3ef9af8 100644 --- a/src/miner.cpp +++ b/src/miner.cpp @@ -1476,8 +1476,8 @@ void static RandomXMiner() randomx_release_dataset(randomxDataset); rxdebug("%s: released dataset in normal exit\n"); - //randomx_release_cache(randomxCache); - //rxdebug("%s: released cache in normal exit\n"); + randomx_release_cache(randomxCache); + rxdebug("%s: released cache in normal exit\n"); miningTimer.stop(); c.disconnect(); } From 447f1f50f304758ca602fbb828b3a33bade68a30 Mon Sep 17 00:00:00 2001 From: Duke Date: Sat, 6 Jan 2024 23:39:24 -0800 Subject: [PATCH 011/108] SMART_CHAIN_SYMBOL is always nonzero --- src/miner.cpp | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/src/miner.cpp b/src/miner.cpp index 8b3ef9af8..6749842ae 100644 --- a/src/miner.cpp +++ b/src/miner.cpp @@ -1268,19 +1268,17 @@ void static RandomXMiner() return; } CBlock *pblock = &pblocktemplate->block; - if ( SMART_CHAIN_SYMBOL[0] != 0 ) + + if ( ASSETCHAINS_REWARD[0] == 0 && !ASSETCHAINS_LASTERA ) { - if ( ASSETCHAINS_REWARD[0] == 0 && !ASSETCHAINS_LASTERA ) + if ( pblock->vtx.size() == 1 && pblock->vtx[0].vout.size() == 1 && Mining_height > ASSETCHAINS_MINHEIGHT ) { - if ( pblock->vtx.size() == 1 && pblock->vtx[0].vout.size() == 1 && Mining_height > ASSETCHAINS_MINHEIGHT ) - { - static uint32_t counter; - if ( counter++ < 10 ) - fprintf(stderr,"skip generating %s on-demand block, no tx avail\n",SMART_CHAIN_SYMBOL); - sleep(10); - continue; - } else fprintf(stderr,"%s vouts.%d mining.%d vs %d\n",SMART_CHAIN_SYMBOL,(int32_t)pblock->vtx[0].vout.size(),Mining_height,ASSETCHAINS_MINHEIGHT); - } + static uint32_t counter; + if ( counter++ < 10 ) + fprintf(stderr,"skip generating %s on-demand block, no tx avail\n",SMART_CHAIN_SYMBOL); + sleep(10); + continue; + } else fprintf(stderr,"%s vouts.%d mining.%d vs %d\n",SMART_CHAIN_SYMBOL,(int32_t)pblock->vtx[0].vout.size(),Mining_height,ASSETCHAINS_MINHEIGHT); } rxdebug("%s: incrementing extra nonce\n"); IncrementExtraNonce(pblock, pindexPrev, nExtraNonce); From 4054140b2189d101ca35e79fb5843786c0738fe0 Mon Sep 17 00:00:00 2001 From: Duke Date: Sat, 6 Jan 2024 23:47:00 -0800 Subject: [PATCH 012/108] RandomX interval and block lag are consensus changes and will never change at run-time, so they can be static --- src/miner.cpp | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/miner.cpp b/src/miner.cpp index 6749842ae..ff83e9e9c 100644 --- a/src/miner.cpp +++ b/src/miner.cpp @@ -1058,6 +1058,9 @@ enum RandomXSolverCancelCheck Reason2 }; +int GetRandomXInterval() { return GetArg("-ac_randomx_interval",1024); } +int GetRandomXBlockLag() { return GetArg("-ac_randomx_lag", 64); } + #ifdef ENABLE_WALLET void static RandomXMiner(CWallet *pwallet) #else @@ -1131,9 +1134,9 @@ void static RandomXMiner() // With the defaults of 1024 and 64 // the key block will change every ~21.3 hours with a 75s block time // and every ~17 hours with the default 60s block time for HSCs - int randomxInterval = GetArg("-ac_randomx_interval",1024); + static int randomxInterval = GetRandomXInterval(); // This lag is 80 mins for 75s blocktime and 64 mins for 60s (default) blocktime for HSCs - int randomxBlockLag = GetArg("-ac_randomx_lag", 64); + static int randomxBlockLag = GetRandomXBlockLag(); randomx_vm *myVM = nullptr; try { From c1ab82a881674ec87b0fe325f09e22fe3e5920af Mon Sep 17 00:00:00 2001 From: Duke Date: Sat, 6 Jan 2024 23:57:39 -0800 Subject: [PATCH 013/108] Remove unused variables and add a const --- src/miner.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/miner.cpp b/src/miner.cpp index ff83e9e9c..81fd936a6 100644 --- a/src/miner.cpp +++ b/src/miner.cpp @@ -1079,7 +1079,7 @@ void static RandomXMiner() // Each thread has its own counter unsigned int nExtraNonce = 0; - uint8_t *script; uint64_t total; int32_t i,j,gpucount=HUSH_MAXGPUCOUNT,notaryid = -1; + int32_t gpucount=HUSH_MAXGPUCOUNT; while ( (ASSETCHAIN_INIT == 0 || HUSH_INITDONE == 0) ) { sleep(1); @@ -1204,7 +1204,7 @@ void static RandomXMiner() rxdebug("%s: initialized cache with keyHeight=%d, randomxBlockKey=%s\n", keyHeight, randomxBlockKey.ToString().c_str()); } - int initThreadCount = std::thread::hardware_concurrency(); + const int initThreadCount = std::thread::hardware_concurrency(); if(initThreadCount > 1) { rxdebug("%s: initializing dataset with %d threads\n", initThreadCount); std::vector threads; From 68427d0979fbcc70f074ff93da5b02d729ecd935 Mon Sep 17 00:00:00 2001 From: Duke Date: Sun, 7 Jan 2024 11:15:08 -0500 Subject: [PATCH 014/108] Remove unused code --- src/cc/CCPegs.h | 21 - src/cc/CCcustom.cpp | 4 +- src/cc/pegs.cpp | 1186 ------------------------------------------- 3 files changed, 2 insertions(+), 1209 deletions(-) diff --git a/src/cc/CCPegs.h b/src/cc/CCPegs.h index 197af430f..5cc2ce473 100644 --- a/src/cc/CCPegs.h +++ b/src/cc/CCPegs.h @@ -16,24 +16,3 @@ * * ******************************************************************************/ - -#ifndef CC_PEGS_H -#define CC_PEGS_H - -#include "CCinclude.h" - -bool PegsValidate(struct CCcontract_info *cp,Eval* eval,const CTransaction &tx, uint32_t nIn); - -// CCcustom -UniValue PegsCreate(const CPubKey& pk,uint64_t txfee,int64_t amount,std::vector bindtxids); -UniValue PegsFund(const CPubKey& pk,uint64_t txfee,uint256 pegstxid, uint256 tokenid, int64_t amount); -UniValue PegsGet(const CPubKey& pk,uint64_t txfee,uint256 pegstxid, uint256 tokenid, int64_t amount); -UniValue PegsRedeem(const CPubKey& pk,uint64_t txfee,uint256 pegstxid, uint256 tokenid); -UniValue PegsLiquidate(const CPubKey& pk,uint64_t txfee,uint256 pegstxid, uint256 tokenid, uint256 liquidatetxid); -UniValue PegsExchange(const CPubKey& pk,uint64_t txfee,uint256 pegstxid, uint256 tokenid, int64_t amount); -UniValue PegsAccountHistory(const CPubKey& pk,uint256 pegstxid); -UniValue PegsAccountInfo(const CPubKey& pk,uint256 pegstxid); -UniValue PegsWorstAccounts(uint256 pegstxid); -UniValue PegsInfo(uint256 pegstxid); - -#endif diff --git a/src/cc/CCcustom.cpp b/src/cc/CCcustom.cpp index 91622aff3..e8aa299ab 100644 --- a/src/cc/CCcustom.cpp +++ b/src/cc/CCcustom.cpp @@ -390,8 +390,8 @@ struct CCcontract_info *CCinit(struct CCcontract_info *cp, uint8_t evalcode) strcpy(cp->normaladdr,PegsNormaladdr); strcpy(cp->CChexstr,PegsCChexstr); memcpy(cp->CCpriv,PegsCCpriv,32); - cp->validate = PegsValidate; - cp->ismyvin = IsPegsInput; + //cp->validate = PegsValidate; + //cp->ismyvin = IsPegsInput; break; case EVAL_PAYMENTS: strcpy(cp->unspendableCCaddr,PaymentsCCaddr); diff --git a/src/cc/pegs.cpp b/src/cc/pegs.cpp index beb98bc82..2a14ca3cb 100644 --- a/src/cc/pegs.cpp +++ b/src/cc/pegs.cpp @@ -16,1193 +16,7 @@ * * ******************************************************************************/ -#include "CCPegs.h" #include "../importcoin.h" #include "key_io.h" #include -//NOTE: in process of removal - -// start of consensus code -#ifndef PEGS_THRESHOLDS -#define PEGS_THRESHOLDS -#define PEGS_ACCOUNT_MAX_DEBT 80 -#define PEGS_GLOBAL_RED_ZONE 60 -#define PEGS_ACCOUNT_YELLOW_ZONE 60 -#define PEGS_ACCOUNT_RED_ZONE 90 -#endif // PEGS_THRESHOLDS -#define CC_MARKER_VALUE 10000 - -extern uint64_t ASSETCHAINS_PEGSCCPARAMS[3]; - -extern uint8_t DecodeGatewaysBindOpRet(char *depositaddr,const CScript &scriptPubKey,uint256 &tokenid,std::string &coin,int64_t &totalsupply,uint256 &oracletxid,uint8_t &M,uint8_t &N,std::vector &gatewaypubkeys,uint8_t &taddr,uint8_t &prefix,uint8_t &prefix2,uint8_t &wiftype); -extern int64_t GetTokenBalance(CPubKey pk, uint256 tokenid); -extern int32_t hush_currentheight(); - -CScript EncodePegsCreateOpRet(std::vector bindtxids) -{ - CScript opret; uint8_t evalcode = EVAL_PEGS; - opret << OP_RETURN << E_MARSHAL(ss << evalcode << 'C' << bindtxids); - return(opret); -} - -uint8_t DecodePegsCreateOpRet(const CScript &scriptPubKey,std::vector &bindtxids) -{ - std::vector vopret; uint8_t *script,e,f; - - GetOpReturnData(scriptPubKey, vopret); - script = (uint8_t *)vopret.data(); - if ( vopret.size() > 2 && script[0] == EVAL_PEGS && E_UNMARSHAL(vopret,ss >> e; ss >> f; ss >> bindtxids) != 0 ) - { - return(f); - } - return(0); -} - -CScript EncodePegsFundOpRet(uint256 tokenid,uint256 pegstxid,CPubKey srcpub,int64_t amount,std::pair account) -{ - CScript opret; uint8_t evalcode=EVAL_PEGS,funcid='F'; struct CCcontract_info *cp,C; CPubKey pegspk; - std::vector pubkeys; vscript_t vopret; - - cp = CCinit(&C,EVAL_PEGS); - pegspk = GetUnspendable(cp,0); - pubkeys.push_back(srcpub); - pubkeys.push_back(pegspk); - LOGSTREAM("pegscc", CCLOG_DEBUG1, stream << "EncodePegsFundOpRet [" << account.first << "," << account.second << "]" << std::endl); - vopret = E_MARSHAL(ss << evalcode << funcid << pegstxid << srcpub << amount << account); - return(EncodeTokenOpRet(tokenid,pubkeys,make_pair(OPRETID_PEGSDATA, vopret))); -} - -uint8_t DecodePegsFundOpRet(const CScript &scriptPubKey,uint256 &tokenid,uint256 &pegstxid,CPubKey &srcpub,int64_t &amount,std::pair &account) -{ - std::vector> oprets; - std::vector vopret,vOpretExtra; uint8_t *script,e,f,tokenevalcode; std::vector pubkeys; - - if (DecodeTokenOpRet(scriptPubKey,tokenevalcode,tokenid,pubkeys, oprets)!=0 && GetOpretBlob(oprets, OPRETID_PEGSDATA, vOpretExtra) && tokenevalcode==EVAL_TOKENS && vOpretExtra.size()>0) - { - vopret=vOpretExtra; - } - else GetOpReturnData(scriptPubKey, vopret); - script = (uint8_t *)vopret.data(); - if ( vopret.size() > 2 && script[0] == EVAL_PEGS && E_UNMARSHAL(vopret, ss >> e; ss >> f; ss >> pegstxid; ss >> srcpub; ss >> amount; ss >> account) != 0 ) - { - return(f); - } - return(0); -} - -uint8_t DecodePegsGetOpRet(const CTransaction tx,uint256& pegstxid,uint256 &tokenid,CPubKey &srcpub,int64_t &amount,std::pair &account) -{ - std::vector vopret; uint8_t *script; - ImportProof proof; CTransaction burntx; std::vector payouts; - - GetOpReturnData(tx.vout[tx.vout.size()-1].scriptPubKey, vopret); - - script = (uint8_t *)vopret.data(); - if ( vopret.size() > 2 && script[0] == EVAL_IMPORTCOIN && UnmarshalImportTx(tx,proof,burntx,payouts) && UnmarshalBurnTx(burntx,pegstxid,tokenid,srcpub,amount,account)) - { - return('G'); - } - return(0); -} - -CScript EncodePegsReedemOpRet(uint256 tokenid,uint256 pegstxid,CPubKey srcpub,int64_t amount,std::pair account) -{ - CScript opret; uint8_t evalcode=EVAL_PEGS,funcid='R'; struct CCcontract_info *cp,C; - std::vector pubkeys; vscript_t vopret; - - cp = CCinit(&C,EVAL_PEGS); - pubkeys.push_back(srcpub); - vopret = E_MARSHAL(ss << evalcode << funcid << pegstxid << srcpub << amount << account); - return(EncodeTokenOpRet(tokenid,pubkeys,make_pair(OPRETID_PEGSDATA, vopret))); -} - -uint8_t DecodePegsRedeemOpRet(const CScript &scriptPubKey,uint256 &tokenid,uint256 &pegstxid,CPubKey &srcpub,int64_t &amount,std::pair &account) -{ - std::vector> oprets; - std::vector vopret,vOpretExtra; uint8_t *script,e,f,tokenevalcode; std::vector pubkeys; - - if (DecodeTokenOpRet(scriptPubKey,tokenevalcode,tokenid,pubkeys, oprets)!=0 && GetOpretBlob(oprets, OPRETID_PEGSDATA, vOpretExtra) && tokenevalcode==EVAL_TOKENS && vOpretExtra.size()>0) - { - vopret=vOpretExtra; - } - else GetOpReturnData(scriptPubKey, vopret); - script = (uint8_t *)vopret.data(); - if ( vopret.size() > 2 && script[0] == EVAL_PEGS && E_UNMARSHAL(vopret, ss >> e; ss >> f; ss >> pegstxid; ss >> srcpub; ss >> amount; ss >> account) != 0 ) - { - return(f); - } - return(0); -} - -CScript EncodePegsExchangeOpRet(uint256 tokenid,uint256 pegstxid,CPubKey pk1,CPubKey pk2,int64_t amount,std::pair account) -{ - CScript opret; uint8_t evalcode=EVAL_PEGS,funcid='E'; struct CCcontract_info *cp,C; - std::vector pubkeys; vscript_t vopret; CPubKey pegspk; - - cp = CCinit(&C,EVAL_PEGS); - pegspk = GetUnspendable(cp,0); - pubkeys.push_back(pk1); - pubkeys.push_back(pk2); - vopret = E_MARSHAL(ss << evalcode << funcid << pegstxid << pk1 << amount << account); - return(EncodeTokenOpRet(tokenid,pubkeys,make_pair(OPRETID_PEGSDATA, vopret))); -} - -uint8_t DecodePegsExchangeOpRet(const CScript &scriptPubKey,uint256 &tokenid,uint256 &pegstxid,CPubKey &srcpub,int64_t &amount,std::pair &account) -{ - std::vector> oprets; - std::vector vopret,vOpretExtra; uint8_t *script,e,f,tokenevalcode; std::vector pubkeys; - - if (DecodeTokenOpRet(scriptPubKey,tokenevalcode,tokenid,pubkeys, oprets)!=0 && GetOpretBlob(oprets, OPRETID_PEGSDATA, vOpretExtra) && tokenevalcode==EVAL_TOKENS && vOpretExtra.size()>0) - { - vopret=vOpretExtra; - } - else GetOpReturnData(scriptPubKey, vopret); - script = (uint8_t *)vopret.data(); - if ( vopret.size() > 2 && script[0] == EVAL_PEGS && E_UNMARSHAL(vopret, ss >> e; ss >> f; ss >> pegstxid; ss >> srcpub; ss >> amount; ss >> account) != 0 ) - { - return(f); - } - return(0); -} - -CScript EncodePegsLiquidateOpRet(uint256 tokenid,uint256 pegstxid,CPubKey srcpub,int64_t amount,std::pair account) -{ - CScript opret; uint8_t evalcode=EVAL_PEGS,funcid='L'; struct CCcontract_info *cp,C; - std::vector pubkeys; vscript_t vopret; - - cp = CCinit(&C,EVAL_PEGS); - pubkeys.push_back(srcpub); - vopret = E_MARSHAL(ss << evalcode << funcid << pegstxid << srcpub << amount << account); - return(EncodeTokenOpRet(tokenid,pubkeys,make_pair(OPRETID_PEGSDATA, vopret))); -} - -uint8_t DecodePegsLiquidateOpRet(const CScript &scriptPubKey,uint256 &tokenid,uint256 &pegstxid,CPubKey &srcpub,int64_t &amount,std::pair &account) -{ - std::vector> oprets; - std::vector vopret,vOpretExtra; uint8_t *script,e,f,tokenevalcode; std::vector pubkeys; - - if (DecodeTokenOpRet(scriptPubKey,tokenevalcode,tokenid,pubkeys, oprets)!=0 && GetOpretBlob(oprets, OPRETID_PEGSDATA, vOpretExtra) && tokenevalcode==EVAL_TOKENS && vOpretExtra.size()>0) - { - vopret=vOpretExtra; - } - else GetOpReturnData(scriptPubKey, vopret); - script = (uint8_t *)vopret.data(); - if ( vopret.size() > 2 && script[0] == EVAL_PEGS && E_UNMARSHAL(vopret, ss >> e; ss >> f; ss >> pegstxid; ss >> srcpub; ss >> amount; ss >> account) != 0 ) - { - return(f); - } - return(0); -} - -uint8_t DecodePegsOpRet(CTransaction tx,uint256& pegstxid,uint256& tokenid) -{ - std::vector> oprets; int32_t numvouts=tx.vout.size(); - std::vector vopret,vOpretExtra; uint8_t *script,e,f,tokenevalcode; std::vector pubkeys; - ImportProof proof; CTransaction burntx; std::vector payouts; uint256 tmppegstxid; CPubKey srcpub; int64_t amount; std::pair account; - - if (DecodeTokenOpRet(tx.vout[numvouts-1].scriptPubKey,tokenevalcode,tokenid,pubkeys, oprets)!=0 && GetOpretBlob(oprets, OPRETID_PEGSDATA, vOpretExtra) && tokenevalcode==EVAL_TOKENS && vOpretExtra.size()>0) - { - vopret=vOpretExtra; - } - else GetOpReturnData(tx.vout[numvouts-1].scriptPubKey, vopret); - script = (uint8_t *)vopret.data(); - if (tx.IsPegsImport()) - return(DecodePegsGetOpRet(tx,pegstxid,tokenid,srcpub,amount,account)); - else if ( vopret.size() > 2 && script[0] == EVAL_PEGS) - { - E_UNMARSHAL(vopret, ss >> e; ss >> f; ss >> pegstxid); - return(f); - } - return(0); -} - -int64_t IsPegsvout(struct CCcontract_info *cp,const CTransaction& tx,int32_t v) -{ - char destaddr[64]; - if ( tx.vout[v].scriptPubKey.IsPayToCryptoCondition() != 0 ) - { - if ( Getscriptaddress(destaddr,tx.vout[v].scriptPubKey) > 0 && strcmp(destaddr,cp->unspendableCCaddr) == 0 ) - return(tx.vout[v].nValue); - } - return(0); -} - -bool PegsExactAmounts(struct CCcontract_info *cp,Eval* eval,const CTransaction &tx,int32_t minage,uint64_t txfee) -{ - static uint256 zerohash; - CTransaction vinTx; uint256 hashBlock,activehash; int32_t i,numvins,numvouts; int64_t inputs=0,outputs=0,assetoshis; - numvins = tx.vin.size(); - numvouts = tx.vout.size(); - for (i=0; iismyvin)(tx.vin[i].scriptSig) != 0 ) - { - //fprintf(stderr,"vini.%d check mempool\n",i); - if ( eval->GetTxUnconfirmed(tx.vin[i].prevout.hash,vinTx,hashBlock) == 0 ) - return eval->Invalid("cant find vinTx"); - else - { - //fprintf(stderr,"vini.%d check hash and vout\n",i); - if ( hashBlock == zerohash ) - return eval->Invalid("cant Pegs from mempool"); - if ( (assetoshis= IsPegsvout(cp,vinTx,tx.vin[i].prevout.n)) != 0 ) - inputs += assetoshis; - } - } - } - for (i=0; iInvalid("mismatched inputs != outputs + txfee"); - } - else return(true); -} - -bool PegsValidate(struct CCcontract_info *cp,Eval* eval,const CTransaction &tx, uint32_t nIn) -{ - int32_t numvins,numvouts,preventCCvins,preventCCvouts,i,numblocks; bool retval; uint256 txid; uint8_t hash[32]; char str[65],destaddr[64]; - return (true); - std::vector > txids; - numvins = tx.vin.size(); - numvouts = tx.vout.size(); - preventCCvins = preventCCvouts = -1; - if ( numvouts < 1 ) - return eval->Invalid("no vouts"); - else - { - for (i=0; iInvalid("illegal normal vini"); - } - } - //fprintf(stderr,"check amounts\n"); - if ( PegsExactAmounts(cp,eval,tx,1,10000) == false ) - { - fprintf(stderr,"Pegsget invalid amount\n"); - return false; - } - else - { - txid = tx.GetHash(); - memcpy(hash,&txid,sizeof(hash)); - retval = PreventCC(eval,tx,preventCCvins,numvins,preventCCvouts,numvouts); - if ( retval != 0 ) - fprintf(stderr,"Pegsget validated\n"); - else fprintf(stderr,"Pegsget invalid\n"); - return(retval); - } - } -} -// end of consensus code - -// helper functions for rpc calls in rpcwallet.cpp - -int64_t AddPegsInputs(struct CCcontract_info *cp,CMutableTransaction &mtx,CPubKey pk1,CPubKey pk2,int64_t total,int32_t maxinputs) -{ - // add threshold check - char coinaddr[64]; int64_t nValue,price,totalinputs = 0; uint256 txid,hashBlock; std::vector origpubkey; CTransaction vintx; int32_t vout,n = 0; - std::vector > unspentOutputs; - - if (pk2.IsValid()) GetCCaddress1of2(cp,coinaddr,pk1,pk2); - else GetCCaddress(cp,coinaddr,pk1); - SetCCunspents(unspentOutputs,coinaddr,true); - for (std::vector >::const_iterator it=unspentOutputs.begin(); it!=unspentOutputs.end(); it++) - { - txid = it->first.txhash; - vout = (int32_t)it->first.index; - // no need to prevent dup - if ( myGetTransaction(txid,vintx,hashBlock) != 0 ) - { - if (myIsutxo_spentinmempool(ignoretxid,ignorevin,txid,vout) == 0 ) - { - if ( total != 0 && maxinputs != 0 ) - mtx.vin.push_back(CTxIn(txid,vout,CScript())); - nValue = it->second.satoshis; - totalinputs += nValue; - n++; - if ( (total > 0 && totalinputs >= total) || (maxinputs > 0 && n >= maxinputs) ) - break; - } - } - } - return(totalinputs); -} - -int64_t AddPegsTokenInputs(struct CCcontract_info *cp,CMutableTransaction &mtx,uint256 pegstxid, uint256 tokenid, CPubKey pk1,CPubKey pk2, int64_t total,int32_t maxinputs) -{ - // add threshold check - char coinaddr[64]; int64_t nValue,price,totalinputs = 0; uint256 txid,hashBlock; std::vector origpubkey; CTransaction vintx; int32_t vout,n = 0; - std::vector > unspentOutputs; uint256 tmppegstxid,tmptokenid; CPubKey mypk; - - if (pk2.IsValid()) GetTokensCCaddress1of2(cp,coinaddr,pk1,pk2); - else GetTokensCCaddress(cp,coinaddr,pk1); - SetCCunspents(unspentOutputs,coinaddr,true); - for (std::vector >::const_iterator it=unspentOutputs.begin(); it!=unspentOutputs.end(); it++) - { - txid = it->first.txhash; - vout = (int32_t)it->first.index; - // no need to prevent dup - if ( myGetTransaction(txid,vintx,hashBlock) != 0 ) - { - if (myIsutxo_spentinmempool(ignoretxid,ignorevin,txid,vout) == 0 && DecodePegsOpRet(vintx,tmppegstxid,tmptokenid)!=0 && tmppegstxid==pegstxid && tmptokenid==tokenid) - { - if ( total != 0 && maxinputs != 0 ) - mtx.vin.push_back(CTxIn(txid,vout,CScript())); - nValue = it->second.satoshis; - totalinputs += nValue; - n++; - if ( (total > 0 && totalinputs >= total) || (maxinputs > 0 && n >= maxinputs) ) - break; - } - } - } - if (pk2.IsValid()) - { - mypk = pubkey2pk(Mypubkey()); - if (mypk!=pk1 && mypk!=pk2) - { - CCaddrTokens1of2set(cp,pk1,pk2,cp->CCpriv,coinaddr); - } - else - { - uint8_t mypriv[32]; - Myprivkey(mypriv); - CCaddrTokens1of2set(cp,pk1,pk2,mypriv,coinaddr); - memset(mypriv,0,sizeof(mypriv)); - } - } - return(totalinputs); -} - -std::string PegsDecodeAccountTx(CTransaction tx,CPubKey& pk,int64_t &amount,std::pair &account) -{ - uint256 hashBlock,tokenid,pegstxid; int32_t numvouts=tx.vout.size(); char funcid; - - if ((funcid=DecodePegsOpRet(tx,pegstxid,tokenid))!=0) - { - switch(funcid) - { - case 'F': if (DecodePegsFundOpRet(tx.vout[numvouts-1].scriptPubKey,tokenid,pegstxid,pk,amount,account)=='F') return("fund"); - break; - case 'G': if (DecodePegsGetOpRet(tx,pegstxid,tokenid,pk,amount,account)=='G') return("get"); - break; - case 'R': if (DecodePegsRedeemOpRet(tx.vout[numvouts-1].scriptPubKey,tokenid,pegstxid,pk,amount,account)=='R') return("redeem"); - break; - case 'E': if (DecodePegsExchangeOpRet(tx.vout[numvouts-1].scriptPubKey,tokenid,pegstxid,pk,amount,account)=='R') return("exchange"); - break; - case 'L': if (DecodePegsLiquidateOpRet(tx.vout[numvouts-1].scriptPubKey,tokenid,pegstxid,pk,amount,account)=='L') return("liquidate"); - break; - } - } - return (""); -} - -char PegsFindAccount(struct CCcontract_info *cp,CPubKey pk,uint256 pegstxid, uint256 tokenid, uint256 &accounttxid, std::pair &account) -{ - char coinaddr[64]; int64_t nValue,tmpamount; uint256 txid,spenttxid,hashBlock,tmptokenid,tmppegstxid; - CTransaction tx,acctx; int32_t numvouts,vout,ratio; char funcid,f; CPubKey pegspk,tmppk; - std::vector > unspentOutputs; - ImportProof proof; CTransaction burntx; std::vector payouts; - - accounttxid=zeroid; - pegspk = GetUnspendable(cp,0); - GetCCaddress1of2(cp,coinaddr,pk,pegspk); - SetCCunspents(unspentOutputs,coinaddr,true); - for (std::vector >::const_iterator it=unspentOutputs.begin(); it!=unspentOutputs.end(); it++) - { - txid = it->first.txhash; - vout = (int32_t)it->first.index; - nValue = (int64_t)it->second.satoshis; - LOGSTREAM("pegscc",CCLOG_DEBUG2, stream << "txid=" << txid.GetHex() << ", vout=" << vout << ", nValue=" << nValue << std::endl); - if (vout == 1 && nValue == CC_MARKER_VALUE && myGetTransaction(txid,tx,hashBlock) != 0 && (numvouts=tx.vout.size())>0 && - (f=DecodePegsOpRet(tx,tmppegstxid,tmptokenid))!=0 && pegstxid==tmppegstxid && tokenid==tmptokenid) - { - accounttxid=txid; - funcid=f; - acctx=tx; - } - } - if (accounttxid!=zeroid && myIsutxo_spentinmempool(spenttxid,ignorevin,accounttxid,1) != 0) - { - accounttxid=zeroid; - if (myGetTransaction(spenttxid,tx,hashBlock)!=0 && (numvouts=tx.vout.size()) > 0 && - (f=DecodePegsOpRet(tx,tmppegstxid,tmptokenid))!=0 && pegstxid==tmppegstxid && tokenid==tmptokenid) - { - funcid=f; - accounttxid=spenttxid; - acctx=tx; - } - } - if (accounttxid!=zeroid) - { - PegsDecodeAccountTx(acctx,tmppk,tmpamount,account); - return(funcid); - } - else return(0); -} - -int64_t PegsGetTokenPrice(uint256 tokenid) -{ - return (0); -} - -std::string PegsGetTokenName(uint256 tokenid) -{ - CTransaction tokentx; uint256 hashBlock; std::string name,desc; std::vector vorigpubkey; int32_t numvouts; - - if (myGetTransaction(tokenid,tokentx,hashBlock)!=0 && (numvouts=tokentx.vout.size())>0 && DecodeTokenCreateOpRet(tokentx.vout[numvouts-1].scriptPubKey,vorigpubkey,name,desc)=='c') - { - return (name); - } - CCerror = strprintf("cant find token create or invalid tokenid %s",tokenid.GetHex()); - LOGSTREAM("pegscc",CCLOG_INFO, stream << CCerror << std::endl); - return(""); -} - -int64_t PegsGetTokensAmountPerPrice(int64_t amount,uint256 tokenid) -{ - mpz_t res,a,b; - mpz_init(res); - mpz_init(a); - mpz_init(b); - mpz_set_si(a, amount); - mpz_set_si(b, COIN); - mpz_mul(res, a, b); - mpz_set_si(a, PegsGetTokenPrice(tokenid)); - mpz_tdiv_q(res, res, a); - return (mpz_get_si(res)); -} - -double PegsGetRatio(uint256 tokenid,std::pair account) -{ - mpz_t res,a,b; - mpz_init(res); - mpz_init(a); - mpz_init(b); - mpz_set_si(a, account.first); - mpz_set_si(b, PegsGetTokenPrice(tokenid)); - mpz_mul(res, a, b); - mpz_set_si(a, COIN); - mpz_tdiv_q(res, res, a); - return ((double)account.second)*100/mpz_get_si(res); -} - -double PegsGetAccountRatio(uint256 pegstxid,uint256 tokenid,uint256 accounttxid) -{ - int64_t amount; uint256 hashBlock,tmptokenid,tmppegstxid; - CTransaction tx; int32_t numvouts; char funcid; CPubKey pk; - std::pair account; struct CCcontract_info *cp,C; - - cp = CCinit(&C,EVAL_PEGS); - if (myGetTransaction(accounttxid,tx,hashBlock) != 0 && (numvouts=tx.vout.size())>0 && - (funcid=DecodePegsOpRet(tx,tmppegstxid,tmptokenid))!=0 && pegstxid==tmppegstxid && tokenid==tmptokenid) - { - PegsDecodeAccountTx(tx,pk,amount,account); - return PegsGetRatio(tokenid,account); - } - return (0); -} - -double PegsGetGlobalRatio(uint256 pegstxid) -{ - char coinaddr[64]; int64_t nValue,amount,globaldebt=0; uint256 txid,accounttxid,hashBlock,tmppegstxid,tokenid; - CTransaction tx; int32_t numvouts,vout; char funcid; CPubKey mypk,pegspk,pk; - std::vector > unspentOutputs; std::pair account; - std::map> globalaccounts; - struct CCcontract_info *cp,C; - - cp = CCinit(&C,EVAL_PEGS); - pegspk = GetUnspendable(cp,0); - GetCCaddress1of2(cp,coinaddr,pegspk,pegspk); - SetCCunspents(unspentOutputs,coinaddr,true); - for (std::vector >::const_iterator it=unspentOutputs.begin(); it!=unspentOutputs.end(); it++) - { - txid = it->first.txhash; - vout = (int32_t)it->first.index; - nValue = (int64_t)it->second.satoshis; - if (vout == 0 && nValue == CC_MARKER_VALUE && myGetTransaction(txid,tx,hashBlock) != 0 && (numvouts=tx.vout.size())>0 && - (funcid=DecodePegsOpRet(tx,tmppegstxid,tokenid))!=0 && pegstxid==tmppegstxid && (funcid=='F' || funcid=='G' || funcid=='E')) - { - PegsDecodeAccountTx(tx,pk,amount,account); - globalaccounts[tokenid].first+=account.first; - globalaccounts[tokenid].second+=account.second; - } - } - unspentOutputs.clear(); - GetTokensCCaddress(cp,coinaddr,pegspk); - SetCCunspents(unspentOutputs,coinaddr,true); - for (std::vector >::const_iterator it=unspentOutputs.begin(); it!=unspentOutputs.end(); it++) - { - txid = it->first.txhash; - vout = (int32_t)it->first.index; - nValue = (int64_t)it->second.satoshis; - if (myGetTransaction(txid,tx,hashBlock) != 0 && (numvouts=tx.vout.size())>0 && DecodePegsOpRet(tx,tmppegstxid,tokenid)!=0 && pegstxid==tmppegstxid) - { - globalaccounts[tokenid].first+=nValue; - } - } - mpz_t res,globaldeposit,a,b; - mpz_init(res); - mpz_init(globaldeposit); - mpz_init(a); - mpz_init(b); - mpz_set_si(globaldeposit, 0); - for (std::map>::iterator it = globalaccounts.begin(); it != globalaccounts.end(); ++it) - { - mpz_set_si(res, 0); - mpz_set_si(a, globalaccounts[it->first].first); - mpz_set_si(b, PegsGetTokenPrice(it->first)); - mpz_mul(res,a,b); - mpz_add(globaldeposit,globaldeposit,res); - globaldebt+=globalaccounts[it->first].second; - } - if (globaldebt>0) - { - mpz_set_si(res, 0); - mpz_set_si(a, COIN); - mpz_tdiv_q(res, globaldeposit, a); - printf("%lu %lu\n",globaldebt,mpz_get_si(res)); - return ((double)globaldebt)*100/mpz_get_si(res); - } - return (0); -} - -std::string PegsFindBestAccount(struct CCcontract_info *cp,uint256 pegstxid, uint256 tokenid, int64_t tokenamount,uint256 &accounttxid, std::pair &account) -{ - char coinaddr[64]; int64_t nValue,tmpamount; uint256 txid,hashBlock,tmptokenid,tmppegstxid; - CTransaction tx,acctx; int32_t numvouts,vout; char funcid,f; CPubKey pegspk,tmppk; - std::vector > unspentOutputs; - ImportProof proof; CTransaction burntx; std::vector payouts; double ratio,maxratio=0; - std::pair tmpaccount; - - accounttxid=zeroid; - pegspk = GetUnspendable(cp,0); - GetCCaddress1of2(cp,coinaddr,pegspk,pegspk); - SetCCunspents(unspentOutputs,coinaddr,true); - for (std::vector >::const_iterator it=unspentOutputs.begin(); it!=unspentOutputs.end(); it++) - { - txid = it->first.txhash; - vout = (int32_t)it->first.index; - nValue = (int64_t)it->second.satoshis; - LOGSTREAM("pegscc",CCLOG_DEBUG2, stream << "txid=" << txid.GetHex() << ", vout=" << vout << ", nValue=" << nValue << std::endl); - if (vout == 0 && nValue == CC_MARKER_VALUE && myIsutxo_spentinmempool(ignoretxid,ignorevin,txid,0) == 0 && - (ratio=PegsGetAccountRatio(pegstxid,tokenid,txid))>(ASSETCHAINS_PEGSCCPARAMS[2]?ASSETCHAINS_PEGSCCPARAMS[2]:PEGS_ACCOUNT_YELLOW_ZONE) && ratio>maxratio) - { - if (myGetTransaction(txid,tx,hashBlock)!=0 && !PegsDecodeAccountTx(tx,tmppk,tmpamount,tmpaccount).empty() && tmpaccount.first>=tokenamount) - { - accounttxid=txid; - acctx=tx; - maxratio=ratio; - } - } - } - if (accounttxid!=zeroid) - { - return(PegsDecodeAccountTx(acctx,tmppk,tmpamount,account)); - } - else return(""); -} - -UniValue PegsCreate(const CPubKey& pk,uint64_t txfee,int64_t amount, std::vector bindtxids) -{ - CMutableTransaction mtx = CreateNewContextualCMutableTransaction(Params().GetConsensus(), hush_nextheight()); - CPubKey mypk,pegspk; struct CCcontract_info *cp,C; CTransaction tx; int32_t numvouts; int64_t totalsupply; std::string coin; - char depositaddr[64]; uint256 txid,hashBlock,tmptokenid,oracletxid; uint8_t M,N,taddr,prefix,prefix2,wiftype; std::vector pubkeys; - - cp = CCinit(&C,EVAL_PEGS); - if ( txfee == 0 ) - txfee = 10000; - mypk = pk.IsValid()?pk:pubkey2pk(Mypubkey()); - pegspk = GetUnspendable(cp,0); - for(auto txid : bindtxids) - { - if (myGetTransaction(txid,tx,hashBlock)==0 || (numvouts=tx.vout.size())<=0) - CCERR_RESULT("pegscc",CCLOG_INFO, stream << "cant find bindtxid " << txid.GetHex()); - if (DecodeGatewaysBindOpRet(depositaddr,tx.vout[numvouts-1].scriptPubKey,tmptokenid,coin,totalsupply,oracletxid,M,N,pubkeys,taddr,prefix,prefix2,wiftype)!='B') - CCERR_RESULT("pegscc",CCLOG_INFO, stream << "invalid bindtxid " << txid.GetHex()); - } - if ( AddNormalinputs(mtx,mypk,amount,64,pk.IsValid()) >= amount ) - { - for (int i=0; i<100; i++) mtx.vout.push_back(MakeCC1vout(EVAL_PEGS,(amount-txfee)/100,pegspk)); - return(FinalizeCCTxExt(pk.IsValid(),0,cp,mtx,mypk,txfee,EncodePegsCreateOpRet(bindtxids))); - } - CCERR_RESULT("pegscc",CCLOG_INFO, stream << "error adding normal inputs"); -} - -UniValue PegsFund(const CPubKey& pk,uint64_t txfee,uint256 pegstxid, uint256 tokenid,int64_t amount) -{ - CMutableTransaction mtx = CreateNewContextualCMutableTransaction(Params().GetConsensus(), hush_nextheight()); std::string coin; - CTransaction pegstx,tx; int32_t numvouts; int64_t totalsupply,balance=0,funds=0,tokenfunds=0; uint256 accounttxid=zeroid,hashBlock,txid,tmptokenid,oracletxid; - CPubKey mypk,pegspk,tmppk; struct CCcontract_info *cp,*cpTokens,CTokens,C; char depositaddr[64],coinaddr[64]; std::pair account(0,0); - uint8_t M,N,taddr,prefix,prefix2,wiftype,mypriv[32]; std::vector pubkeys; bool found=false; std::vector bindtxids; - - cp = CCinit(&C,EVAL_PEGS); - cpTokens = CCinit(&CTokens,EVAL_TOKENS); - if ( txfee == 0 ) - txfee = 10000; - mypk = pk.IsValid()?pk:pubkey2pk(Mypubkey()); - pegspk = GetUnspendable(cp,0); - if (myGetTransaction(pegstxid,tx,hashBlock)==0 || (numvouts=tx.vout.size())<=0) - CCERR_RESULT("pegscc",CCLOG_INFO, stream << "cant find pegstxid " << pegstxid.GetHex()); - if (DecodePegsCreateOpRet(tx.vout[numvouts-1].scriptPubKey,bindtxids)!='C') - CCERR_RESULT("pegscc",CCLOG_INFO, stream << "invalid pegstxid " << pegstxid.GetHex()); - for(auto txid : bindtxids) - { - if (myGetTransaction(txid,tx,hashBlock)==0 || (numvouts=tx.vout.size())<=0) - CCERR_RESULT("pegscc",CCLOG_INFO, stream << "cant find bindtxid " << txid.GetHex()); - if (DecodeGatewaysBindOpRet(depositaddr,tx.vout[numvouts-1].scriptPubKey,tmptokenid,coin,totalsupply,oracletxid,M,N,pubkeys,taddr,prefix,prefix2,wiftype)!='B') - CCERR_RESULT("pegscc",CCLOG_INFO, stream << "invalid bindtxid " << txid.GetHex()); - if (tmptokenid==tokenid) - { - found=true; - break; - } - } - if (!found) - CCERR_RESULT("pegscc",CCLOG_INFO, stream << "invalid tokenid " << tokenid.GetHex()); - if ((balance=GetTokenBalance(mypk,tokenid))>=amount) - { - PegsFindAccount(cp,mypk,pegstxid,tokenid,accounttxid,account); - LOGSTREAM("pegscc",CCLOG_DEBUG2, stream << "current accounttxid=" << accounttxid.GetHex() << " [deposit=" << account.first << ",debt=" << account.second << "]" << std::endl); - if (accounttxid!=zeroid && myIsutxo_spentinmempool(ignoretxid,ignorevin,accounttxid,1) != 0) - CCERR_RESULT("pegscc",CCLOG_INFO, stream << "previous account tx not yet confirmed"); - if (accounttxid!=zeroid && (funds=AddPegsInputs(cp,mtx,pegspk,CPubKey(),txfee,1))>=txfee) - { - funds+=2*CC_MARKER_VALUE; - mtx.vin.push_back(CTxIn(accounttxid,0,CScript())); - Myprivkey(mypriv); - mtx.vin.push_back(CTxIn(accounttxid,1,CScript())); - GetCCaddress1of2(cp,coinaddr,mypk,pegspk); - CCaddr1of2set(cp,mypk,pegspk,mypriv,coinaddr); - memset(mypriv,0,sizeof(mypriv)); - } - else funds=AddPegsInputs(cp,mtx,pegspk,CPubKey(),txfee+2*CC_MARKER_VALUE,3); - if (funds>=txfee+2*CC_MARKER_VALUE) - { - if ((tokenfunds=AddTokenCCInputs(cpTokens,mtx,mypk,tokenid,amount,64))>=amount) - { - mtx.vout.push_back(MakeCC1of2vout(EVAL_PEGS,CC_MARKER_VALUE,pegspk,pegspk)); - mtx.vout.push_back(MakeCC1of2vout(EVAL_PEGS,CC_MARKER_VALUE,mypk,pegspk)); - mtx.vout.push_back(MakeTokensCC1of2vout(EVAL_PEGS,amount,mypk,pegspk)); - if (tokenfunds-amount>0) mtx.vout.push_back(MakeTokensCC1vout(EVAL_TOKENS,tokenfunds-amount,mypk)); - if (funds>txfee+2*CC_MARKER_VALUE) mtx.vout.push_back(MakeCC1vout(EVAL_PEGS,funds-(txfee+2*CC_MARKER_VALUE),pegspk)); - account.first+=amount; - LOGSTREAM("pegscc",CCLOG_DEBUG2, stream << "new account [deposit=" << account.first << ",debt=" << account.second << "]" << std::endl); - return(FinalizeCCTxExt(pk.IsValid(),0,cp,mtx,mypk,txfee,EncodePegsFundOpRet(tokenid,pegstxid,mypk,amount,account))); - } - } - else - CCERR_RESULT("pegscc",CCLOG_INFO, stream <<"not enough balance in pegs global CC address"); - } - CCERR_RESULT("pegscc",CCLOG_INFO, stream << "not enough balance (" << balance << ") for this amount of tokens " << amount); -} - -UniValue PegsGet(const CPubKey& pk,uint64_t txfee,uint256 pegstxid, uint256 tokenid, int64_t amount) -{ - CMutableTransaction burntx = CreateNewContextualCMutableTransaction(Params().GetConsensus(), hush_nextheight()),mtx; - CTransaction pegstx,tx; int32_t numvouts; int64_t funds=0; uint256 accounttxid=zeroid,hashBlock,pricestxid; char coinaddr[64]; - CPubKey mypk,pegspk,tmppk; struct CCcontract_info *cp,C; std::pair account(0,0); uint8_t mypriv[32]; - std::vector dummyproof; std::vector vouts; std::vector bindtxids; CScript opret; - - cp = CCinit(&C,EVAL_PEGS); - if ( txfee == 0 ) - txfee = 10000; - mypk = pk.IsValid()?pk:pubkey2pk(Mypubkey()); - pegspk = GetUnspendable(cp,0); - if (myGetTransaction(pegstxid,tx,hashBlock)==0 || (numvouts=tx.vout.size())<=0) - CCERR_RESULT("pegscc",CCLOG_INFO, stream << "cant find pegstxid " << pegstxid.GetHex()); - if (DecodePegsCreateOpRet(tx.vout[numvouts-1].scriptPubKey,bindtxids)!='C') - CCERR_RESULT("pegscc",CCLOG_INFO, stream << "invalid pegstxid " << pegstxid.GetHex()); - if (PegsFindAccount(cp,mypk,pegstxid,tokenid,accounttxid,account)==0) - CCERR_RESULT("pegscc",CCLOG_INFO, stream << "cannot find account from which to issue coins, fund account first with pegsfund!"); - if (accounttxid!=zeroid && myIsutxo_spentinmempool(ignoretxid,ignorevin,accounttxid,1) != 0) - CCERR_RESULT("pegscc",CCLOG_INFO, stream << "previous account tx not yet confirmed"); - LOGSTREAM("pegscc",CCLOG_DEBUG2, stream << "current accounttxid=" << accounttxid.GetHex() << " [deposit=" << account.first << ",debt=" << account.second << "]" << std::endl); - // spending markers - vouts.push_back(MakeCC1of2vout(EVAL_PEGS,CC_MARKER_VALUE,pegspk,pegspk)); - vouts.push_back(MakeCC1of2vout(EVAL_PEGS,CC_MARKER_VALUE,mypk,pegspk)); - // coin issue - vouts.push_back(CTxOut(amount,CScript() << ParseHex(HexStr(mypk)) << OP_CHECKSIG)); - account.second+=amount; - if (PegsGetRatio(tokenid,account)>PEGS_ACCOUNT_MAX_DEBT) - { - CCerror = strprintf("not possible to take more than %d%% of the deposit",PEGS_ACCOUNT_MAX_DEBT); - LOGSTREAM("pegscc",CCLOG_INFO, stream << CCerror << std::endl); - return(""); - } - LOGSTREAM("pegscc",CCLOG_DEBUG2, stream << "new account [deposit=" << account.first << ",debt=" << account.second << "]" << std::endl); - // burn tx does not exist in pegs method but it must be created in order for import validation to pass - // fictive burntx input of previous account state tx - burntx.vin.push_back(CTxIn(accounttxid,0,CScript())); - // fictive output of coins in burn tx - burntx.vout.push_back(MakeBurnOutput(amount,0xffffffff,"PEGSCC",vouts,dummyproof,pegstxid,tokenid,mypk,amount,account)); - std::vector leaftxids; - BitcoinGetProofMerkleRoot(dummyproof, leaftxids); - MerkleBranch newBranch(0, leaftxids); - TxProof txProof = std::make_pair(burntx.GetHash(), newBranch); - mtx=MakePegsImportCoinTransaction(txProof,burntx,vouts); - Myprivkey(mypriv); - GetCCaddress1of2(cp,coinaddr,mypk,pegspk); - CCaddr1of2set(cp,mypk,pegspk,mypriv,coinaddr); - UniValue retstr = FinalizeCCTxExt(pk.IsValid(),0,cp,mtx,mypk,txfee,opret); - memset(mypriv,0,sizeof(mypriv)); - return(retstr); -} - -UniValue PegsRedeem(const CPubKey& pk,uint64_t txfee,uint256 pegstxid, uint256 tokenid) -{ - CMutableTransaction mtx = CreateNewContextualCMutableTransaction(Params().GetConsensus(), hush_nextheight()); std::string coin; - CTransaction pegstx,tx; int32_t numvouts; int64_t totalsupply,pegsfunds=0,funds=0,tokenfunds=0,amount; uint256 accounttxid=zeroid,hashBlock,txid,tmptokenid,oracletxid; - CPubKey mypk,pegspk,tmppk; struct CCcontract_info *cp,*cpTokens,CTokens,C; char depositaddr[64],coinaddr[64]; std::pair account(0,0); - uint8_t M,N,taddr,prefix,prefix2,wiftype,mypriv[32]; std::vector pubkeys; bool found=false; std::vector bindtxids; - - cp = CCinit(&C,EVAL_PEGS); - cpTokens = CCinit(&CTokens,EVAL_TOKENS); - if ( txfee == 0 ) - txfee = 10000; - mypk = pk.IsValid()?pk:pubkey2pk(Mypubkey()); - pegspk = GetUnspendable(cp,0); - if (myGetTransaction(pegstxid,tx,hashBlock)==0 || (numvouts=tx.vout.size())<=0) - CCERR_RESULT("pegscc",CCLOG_INFO, stream << "cant find pegstxid " << pegstxid.GetHex()); - if (DecodePegsCreateOpRet(tx.vout[numvouts-1].scriptPubKey,bindtxids)!='C') - CCERR_RESULT("pegscc",CCLOG_INFO, stream << "invalid pegstxid " << pegstxid.GetHex()); - for(auto txid : bindtxids) - { - if (myGetTransaction(txid,tx,hashBlock)==0 || (numvouts=tx.vout.size())<=0) - CCERR_RESULT("pegscc",CCLOG_INFO, stream << "cant find bindtxid " << txid.GetHex()); - if (DecodeGatewaysBindOpRet(depositaddr,tx.vout[numvouts-1].scriptPubKey,tmptokenid,coin,totalsupply,oracletxid,M,N,pubkeys,taddr,prefix,prefix2,wiftype)!='B') - CCERR_RESULT("pegscc",CCLOG_INFO, stream << "invalid bindtxid " << txid.GetHex()); - if (tmptokenid==tokenid) - { - found=true; - break; - } - } - if (!found) - CCERR_RESULT("pegscc",CCLOG_INFO, stream << "invalid tokenid " << tokenid.GetHex()); - if (PegsFindAccount(cp,mypk,pegstxid,tokenid,accounttxid,account)==0) - CCERR_RESULT("pegscc",CCLOG_INFO, stream << "cannot find account from which to redeem tokens!"); - if (accounttxid!=zeroid && myIsutxo_spentinmempool(ignoretxid,ignorevin,accounttxid,1) != 0) - CCERR_RESULT("pegscc",CCLOG_INFO, stream << "previous account tx not yet confirmed"); - LOGSTREAM("pegscc",CCLOG_DEBUG2, stream << "current accounttxid=" << accounttxid.GetHex() << " [deposit=" << account.first << ",debt=" << account.second << "]" << std::endl); - if ((funds=AddNormalinputs(mtx,mypk,account.second,64,pk.IsValid()))>=account.second ) - { - if (accounttxid!=zeroid && (pegsfunds=AddPegsInputs(cp,mtx,pegspk,CPubKey(),txfee,1))>=txfee) - { - pegsfunds+=2*CC_MARKER_VALUE; - mtx.vin.push_back(CTxIn(accounttxid,0,CScript())); - mtx.vin.push_back(CTxIn(accounttxid,1,CScript())); - Myprivkey(mypriv); - GetCCaddress1of2(cp,coinaddr,mypk,pegspk); - CCaddr1of2set(cp,mypk,pegspk,mypriv,coinaddr); - amount=account.first; - if ((tokenfunds=AddPegsTokenInputs(cp,mtx,pegstxid,tokenid,mypk,pegspk,amount,64))>=amount) - { - if (pegsfunds>=txfee+2*CC_MARKER_VALUE) - { - mtx.vout.push_back(MakeCC1of2vout(EVAL_PEGS,CC_MARKER_VALUE,pegspk,pegspk)); - mtx.vout.push_back(MakeCC1of2vout(EVAL_PEGS,CC_MARKER_VALUE,mypk,pegspk)); - mtx.vout.push_back(MakeTokensCC1vout(EVAL_TOKENS,amount,mypk)); - mtx.vout.push_back(CTxOut(account.second,CScript() << ParseHex(HexStr(CCtxidaddr(coinaddr,pegstxid))) << OP_CHECKSIG)); - if (pegsfunds>txfee+2*CC_MARKER_VALUE) mtx.vout.push_back(MakeCC1vout(EVAL_PEGS,pegsfunds-(txfee+2*CC_MARKER_VALUE),pegspk)); - account.first=0; - account.second=0; - LOGSTREAM("pegscc",CCLOG_DEBUG2, stream << "new account [deposit=" << account.first << ",debt=" << account.second << "]" << std::endl); - UniValue retstr = FinalizeCCTxExt(pk.IsValid(),0,cp,mtx,mypk,txfee,EncodePegsReedemOpRet(tokenid,pegstxid,mypk,amount,account)); - memset(mypriv,0,32); - return(retstr); - } - else - { - memset(mypriv,0,32); - CCERR_RESULT("pegscc",CCLOG_INFO, stream << "not enough balance in pegs global CC address"); - } - } - memset(mypriv,0,32); - CCERR_RESULT("pegscc",CCLOG_INFO, stream << "not enough tokens in pegs account (" << tokenfunds << ") to redeem this amount of tokens " << account.first); - } - else - { - memset(mypriv,0,32); - CCERR_RESULT("pegscc",CCLOG_INFO, stream << "not enough balance in pegs global CC address"); - } - } - memset(mypriv,0,32); - CCERR_RESULT("pegscc",CCLOG_INFO, stream << "to redeem from account and close it you must redeem full debt ammount " << account.second << " instead of " << funds); -} - - -UniValue PegsExchange(const CPubKey& pk,uint64_t txfee,uint256 pegstxid, uint256 tokenid, int64_t amount) -{ - CMutableTransaction mtx = CreateNewContextualCMutableTransaction(Params().GetConsensus(), hush_nextheight()); std::string coin; - CTransaction pegstx,tx; int32_t numvouts; int64_t totalsupply,pegsfunds=0,funds=0,tokenfunds=0,tokenamount,tmpamount; uint256 accounttxid=zeroid,hashBlock,txid,tmptokenid,oracletxid; - CPubKey mypk,pegspk,tmppk; struct CCcontract_info *cp,*cpTokens,CTokens,C; char depositaddr[64],coinaddr[64]; std::pair account(0,0); - uint8_t M,N,taddr,prefix,prefix2,wiftype,mypriv[32]; std::vector pubkeys; bool found=false; std::vector bindtxids; - - cp = CCinit(&C,EVAL_PEGS); - cpTokens = CCinit(&CTokens,EVAL_TOKENS); - if ( txfee == 0 ) - txfee = 10000; - mypk = pk.IsValid()?pk:pubkey2pk(Mypubkey()); - pegspk = GetUnspendable(cp,0); - if (myGetTransaction(pegstxid,tx,hashBlock)==0 || (numvouts=tx.vout.size())<=0) - CCERR_RESULT("pegscc",CCLOG_INFO, stream << "cant find pegstxid " << pegstxid.GetHex()); - if (DecodePegsCreateOpRet(tx.vout[numvouts-1].scriptPubKey,bindtxids)!='C') - CCERR_RESULT("pegscc",CCLOG_INFO, stream << "invalid pegstxid " << pegstxid.GetHex()); - for(auto txid : bindtxids) - { - if (myGetTransaction(txid,tx,hashBlock)==0 || (numvouts=tx.vout.size())<=0) - CCERR_RESULT("pegscc",CCLOG_INFO, stream << "cant find bindtxid " << txid.GetHex()); - if (DecodeGatewaysBindOpRet(depositaddr,tx.vout[numvouts-1].scriptPubKey,tmptokenid,coin,totalsupply,oracletxid,M,N,pubkeys,taddr,prefix,prefix2,wiftype)!='B') - CCERR_RESULT("pegscc",CCLOG_INFO, stream << "invalid bindtxid " << txid.GetHex()); - if (tmptokenid==tokenid) - { - found=true; - break; - } - } - if (!found) - CCERR_RESULT("pegscc",CCLOG_INFO, stream << "invalid tokenid " << tokenid.GetHex()); - if (PegsFindAccount(cp,mypk,pegstxid,tokenid,accounttxid,account)!=0) - CCERR_RESULT("pegscc",CCLOG_INFO, stream << "you have active account, please close account first before exchanging other coins!"); - if ((funds=AddNormalinputs(mtx,mypk,amount,64,pk.IsValid()))>=amount ) - { - if ((pegsfunds=AddPegsInputs(cp,mtx,pegspk,CPubKey(),txfee,1))>=txfee) - { - tokenamount=PegsGetTokensAmountPerPrice(amount,tokenid); - tokenfunds=AddPegsTokenInputs(cp,mtx,pegstxid,tokenid,pegspk,CPubKey(),tokenamount,64); - if (tokenfundsCCpriv,coinaddr); - pegsfunds+=2*CC_MARKER_VALUE; - } - if (tokenfunds>=tokenamount) - { - if (accounttxid!=zeroid) - { - mtx.vout.push_back(MakeCC1of2vout(EVAL_PEGS,CC_MARKER_VALUE,pegspk,pegspk)); - mtx.vout.push_back(MakeCC1of2vout(EVAL_PEGS,CC_MARKER_VALUE,tmppk,pegspk)); - } - if ((accounttxid!=zeroid && pegsfunds>=txfee+2*CC_MARKER_VALUE) || pegsfunds>=txfee) - { - mtx.vout.push_back(MakeTokensCC1vout(EVAL_TOKENS,tokenamount,mypk)); - mtx.vout.push_back(CTxOut(amount,CScript() << ParseHex(HexStr(CCtxidaddr(coinaddr,pegstxid))) << OP_CHECKSIG)); - if (tokenfunds>tokenamount) mtx.vout.push_back(MakeTokensCC1of2vout(EVAL_PEGS,tokenfunds-tokenamount,tmppk,pegspk)); - if (accounttxid!=zeroid) - { - if (pegsfunds>txfee+2*CC_MARKER_VALUE) mtx.vout.push_back(MakeCC1vout(EVAL_PEGS,pegsfunds-(txfee+2*CC_MARKER_VALUE),pegspk)); - account.first=account.first-tokenamount; - account.second=account.second-amount; - } - else if (pegsfunds>txfee) mtx.vout.push_back(MakeCC1vout(EVAL_PEGS,pegsfunds-txfee,pegspk)); - LOGSTREAM("pegscc",CCLOG_DEBUG2, stream << "modified account [deposit=" << account.first << ",debt=" << account.second << "]" << std::endl); - return(FinalizeCCTxExt(pk.IsValid(),0,cp,mtx,mypk,txfee,EncodePegsExchangeOpRet(tokenid,pegstxid,mypk,tmppk,amount,account))); - } - else - CCERR_RESULT("pegscc",CCLOG_INFO, stream << "not enough balance in pegs global CC address"); - } - CCERR_RESULT("pegscc",CCLOG_INFO, stream << "not enough tokens in pegs account (" << tokenfunds << ") to exchange to this amount of tokens " << tokenamount); - } - else - CCERR_RESULT("pegscc",CCLOG_INFO, stream << "not enough balance in pegs global CC address"); - } - CCERR_RESULT("pegscc",CCLOG_INFO, stream << "not enough funds to exchange " << amount << " coins to tokens - balance " << funds); -} - -UniValue PegsLiquidate(const CPubKey& pk,uint64_t txfee,uint256 pegstxid, uint256 tokenid, uint256 liquidatetxid) -{ - CMutableTransaction mtx = CreateNewContextualCMutableTransaction(Params().GetConsensus(), hush_nextheight()); std::string coin; - CTransaction pegstx,tx; int32_t numvouts; int64_t totalsupply,pegsfunds=0,funds=0,tokenfunds=0,amount,tmpamount,tokenamount,burnamount; - CPubKey mypk,pegspk,tmppk; struct CCcontract_info *cp,*cpTokens,CTokens,C; char depositaddr[64],coinaddr[64]; std::pair account(0,0),myaccount(0,0); - uint8_t M,N,taddr,prefix,prefix2,wiftype; std::vector pubkeys; bool found=false; std::vector bindtxids; - uint256 hashBlock,txid,tmptokenid,oracletxid,accounttxid; - - cp = CCinit(&C,EVAL_PEGS); - cpTokens = CCinit(&CTokens,EVAL_TOKENS); - if ( txfee == 0 ) - txfee = 10000; - mypk = pk.IsValid()?pk:pubkey2pk(Mypubkey()); - pegspk = GetUnspendable(cp,0); - if (myGetTransaction(pegstxid,tx,hashBlock)==0 || (numvouts=tx.vout.size())<=0) - CCERR_RESULT("pegscc",CCLOG_INFO, stream << "cant find pegstxid " << pegstxid.GetHex()); - if (DecodePegsCreateOpRet(tx.vout[numvouts-1].scriptPubKey,bindtxids)!='C') - CCERR_RESULT("pegscc",CCLOG_INFO, stream << "invalid pegstxid " << pegstxid.GetHex()); - for(auto txid : bindtxids) - { - if (myGetTransaction(txid,tx,hashBlock)==0 || (numvouts=tx.vout.size())<=0) - CCERR_RESULT("pegscc",CCLOG_INFO, stream << "cant find bindtxid " << txid.GetHex()); - if (DecodeGatewaysBindOpRet(depositaddr,tx.vout[numvouts-1].scriptPubKey,tmptokenid,coin,totalsupply,oracletxid,M,N,pubkeys,taddr,prefix,prefix2,wiftype)!='B') - CCERR_RESULT("pegscc",CCLOG_INFO, stream << "invalid bindtxid " << txid.GetHex()); - if (tmptokenid==tokenid) - { - found=true; - break; - } - } - if (!found) - CCERR_RESULT("pegscc",CCLOG_INFO, stream << "invalid tokenid " << tokenid.GetHex()); - if (PegsFindAccount(cp,mypk,pegstxid,tokenid,accounttxid,myaccount)==0) - CCERR_RESULT("pegscc",CCLOG_INFO, stream << "cannot find account, you must have an account to liquidate another account!"); - if (accounttxid!=zeroid && myIsutxo_spentinmempool(ignoretxid,ignorevin,accounttxid,1) != 0) - CCERR_RESULT("pegscc",CCLOG_INFO, stream << "previous account tx not yet confirmed"); - if (PegsGetAccountRatio(pegstxid,tokenid,liquidatetxid)<(ASSETCHAINS_PEGSCCPARAMS[0]?ASSETCHAINS_PEGSCCPARAMS[0]:PEGS_ACCOUNT_RED_ZONE) || PegsGetGlobalRatio(pegstxid)<(ASSETCHAINS_PEGSCCPARAMS[1]?ASSETCHAINS_PEGSCCPARAMS[1]:PEGS_ACCOUNT_RED_ZONE)) - CCERR_RESULT("pegscc",CCLOG_INFO, stream << "not able to liquidate account until account ratio > " << (ASSETCHAINS_PEGSCCPARAMS[0]?ASSETCHAINS_PEGSCCPARAMS[0]:PEGS_ACCOUNT_RED_ZONE) << "% and global ratio > " << (ASSETCHAINS_PEGSCCPARAMS[1]?ASSETCHAINS_PEGSCCPARAMS[1]:PEGS_ACCOUNT_RED_ZONE) << "%"); - if (liquidatetxid!=zeroid && myGetTransaction(liquidatetxid,tx,hashBlock)==0 || (numvouts=tx.vout.size())<=0 || PegsDecodeAccountTx(tx,tmppk,amount,account).empty()) - CCERR_RESULT("pegscc",CCLOG_INFO, stream << "cannot find account to liquidate or invalid tx " << liquidatetxid.GetHex()); - if (liquidatetxid!=zeroid && myIsutxo_spentinmempool(ignoretxid,ignorevin,liquidatetxid,1) != 0) - CCERR_RESULT("pegscc",CCLOG_INFO, stream << "previous liquidate account tx not yet confirmed"); - LOGSTREAM("pegscc",CCLOG_DEBUG2, stream << "current accounttxid=" << accounttxid.GetHex() << " [deposit=" << account.first << ",debt=" << account.second << "]" << std::endl); - tokenamount=account.first; - burnamount=account.second; - tmpamount=PegsGetTokensAmountPerPrice(burnamount,tokenid)*105/100; - amount=tmpamount+((tokenamount-tmpamount)*10/100); - if ((funds=AddNormalinputs(mtx,mypk,account.second,64))>=burnamount) - { - if (liquidatetxid!=zeroid && (pegsfunds=AddPegsInputs(cp,mtx,pegspk,CPubKey(),txfee,1))>=txfee) - { - pegsfunds+=2*CC_MARKER_VALUE; - mtx.vin.push_back(CTxIn(liquidatetxid,0,CScript())); - mtx.vin.push_back(CTxIn(liquidatetxid,1,CScript())); - GetCCaddress1of2(cp,coinaddr,tmppk,pegspk); - CCaddr1of2set(cp,tmppk,pegspk,cp->CCpriv,coinaddr); - if ((tokenfunds=AddPegsTokenInputs(cp,mtx,pegstxid,tokenid,tmppk,pegspk,tokenamount,64))==tokenamount) - { - if (pegsfunds>=txfee+2*CC_MARKER_VALUE) - { - mtx.vout.push_back(MakeCC1of2vout(EVAL_PEGS,CC_MARKER_VALUE,pegspk,pegspk)); - mtx.vout.push_back(MakeCC1of2vout(EVAL_PEGS,CC_MARKER_VALUE,tmppk,pegspk)); - mtx.vout.push_back(MakeTokensCC1vout(EVAL_TOKENS,amount,mypk)); - mtx.vout.push_back(MakeTokensCC1vout(EVAL_PEGS,tokenamount-amount,pegspk)); - mtx.vout.push_back(CTxOut(burnamount,CScript() << ParseHex(HexStr(CCtxidaddr(coinaddr,pegstxid))) << OP_CHECKSIG)); - if (pegsfunds>txfee+2*CC_MARKER_VALUE) mtx.vout.push_back(MakeCC1vout(EVAL_PEGS,pegsfunds-(txfee+2*CC_MARKER_VALUE),pegspk)); - account.first=0; - account.second=0; - LOGSTREAM("pegscc",CCLOG_DEBUG2, stream << "new account [deposit=" << account.first << ",debt=" << account.second << "]" << std::endl); - return(FinalizeCCTxExt(pk.IsValid(),0,cp,mtx,mypk,txfee,EncodePegsLiquidateOpRet(tokenid,pegstxid,mypk,amount,account))); - } - CCERR_RESULT("pegscc",CCLOG_INFO, stream << "not enough balance in pegs global CC address"); - } - CCERR_RESULT("pegscc",CCLOG_INFO, stream << "tokens amount in pegs account " << tokenfunds << " not matching amount in account " << account.first); // this shouldn't happen - } - CCERR_RESULT("pegscc",CCLOG_INFO, stream << "not enough balance in pegs global CC address"); - } - CCERR_RESULT("pegscc",CCLOG_INFO, stream << "not enough funds to liquidate account, you must liquidate full debt ammount " << txfee+account.second << " instead of " << funds); -} - -UniValue PegsAccountHistory(const CPubKey& pk,uint256 pegstxid) -{ - char coinaddr[64]; int64_t nValue,amount; uint256 txid,accounttxid,hashBlock,tmptokenid,tmppegstxid; - CTransaction tx; int32_t numvouts,vout; char funcid; CPubKey mypk,pegspk,tmppk; std::map> accounts; - std::vector txids; std::pair account; std::vector bindtxids; - UniValue result(UniValue::VOBJ),acc(UniValue::VARR); struct CCcontract_info *cp,C; - - if (myGetTransaction(pegstxid,tx,hashBlock)==0 || (numvouts=tx.vout.size())<=0) - CCERR_RESULT("pegscc",CCLOG_INFO, stream << "cant find pegstxid " << pegstxid.GetHex()); - if (DecodePegsCreateOpRet(tx.vout[numvouts-1].scriptPubKey,bindtxids)!='C') - CCERR_RESULT("pegscc",CCLOG_INFO, stream << "invalid pegstxid " << pegstxid.GetHex()); - result.push_back(Pair("result","success")); - result.push_back(Pair("name","pegsaccounthistory")); - cp = CCinit(&C,EVAL_PEGS); - mypk = pk.IsValid()?pk:pubkey2pk(Mypubkey()); - pegspk = GetUnspendable(cp,0); - GetCCaddress1of2(cp,coinaddr,mypk,pegspk); - SetCCtxids(txids,coinaddr,true,EVAL_PEGS,pegstxid,0); - for (std::vector::const_iterator it=txids.begin(); it!=txids.end(); it++) - { - txid = *it; - if (myGetTransaction(txid,tx,hashBlock) != 0 && (numvouts=tx.vout.size())>0 && - (funcid=DecodePegsOpRet(tx,tmppegstxid,tmptokenid))!=0 && pegstxid==tmppegstxid) - { - UniValue obj(UniValue::VOBJ); - obj.push_back(Pair("action",PegsDecodeAccountTx(tx,tmppk,amount,account))); - obj.push_back(Pair("amount",amount)); - obj.push_back(Pair("accounttxid",txid.GetHex())); - obj.push_back(Pair("token",PegsGetTokenName(tmptokenid))); - obj.push_back(Pair("deposit",account.first)); - obj.push_back(Pair("debt",account.second)); - acc.push_back(obj); - } - } - result.push_back(Pair("account history",acc)); - return(result); -} - -UniValue PegsAccountInfo(const CPubKey& pk,uint256 pegstxid) -{ - char coinaddr[64]; int64_t nValue,amount; uint256 txid,accounttxid,hashBlock,tmptokenid,tmppegstxid; std::map> accounts; - CTransaction tx; int32_t numvouts,vout; char funcid; CPubKey mypk,pegspk,tmppk; std::vector bindtxids; - std::vector > unspentOutputs; std::pair account; - UniValue result(UniValue::VOBJ),acc(UniValue::VARR); struct CCcontract_info *cp,C; - - if (myGetTransaction(pegstxid,tx,hashBlock)==0 || (numvouts=tx.vout.size())<=0) - CCERR_RESULT("pegscc",CCLOG_INFO, stream << "cant find pegstxid " << pegstxid.GetHex()); - if (DecodePegsCreateOpRet(tx.vout[numvouts-1].scriptPubKey,bindtxids)!='C') - CCERR_RESULT("pegscc",CCLOG_INFO, stream << "invalid pegstxid " << pegstxid.GetHex()); - result.push_back(Pair("result","success")); - result.push_back(Pair("name","pegsaccountinfo")); - cp = CCinit(&C,EVAL_PEGS); - mypk = pk.IsValid()?pk:pubkey2pk(Mypubkey()); - pegspk = GetUnspendable(cp,0); - GetCCaddress1of2(cp,coinaddr,mypk,pegspk); - SetCCunspents(unspentOutputs,coinaddr,true); - for (std::vector >::const_iterator it=unspentOutputs.begin(); it!=unspentOutputs.end(); it++) - { - txid = it->first.txhash; - vout = (int32_t)it->first.index; - nValue = (int64_t)it->second.satoshis; - //LOGSTREAM("pegscc",CCLOG_DEBUG2, stream << "txid=" << txid.GetHex() << ", vout=" << vout << ", nValue=" << nValue << std::endl); - if (vout == 1 && nValue == CC_MARKER_VALUE && myGetTransaction(txid,tx,hashBlock) != 0 && (numvouts=tx.vout.size())>0 && - (funcid=DecodePegsOpRet(tx,tmppegstxid,tmptokenid))!=0 && pegstxid==tmppegstxid) - { - //LOGSTREAM("pegscc",CCLOG_DEBUG2, stream << "txid=" << txid.GetHex() << ", vout=" << vout << ", nValue=" << nValue << ", tokenid=" << tmptokenid.GetHex() << std::endl); - PegsDecodeAccountTx(tx,tmppk,amount,account); - accounts[tmptokenid].first=account.first; - accounts[tmptokenid].second=account.second; - } - } - for (std::map>::iterator it = accounts.begin(); it != accounts.end(); ++it) - { - UniValue obj(UniValue::VOBJ); - obj.push_back(Pair("token",PegsGetTokenName(it->first))); - obj.push_back(Pair("deposit",accounts[it->first].first)); - obj.push_back(Pair("debt",accounts[it->first].second)); - if (accounts[it->first].first==0 || accounts[it->first].second==0 || PegsGetTokenPrice(it->first)<=0) obj.push_back(Pair("ratio",0)); - else obj.push_back(Pair("ratio",strprintf("%.2f%%",PegsGetRatio(it->first,accounts[it->first])))); - acc.push_back(obj); - } - result.push_back(Pair("account info",acc)); - return(result); -} - -UniValue PegsWorstAccounts(uint256 pegstxid) -{ - char coinaddr[64]; int64_t nValue,amount; uint256 txid,accounttxid,hashBlock,tmppegstxid,tokenid,prev; - CTransaction tx; int32_t numvouts,vout; char funcid; CPubKey pegspk,pk; double ratio; std::vector bindtxids; - std::vector > unspentOutputs; std::pair account; - UniValue result(UniValue::VOBJ),acc(UniValue::VARR); struct CCcontract_info *cp,C; std::multimap map; - - if (myGetTransaction(pegstxid,tx,hashBlock)==0 || (numvouts=tx.vout.size())<=0) - CCERR_RESULT("pegscc",CCLOG_INFO, stream << "cant find pegstxid " << pegstxid.GetHex()); - if (DecodePegsCreateOpRet(tx.vout[numvouts-1].scriptPubKey,bindtxids)!='C') - CCERR_RESULT("pegscc",CCLOG_INFO, stream << "invalid pegstxid " << pegstxid.GetHex()); - result.push_back(Pair("result","success")); - result.push_back(Pair("name","pegsworstaccounts")); - cp = CCinit(&C,EVAL_PEGS); - pegspk = GetUnspendable(cp,0); - GetCCaddress1of2(cp,coinaddr,pegspk,pegspk); - SetCCunspents(unspentOutputs,coinaddr,true); - for (std::vector >::const_iterator it=unspentOutputs.begin(); it!=unspentOutputs.end(); it++) - { - txid = it->first.txhash; - vout = (int32_t)it->first.index; - nValue = (int64_t)it->second.satoshis; - if (vout == 0 && nValue == CC_MARKER_VALUE && myGetTransaction(txid,tx,hashBlock) != 0 && (numvouts=tx.vout.size())>0 && - (funcid=DecodePegsOpRet(tx,tmppegstxid,tokenid))!=0 && pegstxid==tmppegstxid) - { - PegsDecodeAccountTx(tx,pk,amount,account); - if (account.first==0 || account.second==0 || PegsGetTokenPrice(tokenid)<=0) ratio=0; - else ratio=PegsGetRatio(tokenid,account); - if (ratio>PEGS_ACCOUNT_RED_ZONE) - { - UniValue obj(UniValue::VOBJ); - obj.push_back(Pair("accounttxid",txid.GetHex())); - obj.push_back(Pair("deposit",account.first)); - obj.push_back(Pair("debt",account.second)); - obj.push_back(Pair("ratio",strprintf("%.2f%%",ratio))); - map.insert(std::pair(tokenid,obj)); - } - } - } - std::multimap::iterator it = map.begin(); - for (prev=it->first; it != map.end(); ++it) - { - if (it->first!=prev) - { - result.push_back(Pair(PegsGetTokenName(prev),acc)); - acc.clear(); - prev=it->first; - } - acc.push_back(it->second); - } - result.push_back(Pair(PegsGetTokenName(prev),acc)); - return(result); -} - -UniValue PegsInfo(uint256 pegstxid) -{ - char coinaddr[64]; int64_t nValue,amount; uint256 txid,accounttxid,hashBlock,tmppegstxid,tokenid; - CTransaction tx; int32_t numvouts,vout; char funcid; CPubKey pegspk,pk; std::vector bindtxids; - std::vector > unspentOutputs; std::pair account; - std::map> globalaccounts; double globaldeposit=0; - UniValue result(UniValue::VOBJ),acc(UniValue::VARR); struct CCcontract_info *cp,C; - - if (myGetTransaction(pegstxid,tx,hashBlock)==0 || (numvouts=tx.vout.size())<=0) - CCERR_RESULT("pegscc",CCLOG_INFO, stream << "cant find pegstxid " << pegstxid.GetHex()); - if (DecodePegsCreateOpRet(tx.vout[numvouts-1].scriptPubKey,bindtxids)!='C') - CCERR_RESULT("pegscc",CCLOG_INFO, stream << "invalid pegstxid " << pegstxid.GetHex()); - result.push_back(Pair("result","success")); - result.push_back(Pair("name","pegsinfo")); - cp = CCinit(&C,EVAL_PEGS); - pegspk = GetUnspendable(cp,0); - GetCCaddress1of2(cp,coinaddr,pegspk,pegspk); - SetCCunspents(unspentOutputs,coinaddr,true); - for (std::vector >::const_iterator it=unspentOutputs.begin(); it!=unspentOutputs.end(); it++) - { - txid = it->first.txhash; - vout = (int32_t)it->first.index; - nValue = (int64_t)it->second.satoshis; - if (vout == 0 && nValue == CC_MARKER_VALUE && myGetTransaction(txid,tx,hashBlock) != 0 && (numvouts=tx.vout.size())>0 && - (funcid=DecodePegsOpRet(tx,tmppegstxid,tokenid))!=0 && pegstxid==tmppegstxid) - { - PegsDecodeAccountTx(tx,pk,amount,account); - globalaccounts[tokenid].first+=account.first; - globalaccounts[tokenid].second+=account.second; - } - } - unspentOutputs.clear(); - GetTokensCCaddress(cp,coinaddr,pegspk); - SetCCunspents(unspentOutputs,coinaddr,true); - for (std::vector >::const_iterator it=unspentOutputs.begin(); it!=unspentOutputs.end(); it++) - { - txid = it->first.txhash; - vout = (int32_t)it->first.index; - nValue = (int64_t)it->second.satoshis; - if (myGetTransaction(txid,tx,hashBlock) != 0 && (numvouts=tx.vout.size())>0 && DecodePegsOpRet(tx,tmppegstxid,tokenid)!=0 && pegstxid==tmppegstxid) - { - globalaccounts[tokenid].first+=nValue; - } - } - for (std::map>::iterator it = globalaccounts.begin(); it != globalaccounts.end(); ++it) - { - UniValue obj(UniValue::VOBJ); - obj.push_back(Pair("token",PegsGetTokenName(it->first))); - obj.push_back(Pair("total deposit",globalaccounts[it->first].first)); - obj.push_back(Pair("total debt",globalaccounts[it->first].second)); - if (globalaccounts[it->first].first==0 || globalaccounts[it->first].second==0 || PegsGetTokenPrice(it->first)<=0) obj.push_back(Pair("total ratio",0)); - else obj.push_back(Pair("total ratio",strprintf("%.2f%%",PegsGetRatio(it->first,globalaccounts[it->first])))); - acc.push_back(obj); - } - result.push_back(Pair("info",acc)); - result.push_back(Pair("global ratio",strprintf("%.2f%%",PegsGetGlobalRatio(pegstxid)))); - return(result); -} From 196e00c78640c3133bc1e32f6d6b190b34f68b31 Mon Sep 17 00:00:00 2001 From: Duke Date: Sun, 7 Jan 2024 10:24:12 -0800 Subject: [PATCH 015/108] Remove unused variables --- src/miner.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/miner.cpp b/src/miner.cpp index 81fd936a6..edfd1742c 100644 --- a/src/miner.cpp +++ b/src/miner.cpp @@ -174,7 +174,7 @@ CBlockTemplate* CreateNewBlock(CPubKey _pk,const CScript& _scriptPubKeyIn, int32 } } else pk = _pk; - uint64_t deposits,voutsum=0; int32_t isrealtime,hushheight; uint32_t blocktime; const CChainParams& chainparams = Params(); + uint64_t voutsum=0; uint32_t blocktime; const CChainParams& chainparams = Params(); bool fNotarizationBlock = false; std::vector NotarizationNotaries; //fprintf(stderr,"%s: create new block with pubkey=%s\n", __func__, HexStr(pk).c_str()); From 7d73ebd7afe7acae18dff58b3e3b24d49aeb335c Mon Sep 17 00:00:00 2001 From: Duke Date: Sun, 7 Jan 2024 10:25:36 -0800 Subject: [PATCH 016/108] Remove voutsum variable which is calculated but never used --- src/miner.cpp | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/src/miner.cpp b/src/miner.cpp index edfd1742c..e258d8d38 100644 --- a/src/miner.cpp +++ b/src/miner.cpp @@ -174,7 +174,7 @@ CBlockTemplate* CreateNewBlock(CPubKey _pk,const CScript& _scriptPubKeyIn, int32 } } else pk = _pk; - uint64_t voutsum=0; uint32_t blocktime; const CChainParams& chainparams = Params(); + uint32_t blocktime; const CChainParams& chainparams = Params(); bool fNotarizationBlock = false; std::vector NotarizationNotaries; //fprintf(stderr,"%s: create new block with pubkey=%s\n", __func__, HexStr(pk).c_str()); @@ -241,9 +241,6 @@ CBlockTemplate* CreateNewBlock(CPubKey _pk,const CScript& _scriptPubKeyIn, int32 //fprintf(stderr,"%s: nHeight=%d, consensusBranchId=%u, proposedTime=%u\n", __func__, nHeight, consensusBranchId, proposedTime); - voutsum = GetBlockSubsidy(nHeight,consensusParams) + 10000*COIN; // approx fees - //fprintf(stderr,"%s: voutsum=%lu\n", __func__, voutsum); - if (proposedTime == nMedianTimePast) { // too fast or stuck, this addresses the too fast issue, while moving From d5c5c6008cc4d7ccda808dcb982c87be754f5939 Mon Sep 17 00:00:00 2001 From: Duke Date: Sun, 7 Jan 2024 13:05:31 -0800 Subject: [PATCH 017/108] Remove unused code --- src/Makefile.am | 1 - src/cc/pegs.cpp | 22 ---------------------- 2 files changed, 23 deletions(-) delete mode 100644 src/cc/pegs.cpp diff --git a/src/Makefile.am b/src/Makefile.am index 021c53b1b..98d0216b0 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -287,7 +287,6 @@ libbitcoin_server_a_SOURCES = \ cc/fsm.cpp \ cc/heir.cpp \ cc/oracles.cpp \ - cc/pegs.cpp \ cc/payments.cpp \ cc/gateways.cpp \ cc/channels.cpp \ diff --git a/src/cc/pegs.cpp b/src/cc/pegs.cpp deleted file mode 100644 index 2a14ca3cb..000000000 --- a/src/cc/pegs.cpp +++ /dev/null @@ -1,22 +0,0 @@ -// Copyright (c) 2016-2023 The Hush developers -// Distributed under the GPLv3 software license, see the accompanying -// file COPYING or https://www.gnu.org/licenses/gpl-3.0.en.html -/****************************************************************************** - * Copyright © 2014-2019 The SuperNET Developers. * - * * - * See the AUTHORS, DEVELOPER-AGREEMENT and LICENSE files at * - * the top-level directory of this distribution for the individual copyright * - * holder information and the developer policies on copyright and licensing. * - * * - * Unless otherwise agreed in a custom licensing agreement, no part of the * - * SuperNET software, including this file may be copied, modified, propagated * - * or distributed except according to the terms contained in the LICENSE file * - * * - * Removal or modification of this copyright notice is prohibited. * - * * - ******************************************************************************/ - -#include "../importcoin.h" -#include "key_io.h" -#include - From a23ab58af6f4282e5c7f5d22f12f4b1ccad887c4 Mon Sep 17 00:00:00 2001 From: Duke Date: Sun, 7 Jan 2024 13:20:17 -0800 Subject: [PATCH 018/108] Start removing unused gateway code --- src/rpc/server.cpp | 30 ---- src/rpc/server.h | 15 -- src/wallet/rpcwallet.cpp | 316 --------------------------------------- 3 files changed, 361 deletions(-) diff --git a/src/rpc/server.cpp b/src/rpc/server.cpp index c50d702a3..d764f392d 100644 --- a/src/rpc/server.cpp +++ b/src/rpc/server.cpp @@ -356,19 +356,6 @@ static const CRPCCommand vRPCCommands[] = { "crosschain", "migrate_createnotaryapprovaltransaction", &migrate_createnotaryapprovaltransaction, true }, { "crosschain", "selfimport", &selfimport, true }, { "crosschain", "importdual", &importdual, true }, - //ImportGateway - { "crosschain", "importgatewayddress", &importgatewayaddress, true }, - { "crosschain", "importgatewayinfo", &importgatewayinfo, true }, - { "crosschain", "importgatewaybind", &importgatewaybind, true }, - { "crosschain", "importgatewaydeposit", &importgatewaydeposit, true }, - { "crosschain", "importgatewaywithdraw", &importgatewaywithdraw, true }, - { "crosschain", "importgatewaypartialsign", &importgatewaypartialsign, true }, - { "crosschain", "importgatewaycompletesigning", &importgatewaycompletesigning, true }, - { "crosschain", "importgatewaymarkdone", &importgatewaymarkdone, true }, - { "crosschain", "importgatewaypendingwithdraws", &importgatewaypendingwithdraws, true }, - { "crosschain", "importgatewayprocessed", &importgatewayprocessed, true }, - - /* Mining */ { "mining", "getblocktemplate", &getblocktemplate, true }, @@ -489,23 +476,6 @@ static const CRPCCommand vRPCCommands[] = { "CClib", "cclibinfo", &cclibinfo, true }, { "CClib", "cclib", &cclib, true }, - // Gateways - { "gateways", "gatewaysaddress", &gatewaysaddress, true }, - { "gateways", "gatewayslist", &gatewayslist, true }, - { "gateways", "gatewaysexternaladdress", &gatewaysexternaladdress, true }, - { "gateways", "gatewaysdumpprivkey", &gatewaysdumpprivkey, true }, - { "gateways", "gatewaysinfo", &gatewaysinfo, true }, - { "gateways", "gatewaysbind", &gatewaysbind, true }, - { "gateways", "gatewaysdeposit", &gatewaysdeposit, true }, - { "gateways", "gatewaysclaim", &gatewaysclaim, true }, - { "gateways", "gatewayswithdraw", &gatewayswithdraw, true }, - { "gateways", "gatewayspartialsign", &gatewayspartialsign, true }, - { "gateways", "gatewayscompletesigning", &gatewayscompletesigning, true }, - { "gateways", "gatewaysmarkdone", &gatewaysmarkdone, true }, - { "gateways", "gatewayspendingdeposits", &gatewayspendingdeposits, true }, - { "gateways", "gatewayspendingwithdraws", &gatewayspendingwithdraws, true }, - { "gateways", "gatewaysprocessed", &gatewaysprocessed, true }, - // dice { "dice", "dicelist", &dicelist, true }, { "dice", "diceinfo", &diceinfo, true }, diff --git a/src/rpc/server.h b/src/rpc/server.h index 3b229d6f3..8f90627fe 100644 --- a/src/rpc/server.h +++ b/src/rpc/server.h @@ -284,21 +284,6 @@ extern UniValue payments_list(const UniValue& params, bool fHelp, const CPubKey& extern UniValue cclibaddress(const UniValue& params, bool fHelp, const CPubKey& mypk); extern UniValue cclibinfo(const UniValue& params, bool fHelp, const CPubKey& mypk); extern UniValue cclib(const UniValue& params, bool fHelp, const CPubKey& mypk); -extern UniValue gatewaysaddress(const UniValue& params, bool fHelp, const CPubKey& mypk); -extern UniValue gatewayslist(const UniValue& params, bool fHelp, const CPubKey& mypk); -extern UniValue gatewaysinfo(const UniValue& params, bool fHelp, const CPubKey& mypk); -extern UniValue gatewaysdumpprivkey(const UniValue& params, bool fHelp, const CPubKey& mypk); -extern UniValue gatewaysexternaladdress(const UniValue& params, bool fHelp, const CPubKey& mypk); -extern UniValue gatewaysbind(const UniValue& params, bool fHelp, const CPubKey& mypk); -extern UniValue gatewaysdeposit(const UniValue& params, bool fHelp, const CPubKey& mypk); -extern UniValue gatewaysclaim(const UniValue& params, bool fHelp, const CPubKey& mypk); -extern UniValue gatewayswithdraw(const UniValue& params, bool fHelp, const CPubKey& mypk); -extern UniValue gatewayspartialsign(const UniValue& params, bool fHelp, const CPubKey& mypk); -extern UniValue gatewayscompletesigning(const UniValue& params, bool fHelp, const CPubKey& mypk); -extern UniValue gatewaysmarkdone(const UniValue& params, bool fHelp, const CPubKey& mypk); -extern UniValue gatewayspendingdeposits(const UniValue& params, bool fHelp, const CPubKey& mypk); -extern UniValue gatewayspendingwithdraws(const UniValue& params, bool fHelp, const CPubKey& mypk); -extern UniValue gatewaysprocessed(const UniValue& params, bool fHelp, const CPubKey& mypk); extern UniValue channelslist(const UniValue& params, bool fHelp, const CPubKey& mypk); extern UniValue channelsinfo(const UniValue& params, bool fHelp, const CPubKey& mypk); extern UniValue channelsopen(const UniValue& params, bool fHelp, const CPubKey& mypk); diff --git a/src/wallet/rpcwallet.cpp b/src/wallet/rpcwallet.cpp index 1dcc1525c..630c9be13 100644 --- a/src/wallet/rpcwallet.cpp +++ b/src/wallet/rpcwallet.cpp @@ -6486,19 +6486,6 @@ UniValue paymentsaddress(const UniValue& params, bool fHelp, const CPubKey& mypk return(CCaddress(cp,(char *)"Payments",pubkey)); } -UniValue gatewaysaddress(const UniValue& params, bool fHelp, const CPubKey& mypk) -{ - struct CCcontract_info *cp,C; std::vector pubkey; - cp = CCinit(&C,EVAL_GATEWAYS); - if ( fHelp || params.size() > 1 ) - throw runtime_error("gatewaysaddress [pubkey]\n"); - if ( ensure_CCrequirements(cp->evalcode) < 0 ) - throw runtime_error(CC_REQUIREMENTS_MSG); - if ( params.size() == 1 ) - pubkey = ParseHex(params[0].get_str().c_str()); - return(CCaddress(cp,(char *)"Gateways",pubkey)); -} - UniValue heiraddress(const UniValue& params, bool fHelp, const CPubKey& mypk) { struct CCcontract_info *cp,C; std::vector pubkey; @@ -6617,19 +6604,6 @@ UniValue tokenaddress(const UniValue& params, bool fHelp, const CPubKey& mypk) return(CCaddress(cp,(char *)"Tokens", pubkey)); } -UniValue importgatewayaddress(const UniValue& params, bool fHelp, const CPubKey& mypk) -{ - struct CCcontract_info *cp,C; std::vector pubkey; - cp = CCinit(&C,EVAL_IMPORTGATEWAY); - if ( fHelp || params.size() > 1 ) - throw runtime_error("importgatewayddress [pubkey]\n"); - if ( ensure_CCrequirements(cp->evalcode) < 0 ) - throw runtime_error(CC_REQUIREMENTS_MSG); - if ( params.size() == 1 ) - pubkey = ParseHex(params[0].get_str().c_str()); - return(CCaddress(cp,(char *)"ImportGateway", pubkey)); -} - UniValue channelslist(const UniValue& params, bool fHelp, const CPubKey& mypk) { if ( fHelp || params.size() > 0 ) @@ -6929,297 +6903,7 @@ UniValue rewardsinfo(const UniValue& params, bool fHelp, const CPubKey& mypk) return(RewardsInfo(fundingtxid)); } -UniValue gatewayslist(const UniValue& params, bool fHelp, const CPubKey& mypk) -{ - if ( fHelp || params.size() > 0 ) - throw runtime_error("gatewayslist\n"); - if ( ensure_CCrequirements(EVAL_GATEWAYS) < 0 ) - throw runtime_error(CC_REQUIREMENTS_MSG); - const CKeyStore& keystore = *pwalletMain; - return(GatewaysList()); -} -UniValue gatewaysexternaladdress(const UniValue& params, bool fHelp, const CPubKey& mypk) -{ - uint256 bindtxid; CPubKey pubkey; - - if ( fHelp || params.size() != 2) - throw runtime_error("gatewaysexternaladdress bindtxid pubkey\n"); - if ( ensure_CCrequirements(EVAL_GATEWAYS) < 0 ) - throw runtime_error(CC_REQUIREMENTS_MSG); - bindtxid = Parseuint256((char *)params[0].get_str().c_str()); - pubkey = ParseHex(params[1].get_str().c_str()); - return(GatewaysExternalAddress(bindtxid,pubkey)); -} - -UniValue gatewaysdumpprivkey(const UniValue& params, bool fHelp, const CPubKey& mypk) -{ - uint256 bindtxid; - - if ( fHelp || params.size() != 2) - throw runtime_error("gatewaysdumpprivkey bindtxid address\n"); - if ( ensure_CCrequirements(EVAL_GATEWAYS) < 0 ) - throw runtime_error(CC_REQUIREMENTS_MSG); - bindtxid = Parseuint256((char *)params[0].get_str().c_str()); - std::string strAddress = params[1].get_str(); - CTxDestination dest = DecodeDestination(strAddress); - if (!IsValidDestination(dest)) { - throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, "Invalid transparent address"); - } - const CKeyID *keyID = boost::get(&dest); - if (!keyID) { - throw JSONRPCError(RPC_TYPE_ERROR, "Address does not refer to a key"); - } - CKey vchSecret; - if (!pwalletMain->GetKey(*keyID, vchSecret)) { - throw JSONRPCError(RPC_WALLET_ERROR, "Private key for address " + strAddress + " is not known"); - } - return(GatewaysDumpPrivKey(bindtxid,vchSecret)); -} - -UniValue gatewaysinfo(const UniValue& params, bool fHelp, const CPubKey& mypk) -{ - uint256 txid; - if ( fHelp || params.size() != 1 ) - throw runtime_error("gatewaysinfo bindtxid\n"); - if ( ensure_CCrequirements(EVAL_GATEWAYS) < 0 ) - throw runtime_error(CC_REQUIREMENTS_MSG); - txid = Parseuint256((char *)params[0].get_str().c_str()); - return(GatewaysInfo(txid)); -} - -UniValue gatewaysbind(const UniValue& params, bool fHelp, const CPubKey& mypk) -{ - UniValue result(UniValue::VOBJ); uint256 tokenid,oracletxid; int32_t i; int64_t totalsupply; std::vector pubkeys; - uint8_t M,N,p1,p2,p3,p4=0; std::string coin; std::vector pubkey; - - if ( fHelp || params.size() < 10 ) - throw runtime_error("gatewaysbind tokenid oracletxid coin tokensupply M N pubkey(s) pubtype p2shtype wiftype [taddr]\n"); - if ( ensure_CCrequirements(EVAL_GATEWAYS) < 0 ) - throw runtime_error(CC_REQUIREMENTS_MSG); - Lock2NSPV(mypk); - tokenid = Parseuint256((char *)params[0].get_str().c_str()); - oracletxid = Parseuint256((char *)params[1].get_str().c_str()); - coin = params[2].get_str(); - totalsupply = atol((char *)params[3].get_str().c_str()); - M = atoi((char *)params[4].get_str().c_str()); - N = atoi((char *)params[5].get_str().c_str()); - if ( M > N || N == 0 || N > 15 || totalsupply < COIN/100 || tokenid == zeroid ) - { - Unlock2NSPV(mypk); - throw runtime_error("illegal M or N > 15 or tokensupply or invalid tokenid\n"); - } - if ( params.size() < 6+N+3 ) - { - Unlock2NSPV(mypk); - throw runtime_error("not enough parameters for N pubkeys\n"); - } - for (i=0; i 0 ) - { - result.push_back(Pair("result", "success")); - } - Unlock2NSPV(mypk); - return(result); -} - -UniValue gatewaysdeposit(const UniValue& params, bool fHelp, const CPubKey& mypk) -{ - UniValue result(UniValue::VOBJ); int32_t i,claimvout,height; int64_t amount; std::string coin,deposithex; uint256 bindtxid,cointxid; std::vectorproof,destpub,pubkey; - if ( fHelp || params.size() != 9 ) - throw runtime_error("gatewaysdeposit bindtxid height coin cointxid claimvout deposithex proof destpub amount\n"); - if ( ensure_CCrequirements(EVAL_GATEWAYS) < 0 ) - throw runtime_error(CC_REQUIREMENTS_MSG); - Lock2NSPV(mypk); - bindtxid = Parseuint256((char *)params[0].get_str().c_str()); - height = atoi((char *)params[1].get_str().c_str()); - coin = params[2].get_str(); - cointxid = Parseuint256((char *)params[3].get_str().c_str()); - claimvout = atoi((char *)params[4].get_str().c_str()); - deposithex = params[5].get_str(); - proof = ParseHex(params[6].get_str()); - destpub = ParseHex(params[7].get_str()); - amount = atof((char *)params[8].get_str().c_str()) * COIN + 0.00000000499999; - if ( amount <= 0 || claimvout < 0 ) - { - Unlock2NSPV(mypk); - throw runtime_error("invalid param: amount, numpks or claimvout\n"); - } - if (destpub.size()!= 33) - { - Unlock2NSPV(mypk); - throw runtime_error("invalid destination pubkey"); - } - result = GatewaysDeposit(mypk,0,bindtxid,height,coin,cointxid,claimvout,deposithex,proof,pubkey2pk(destpub),amount); - if ( result[JSON_HEXTX].getValStr().size() > 0 ) - { - result.push_back(Pair("result", "success")); - } - Unlock2NSPV(mypk); - return(result); -} - -UniValue gatewaysclaim(const UniValue& params, bool fHelp, const CPubKey& mypk) -{ - UniValue result(UniValue::VOBJ); std::string coin; uint256 bindtxid,deposittxid; std::vectordestpub; int64_t amount; - if ( fHelp || params.size() != 5 ) - throw runtime_error("gatewaysclaim bindtxid coin deposittxid destpub amount\n"); - if ( ensure_CCrequirements(EVAL_GATEWAYS) < 0 ) - throw runtime_error(CC_REQUIREMENTS_MSG); - Lock2NSPV(mypk); - bindtxid = Parseuint256((char *)params[0].get_str().c_str()); - coin = params[1].get_str(); - deposittxid = Parseuint256((char *)params[2].get_str().c_str()); - destpub = ParseHex(params[3].get_str()); - amount = atof((char *)params[4].get_str().c_str()) * COIN + 0.00000000499999; - if (destpub.size()!= 33) - { - Unlock2NSPV(mypk); - throw runtime_error("invalid destination pubkey"); - } - result = GatewaysClaim(mypk,0,bindtxid,coin,deposittxid,pubkey2pk(destpub),amount); - if ( result[JSON_HEXTX].getValStr().size() > 0 ) - { - result.push_back(Pair("result", "success")); - } - Unlock2NSPV(mypk); - return(result); -} - -UniValue gatewayswithdraw(const UniValue& params, bool fHelp, const CPubKey& mypk) -{ - UniValue result(UniValue::VOBJ); uint256 bindtxid; int64_t amount; std::string coin; std::vector withdrawpub; - if ( fHelp || params.size() != 4 ) - throw runtime_error("gatewayswithdraw bindtxid coin withdrawpub amount\n"); - if ( ensure_CCrequirements(EVAL_GATEWAYS) < 0 ) - throw runtime_error(CC_REQUIREMENTS_MSG); - Lock2NSPV(mypk); - bindtxid = Parseuint256((char *)params[0].get_str().c_str()); - coin = params[1].get_str(); - withdrawpub = ParseHex(params[2].get_str()); - amount = atof((char *)params[3].get_str().c_str()) * COIN + 0.00000000499999; - if (withdrawpub.size()!= 33) - { - Unlock2NSPV(mypk); - throw runtime_error("invalid destination pubkey"); - } - result = GatewaysWithdraw(mypk,0,bindtxid,coin,pubkey2pk(withdrawpub),amount); - if ( result[JSON_HEXTX].getValStr().size() > 0 ) - { - result.push_back(Pair("result", "success")); - } - Lock2NSPV(mypk); - return(result); -} - -UniValue gatewayspartialsign(const UniValue& params, bool fHelp, const CPubKey& mypk) -{ - UniValue result(UniValue::VOBJ); std::string coin,parthex; uint256 txid; - if ( fHelp || params.size() != 3 ) - throw runtime_error("gatewayspartialsign txidaddr refcoin hex\n"); - if ( ensure_CCrequirements(EVAL_GATEWAYS) < 0 ) - throw runtime_error(CC_REQUIREMENTS_MSG); - Lock2NSPV(mypk); - txid = Parseuint256((char *)params[0].get_str().c_str()); - coin = params[1].get_str(); - parthex = params[2].get_str(); - result = GatewaysPartialSign(mypk,0,txid,coin,parthex); - if ( result[JSON_HEXTX].getValStr().size() > 0 ) - { - result.push_back(Pair("result", "success")); - } - Unlock2NSPV(mypk); - return(result); -} - -UniValue gatewayscompletesigning(const UniValue& params, bool fHelp, const CPubKey& mypk) -{ - UniValue result(UniValue::VOBJ); uint256 withdrawtxid; std::string txhex,coin; - if ( fHelp || params.size() != 3 ) - throw runtime_error("gatewayscompletesigning withdrawtxid coin hex\n"); - if ( ensure_CCrequirements(EVAL_GATEWAYS) < 0 ) - throw runtime_error(CC_REQUIREMENTS_MSG); - Lock2NSPV(mypk); - withdrawtxid = Parseuint256((char *)params[0].get_str().c_str()); - coin = params[1].get_str(); - txhex = params[2].get_str(); - result = GatewaysCompleteSigning(mypk,0,withdrawtxid,coin,txhex); - if ( result[JSON_HEXTX].getValStr().size() > 0 ) - { - result.push_back(Pair("result", "success")); - } - Unlock2NSPV(mypk); - return(result); -} - -UniValue gatewaysmarkdone(const UniValue& params, bool fHelp, const CPubKey& mypk) -{ - UniValue result(UniValue::VOBJ); uint256 completetxid; std::string coin; - if ( fHelp || params.size() != 2 ) - throw runtime_error("gatewaysmarkdone completesigningtx coin\n"); - if ( ensure_CCrequirements(EVAL_GATEWAYS) < 0 ) - throw runtime_error(CC_REQUIREMENTS_MSG); - Lock2NSPV(mypk); - completetxid = Parseuint256((char *)params[0].get_str().c_str()); - coin = params[1].get_str(); - result = GatewaysMarkDone(mypk,0,completetxid,coin); - if ( result[JSON_HEXTX].getValStr().size() > 0 ) - { - result.push_back(Pair("result", "success")); - } - Unlock2NSPV(mypk); - return(result); -} - -UniValue gatewayspendingdeposits(const UniValue& params, bool fHelp, const CPubKey& mypk) -{ - uint256 bindtxid; std::string coin; - if ( fHelp || params.size() != 2 ) - throw runtime_error("gatewayspendingdeposits bindtxid coin\n"); - if ( ensure_CCrequirements(EVAL_GATEWAYS) < 0 ) - throw runtime_error(CC_REQUIREMENTS_MSG); - bindtxid = Parseuint256((char *)params[0].get_str().c_str()); - coin = params[1].get_str(); - return(GatewaysPendingDeposits(mypk,bindtxid,coin)); -} - -UniValue gatewayspendingwithdraws(const UniValue& params, bool fHelp, const CPubKey& mypk) -{ - uint256 bindtxid; std::string coin; - if ( fHelp || params.size() != 2 ) - throw runtime_error("gatewayspendingwithdraws bindtxid coin\n"); - if ( ensure_CCrequirements(EVAL_GATEWAYS) < 0 ) - throw runtime_error(CC_REQUIREMENTS_MSG); - bindtxid = Parseuint256((char *)params[0].get_str().c_str()); - coin = params[1].get_str(); - return(GatewaysPendingWithdraws(mypk,bindtxid,coin)); -} - -UniValue gatewaysprocessed(const UniValue& params, bool fHelp, const CPubKey& mypk) -{ - uint256 bindtxid; std::string coin; - if ( fHelp || params.size() != 2 ) - throw runtime_error("gatewaysprocessed bindtxid coin\n"); - if ( ensure_CCrequirements(EVAL_GATEWAYS) < 0 ) - throw runtime_error(CC_REQUIREMENTS_MSG); - bindtxid = Parseuint256((char *)params[0].get_str().c_str()); - coin = params[1].get_str(); - return(GatewaysProcessedWithdraws(mypk,bindtxid,coin)); -} UniValue oracleslist(const UniValue& params, bool fHelp, const CPubKey& mypk) { From c9f76406990dd4937b4b56cd7c26544c60afb185 Mon Sep 17 00:00:00 2001 From: Duke Date: Sun, 7 Jan 2024 23:25:35 -0500 Subject: [PATCH 019/108] Boost download has been broken for over a week, so we will host our own --- depends/packages/boost.mk | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/depends/packages/boost.mk b/depends/packages/boost.mk index 0062c0bdb..5b4804e14 100644 --- a/depends/packages/boost.mk +++ b/depends/packages/boost.mk @@ -1,9 +1,12 @@ package=boost $(package)_version=1_72_0 -$(package)_download_path=https://boostorg.jfrog.io/artifactory/main/release/$(subst _,.,$($(package)_version))/source/ +#$(package)_download_path=https://boostorg.jfrog.io/artifactory/main/release/$(subst _,.,$($(package)_version))/source/ +#$(package)_file_name=$(package)_$($(package)_version).tar.bz2 $(package)_sha256_hash=59c9b274bc451cf91a9ba1dd2c7fdcaf5d60b1b3aa83f2c9fa143417cc660722 -$(package)_file_name=$(package)_$($(package)_version).tar.bz2 +$(package)_download_path=https://git.hush.is/attachments +$(package)_file_name=94bfb5e0-7e29-4162-a066-bfd00e6b0db1 +$(package)_download_file=94bfb5e0-7e29-4162-a066-bfd00e6b0db1 $(package)_patches=fix-Solaris.patch define $(package)_set_vars From 31fce487d932afe3f67ddf03f037101bc690993c Mon Sep 17 00:00:00 2001 From: Duke Date: Sun, 7 Jan 2024 23:32:11 -0500 Subject: [PATCH 020/108] Fix boost download link --- depends/packages/boost.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/depends/packages/boost.mk b/depends/packages/boost.mk index 5b4804e14..f7d34c253 100644 --- a/depends/packages/boost.mk +++ b/depends/packages/boost.mk @@ -5,8 +5,8 @@ $(package)_version=1_72_0 #$(package)_file_name=$(package)_$($(package)_version).tar.bz2 $(package)_sha256_hash=59c9b274bc451cf91a9ba1dd2c7fdcaf5d60b1b3aa83f2c9fa143417cc660722 $(package)_download_path=https://git.hush.is/attachments -$(package)_file_name=94bfb5e0-7e29-4162-a066-bfd00e6b0db1 -$(package)_download_file=94bfb5e0-7e29-4162-a066-bfd00e6b0db1 +$(package)_file_name=7b13759e-8623-4e48-ae08-f78502f4b6a5 +$(package)_download_file=7b13759e-8623-4e48-ae08-f78502f4b6a5 $(package)_patches=fix-Solaris.patch define $(package)_set_vars From 323d2134a1fcc119a4da82f9fc37e912b67e58c6 Mon Sep 17 00:00:00 2001 From: Duke Date: Sun, 7 Jan 2024 23:25:35 -0500 Subject: [PATCH 021/108] Boost download has been broken for over a week, so we will host our own --- depends/packages/boost.mk | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/depends/packages/boost.mk b/depends/packages/boost.mk index 0062c0bdb..5b4804e14 100644 --- a/depends/packages/boost.mk +++ b/depends/packages/boost.mk @@ -1,9 +1,12 @@ package=boost $(package)_version=1_72_0 -$(package)_download_path=https://boostorg.jfrog.io/artifactory/main/release/$(subst _,.,$($(package)_version))/source/ +#$(package)_download_path=https://boostorg.jfrog.io/artifactory/main/release/$(subst _,.,$($(package)_version))/source/ +#$(package)_file_name=$(package)_$($(package)_version).tar.bz2 $(package)_sha256_hash=59c9b274bc451cf91a9ba1dd2c7fdcaf5d60b1b3aa83f2c9fa143417cc660722 -$(package)_file_name=$(package)_$($(package)_version).tar.bz2 +$(package)_download_path=https://git.hush.is/attachments +$(package)_file_name=94bfb5e0-7e29-4162-a066-bfd00e6b0db1 +$(package)_download_file=94bfb5e0-7e29-4162-a066-bfd00e6b0db1 $(package)_patches=fix-Solaris.patch define $(package)_set_vars From b70370123e0ad21fb83b93727e705feddf85fefe Mon Sep 17 00:00:00 2001 From: Duke Date: Sun, 7 Jan 2024 23:32:11 -0500 Subject: [PATCH 022/108] Fix boost download link --- depends/packages/boost.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/depends/packages/boost.mk b/depends/packages/boost.mk index 5b4804e14..f7d34c253 100644 --- a/depends/packages/boost.mk +++ b/depends/packages/boost.mk @@ -5,8 +5,8 @@ $(package)_version=1_72_0 #$(package)_file_name=$(package)_$($(package)_version).tar.bz2 $(package)_sha256_hash=59c9b274bc451cf91a9ba1dd2c7fdcaf5d60b1b3aa83f2c9fa143417cc660722 $(package)_download_path=https://git.hush.is/attachments -$(package)_file_name=94bfb5e0-7e29-4162-a066-bfd00e6b0db1 -$(package)_download_file=94bfb5e0-7e29-4162-a066-bfd00e6b0db1 +$(package)_file_name=7b13759e-8623-4e48-ae08-f78502f4b6a5 +$(package)_download_file=7b13759e-8623-4e48-ae08-f78502f4b6a5 $(package)_patches=fix-Solaris.patch define $(package)_set_vars From 2a713aeba26928ccaedc1af4d8fbd32be4c15ab6 Mon Sep 17 00:00:00 2001 From: Duke Date: Thu, 11 Jan 2024 21:39:08 -0500 Subject: [PATCH 023/108] remove gateways --- src/Makefile.am | 1 - src/cc/CCGateways.h | 42 -- src/cc/CCcustom.cpp | 5 +- src/cc/gateways.cpp | 1552 -------------------------------------- src/wallet/rpcwallet.cpp | 1 - 5 files changed, 2 insertions(+), 1599 deletions(-) delete mode 100644 src/cc/CCGateways.h delete mode 100644 src/cc/gateways.cpp diff --git a/src/Makefile.am b/src/Makefile.am index 98d0216b0..f99589472 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -288,7 +288,6 @@ libbitcoin_server_a_SOURCES = \ cc/heir.cpp \ cc/oracles.cpp \ cc/payments.cpp \ - cc/gateways.cpp \ cc/channels.cpp \ cc/auction.cpp \ cc/betprotocol.cpp \ diff --git a/src/cc/CCGateways.h b/src/cc/CCGateways.h deleted file mode 100644 index 63d46ce8b..000000000 --- a/src/cc/CCGateways.h +++ /dev/null @@ -1,42 +0,0 @@ -// Copyright (c) 2016-2023 The Hush developers -// Distributed under the GPLv3 software license, see the accompanying -// file COPYING or https://www.gnu.org/licenses/gpl-3.0.en.html -/****************************************************************************** - * Copyright © 2014-2019 The SuperNET Developers. * - * * - * See the AUTHORS, DEVELOPER-AGREEMENT and LICENSE files at * - * the top-level directory of this distribution for the individual copyright * - * holder information and the developer policies on copyright and licensing. * - * * - * Unless otherwise agreed in a custom licensing agreement, no part of the * - * SuperNET software, including this file may be copied, modified, propagated * - * or distributed except according to the terms contained in the LICENSE file * - * * - * Removal or modification of this copyright notice is prohibited. * - * * - ******************************************************************************/ - -#ifndef CC_GATEWAYS_H -#define CC_GATEWAYS_H - -#include "CCinclude.h" - -bool GatewaysValidate(struct CCcontract_info *cp,Eval* eval,const CTransaction &tx, uint32_t nIn); -UniValue GatewaysBind(const CPubKey& pk, uint64_t txfee,std::string coin,uint256 tokenid,int64_t totalsupply,uint256 oracletxid,uint8_t M,uint8_t N,std::vector pubkeys,uint8_t p1,uint8_t p2,uint8_t p3,uint8_t p4); -UniValue GatewaysDeposit(const CPubKey& pk, uint64_t txfee,uint256 bindtxid,int32_t height,std::string refcoin,uint256 cointxid,int32_t claimvout,std::string deposithex,std::vectorproof,CPubKey destpub,int64_t amount); -UniValue GatewaysClaim(const CPubKey& pk, uint64_t txfee,uint256 bindtxid,std::string refcoin,uint256 deposittxid,CPubKey destpub,int64_t amount); -UniValue GatewaysWithdraw(const CPubKey& pk, uint64_t txfee,uint256 bindtxid,std::string refcoin,CPubKey withdrawpub,int64_t amount); -UniValue GatewaysPartialSign(const CPubKey& pk, uint64_t txfee,uint256 txidaddr,std::string refcoin,std::string hex); -UniValue GatewaysCompleteSigning(const CPubKey& pk, uint64_t txfee,uint256 txidaddr,std::string refcoin,std::string hex); -UniValue GatewaysMarkDone(const CPubKey& pk, uint64_t txfee,uint256 withdrawtxid,std::string refcoin); -UniValue GatewaysPendingDeposits(const CPubKey& pk, uint256 bindtxid,std::string refcoin); -UniValue GatewaysPendingWithdraws(const CPubKey& pk, uint256 bindtxid,std::string refcoin); -UniValue GatewaysProcessedWithdraws(const CPubKey& pk, uint256 bindtxid,std::string refcoin); - -// CCcustom -UniValue GatewaysInfo(uint256 bindtxid); -UniValue GatewaysExternalAddress(uint256 bindtxid,CPubKey pubkey); -UniValue GatewaysDumpPrivKey(uint256 bindtxid,CKey privkey); -UniValue GatewaysList(); - -#endif diff --git a/src/cc/CCcustom.cpp b/src/cc/CCcustom.cpp index e8aa299ab..f23d9e6ae 100644 --- a/src/cc/CCcustom.cpp +++ b/src/cc/CCcustom.cpp @@ -31,7 +31,6 @@ #include "CCPrices.h" #include "CCPegs.h" #include "CCPayments.h" -#include "CCGateways.h" #include "CCtokens.h" #include "CCImportGateway.h" @@ -406,8 +405,8 @@ struct CCcontract_info *CCinit(struct CCcontract_info *cp, uint8_t evalcode) strcpy(cp->normaladdr,GatewaysNormaladdr); strcpy(cp->CChexstr,GatewaysCChexstr); memcpy(cp->CCpriv,GatewaysCCpriv,32); - cp->validate = GatewaysValidate; - cp->ismyvin = IsGatewaysInput; + //cp->validate = GatewaysValidate; + //cp->ismyvin = IsGatewaysInput; break; case EVAL_TOKENS: diff --git a/src/cc/gateways.cpp b/src/cc/gateways.cpp deleted file mode 100644 index 5d51c3767..000000000 --- a/src/cc/gateways.cpp +++ /dev/null @@ -1,1552 +0,0 @@ -// Copyright (c) 2016-2023 The Hush developers -// Distributed under the GPLv3 software license, see the accompanying -// file COPYING or https://www.gnu.org/licenses/gpl-3.0.en.html -/****************************************************************************** - * Copyright © 2014-2019 The SuperNET Developers. * - * * - * See the AUTHORS, DEVELOPER-AGREEMENT and LICENSE files at * - * the top-level directory of this distribution for the individual copyright * - * holder information and the developer policies on copyright and licensing. * - * * - * Unless otherwise agreed in a custom licensing agreement, no part of the * - * SuperNET software, including this file may be copied, modified, propagated * - * or distributed except according to the terms contained in the LICENSE file * - * * - * Removal or modification of this copyright notice is prohibited. * - * * - ******************************************************************************/ - -#include "CCGateways.h" -#include "key_io.h" - -/* - prevent duplicate bindtxid via mempool scan - wait for notarization for oraclefeed and validation of gatewaysdeposit - debug multisig and do partial signing - validation - - string oracles - */ - -/* - Uses MofN CC's normal msig handling to create automated deposits -> token issuing. And partial signing by the selected pubkeys for releasing the funds. A user would be able to select which pubkeys to use to construct the automated deposit/redeem multisigs. - - the potential pubkeys to be used would be based on active oracle data providers with recent activity. - - bind asset <-> HUSH gateway deposit address - HUSH deposit -> globally spendable marker utxo - spend marker utxo and spend linked/locked asset to user's CC address - - redeem -> asset to global CC address with withdraw address -> gateway spendable marker utxo - spend market utxo and withdraw from gateway deposit address - - rpc calls: - GatewayList - GatewayInfo bindtxid - GatewayBind coin tokenid M N pubkey(s) - external: deposit to depositaddr with claimpubkey - GatewayDeposit coin tokenid external.deposittxid -> markertxid - GatewayClaim coin tokenid external.deposittxid markertxid -> spend marker and deposit asset - - GatewayWithdraw coin tokenid withdrawaddr - external: do withdraw to withdrawaddr and spend marker, support for partial signatures and autocomplete - - deposit addr can be 1 to MofN pubkeys - 1:1 gateway with native coin - - In order to create a new gateway it is necessary to follow some strict steps. - 1. create a token with the max possible supply that will be issued - 2. transfer 100% of them to the gateways CC's global pubkey's asset CC address. (yes it is a bit confusing) - 3. create an oracle with the identical name, ie. HUSH and format must start with Ihh (height, blockhash, merkleroot) - 4. register a publisher and fund it with a subscribe. there will be a special client app that will automatically publish the merkleroots. - 5. Now a gatewaysbind can bind an external coin to an asset, along with the oracle for the merkleroots. the txid from the bind is used in most of the other gateways CC calls - - usage: - ./c tokencreate HUSH 1000000 HUSH_equivalent_token_for_gatewaysCC - a7398a8748354dd0a3f8d07d70e65294928ecc3674674bb2d9483011ccaa9a7a - - transfer to gateways pubkey: 03ea9c062b9652d8eff34879b504eda0717895d27597aaeb60347d65eed96ccb40 RDMqGyREkP1Gwub1Nr5Ye8a325LGZsWBCb - ./c tokentransfer a7398a8748354dd0a3f8d07d70e65294928ecc3674674bb2d9483011ccaa9a7a 03ea9c062b9652d8eff34879b504eda0717895d27597aaeb60347d65eed96ccb40 100000000000000 - 2206fc39c0f384ca79819eb491ddbf889642cbfe4d0796bb6a8010ed53064a56 - - ./c oraclescreate HUSH blockheaders Ihh - 1f1aefcca2bdea8196cfd77337fb21de22d200ddea977c2f9e8742c55829d808 - - ./c oraclesregister 1f1aefcca2bdea8196cfd77337fb21de22d200ddea977c2f9e8742c55829d808 1000000 - 83b59eac238cbe54616ee13b2fdde85a48ec869295eb04051671a1727c9eb402 - - ./c oraclessubscribe 1f1aefcca2bdea8196cfd77337fb21de22d200ddea977c2f9e8742c55829d808 02ebc786cb83de8dc3922ab83c21f3f8a2f3216940c3bf9da43ce39e2a3a882c92 1000 - f9499d8bb04ffb511fcec4838d72e642ec832558824a2ce5aed87f1f686f8102 - - gatewaysbind tokenid oracletxid coin tokensupply M N pubkey(s) - ./c gatewaysbind a7398a8748354dd0a3f8d07d70e65294928ecc3674674bb2d9483011ccaa9a7a 1f1aefcca2bdea8196cfd77337fb21de22d200ddea977c2f9e8742c55829d808 HUSH 100000000000000 1 1 02ebc786cb83de8dc3922ab83c21f3f8a2f3216940c3bf9da43ce39e2a3a882c92 - e6c99f79d4afb216aa8063658b4222edb773dd24bb0f8e91bd4ef341f3e47e5e - - ./c gatewaysinfo e6c99f79d4afb216aa8063658b4222edb773dd24bb0f8e91bd4ef341f3e47e5e - { - "result": "success", - "name": "Gateways", - "pubkey": "02ebc786cb83de8dc3922ab83c21f3f8a2f3216940c3bf9da43ce39e2a3a882c92", - "coin": "HUSH", - "oracletxid": "1f1aefcca2bdea8196cfd77337fb21de22d200ddea977c2f9e8742c55829d808", - "taddr": 0, - "prefix": 60, - "prefix2": 85, - "deposit": "", - "tokenid": "a7398a8748354dd0a3f8d07d70e65294928ecc3674674bb2d9483011ccaa9a7a", - "totalsupply": "1000000.00000000", - "remaining": "1000000.00000000", - "issued": "0.00000000" - } - - To make a gateway deposit, send the funds to the "deposit" address, along with any amount to the same pubkey address you want to get the assetized HUSH to appear in. - - 0223d114dededb04f253816d6ad0ce78dd08c617c94ce3c53bf50dc74a5157bef8 pubkey for RFpxgqff7FDHFuHa3jSX5NzqqWCcELz8ha - ./hush-cli z_sendmany "" '[{"address":"RFpxgqff7FDHFuHa3jSX5NzqqWCcELz8ha","amount":0.0001},{"address":"RHV2As4rox97BuE3LK96vMeNY8VsGRTmBj","amount":7.6999}]' - bc41a00e429db741c3199f17546a48012fd3b7eea45dfc6bc2f5228278133009 height.1003776 merkle.90aedc2f19200afc9aca2e351438d011ebae8264a58469bf225883045f61917f - - ./hush-cli gettxoutproof '["bc41a00e429db741c3199f17546a48012fd3b7eea45dfc6bc2f5228278133009"]' - 04000000232524ea04b54489eb222f8b3f566ed35504e3050488a63f0ab7b1c2030000007f91615f04835822bf6984a56482aeeb11d03814352eca9afc0a20192fdcae900000000000000000000000000000000000000000000000000000000000000000268e965ba608071d0800038e16762900000000000000000000000000000000000000000042008dd6fd4005016b4292b05df6dfd316c458c53e28fb2befb96e4870a40c6c04e733d75d8a7a18cce34fe326005efdc403bfa4644e30eeafdaeff34419edc591299e6cc5933cb2eeecbab5c4dfe97cd413b75215999a3dd02b540373581e81d8512bff1640590a6b4da4aaa9b8adc0102c38ca0022daed997b53ed192ba326e212fba5e505ce29e3ad149cef7f48d0e00948a1acd81731d84008760759211eb4abbc7b037939a7964182edb59cf9065357e864188ee5fc7316e8796963036bb99eeb9f06c95d64f78749ecec7181c12eb5d83a3b9b1c1e8a0aae9a20ce04a250b28216620bfc99bb81a6de4db80b93a5aea916de97c1a272e26644abdd683f19c5e3174a2e4513ed767d8f11a4c3074295f697839c5d9139676a813451cc7da38f68cbae5d990a79075f98903233ca04fe1b4b099e433585e5adcc45d41d54a9c648179297359c75950a5e574f13f70b728bbbf552770256315cd0a00139d6ab6934cb5ed70a4fc01a92611b096dd0028f17f4cc687b75f37dca530aa47a18321c50528dbd9272eabb3e13a87021a05918a6d2627e2caba6d7cf1a9f0b831ea3337b9a6af92746d83140078d60c72b6beacf91c9e68a34cee209e08670be1d17ff8d80b7a2285b1325461a2e33f2ee675593f1900e066a5d212615cd8da18749b0e684eee73edcc9031709be715b889c6d015cf4bd4ad5ab7e21bd3492c208930a54d353ef36a437f507ead38855633c1b88d060d9e4221ca8ce2f698e8a6ae0d41e9ace3cbd401f1e0f07650e9c126d4ef20278c8be6e85c7637513643f8d02d7ad64c09da11c16429d60e5160c345844b8158ece62794e8ad280d4e4664150e74978609ece431e51a9f9e1ce8aa49c16f36c7fd12b71acc42d893e18476b8b1e144a8175519612efc93e0aecc61f3b21212c958b0e2331d76aaa62faf11a58fe2bd91ab9ab01b906406c9bbc02df2a106e67182aae0a20b538bf19f09c57f9de5e198ba254580fb1b11e22ad526550093420cb7c68628d4c3ad329c8acc6e219093d277810ed016b6099b7e3781de412a22dacedaa2acf29e8062debcd85c7b9529a20b2782a2470763ac27cf89611a527d43ac89b8063ffb93b6ed993425194f8ee821a8493a563072c896f9584f95db28e3f2fc5fb4a6f3c39d615cd563641717cd50afb73ed3989cbf504b2043882993ce9575f56402534173b1396fbc13df80920b46788ae340ad5a91f25177cc74aa69024d76f56166199d2e4d50a053555256c4e3137ea1cee1130e916a88b6ee5cf2c85652fb8824d5dacfa485e3ef6190591ac0c2fcacc4fc7deb65aca4b0b89b76e35a46b0627e2e967cc63a5d606a984c8e63eabb98fde3e69114340ae524c974cb936e57690e98a7a74533f6f7d1d0496976496b54d14a8163efb32b70dfbb79d80a3022c4f53571c08bf044270565716b435084376714b224ab23e9817c05af8223723afc0577af5c8fc28f71036ca82528aaa4ca9bcd18a50e25d2a528f183d3a2074d968d170876d8dce434c5937261b55173ab87e03d5632ca0834fdc5387c15ab3a17d75c0f274004f289ff1bf7d14e97fdf4172eb49adfb418cc2f4794806ae7c0111c97df4d65d38679ec93fea3ef738ed565e8906a8fe1861cafe3938c772fedcfab40159938e06ef414fd299f2355c6d3369bc1bd3c4db64ce205f0a1b70a40030f505b736e28230de82e97776b5ee7b10708bb3020d28cec7a8e124549ec80c547ac4e7b52bf397c72bcfce30820554ab8fb4d1f73b209bc32a0e7e878843cdbf5f01222728ccea7e6ab7cb5e3fee3234f5b85d1985f91492f6ceaa6454a658dab5074f163ce26ed753137fa61c940679de13bd7b212cd3cf2b334f5201cecbc7473342bd7a239e09169bccd56d03000000037a9068df0625e548e71263c8361b4e904c998378f6b9e32729c3f19b10ad752e093013788222f5c26bfc5da4eeb7d32f01486a54179f19c341b79d420ea041bc8878d22fad4692b2d609c3cf190903874d3682a714c7483518c9392e07c25035010b - - ./hush-cli getrawtransaction bc41a00e429db741c3199f17546a48012fd3b7eea45dfc6bc2f5228278133009 - 010000000149964cdcd17fe9b1cae4d0f3b5f5db301d9b4f54099fdf4d34498df281757094010000006a4730440220594f3a630dd73c123f44621aa8bb9968ab86734833453dd479af6d79ae6f584202207bb5e35f13b337ccc8a88d9a006c8c5ddb016c0a6f4f2dc44357a8128623d85d01210223154bf53cd3a75e64d86697070d6437c8f0010a09c1df35b659e31ce3d79b5dffffffff0310270000000000001976a91447d2e323a14b0c3be08698aa46a9b91489b189d688ac701de52d000000001976a91459fdba29ea85c65ad90f6d38f7a6646476b26b1688acb0a86a00000000001976a914f9a9daf5519dae38b8b61d945f075da895df441d88ace18d965b - - gatewaysdeposit bindtxid height coin cointxid claimvout deposithex proof destpub amount - ./hush-cli -ac_name=AT5 gatewaysdeposit e6c99f79d4afb216aa8063658b4222edb773dd24bb0f8e91bd4ef341f3e47e5e 1003776 HUSH bc41a00e429db741c3199f17546a48012fd3b7eea45dfc6bc2f5228278133009 0 010000000149964cdcd17fe9b1cae4d0f3b5f5db301d9b4f54099fdf4d34498df281757094010000006a4730440220594f3a630dd73c123f44621aa8bb9968ab86734833453dd479af6d79ae6f584202207bb5e35f13b337ccc8a88d9a006c8c5ddb016c0a6f4f2dc44357a8128623d85d01210223154bf53cd3a75e64d86697070d6437c8f0010a09c1df35b659e31ce3d79b5dffffffff0310270000000000001976a91447d2e323a14b0c3be08698aa46a9b91489b189d688ac701de52d000000001976a91459fdba29ea85c65ad90f6d38f7a6646476b26b1688acb0a86a00000000001976a914f9a9daf5519dae38b8b61d945f075da895df441d88ace18d965b 04000000232524ea04b54489eb222f8b3f566ed35504e3050488a63f0ab7b1c2030000007f91615f04835822bf6984a56482aeeb11d03814352eca9afc0a20192fdcae900000000000000000000000000000000000000000000000000000000000000000268e965ba608071d0800038e16762900000000000000000000000000000000000000000042008dd6fd4005016b4292b05df6dfd316c458c53e28fb2befb96e4870a40c6c04e733d75d8a7a18cce34fe326005efdc403bfa4644e30eeafdaeff34419edc591299e6cc5933cb2eeecbab5c4dfe97cd413b75215999a3dd02b540373581e81d8512bff1640590a6b4da4aaa9b8adc0102c38ca0022daed997b53ed192ba326e212fba5e505ce29e3ad149cef7f48d0e00948a1acd81731d84008760759211eb4abbc7b037939a7964182edb59cf9065357e864188ee5fc7316e8796963036bb99eeb9f06c95d64f78749ecec7181c12eb5d83a3b9b1c1e8a0aae9a20ce04a250b28216620bfc99bb81a6de4db80b93a5aea916de97c1a272e26644abdd683f19c5e3174a2e4513ed767d8f11a4c3074295f697839c5d9139676a813451cc7da38f68cbae5d990a79075f98903233ca04fe1b4b099e433585e5adcc45d41d54a9c648179297359c75950a5e574f13f70b728bbbf552770256315cd0a00139d6ab6934cb5ed70a4fc01a92611b096dd0028f17f4cc687b75f37dca530aa47a18321c50528dbd9272eabb3e13a87021a05918a6d2627e2caba6d7cf1a9f0b831ea3337b9a6af92746d83140078d60c72b6beacf91c9e68a34cee209e08670be1d17ff8d80b7a2285b1325461a2e33f2ee675593f1900e066a5d212615cd8da18749b0e684eee73edcc9031709be715b889c6d015cf4bd4ad5ab7e21bd3492c208930a54d353ef36a437f507ead38855633c1b88d060d9e4221ca8ce2f698e8a6ae0d41e9ace3cbd401f1e0f07650e9c126d4ef20278c8be6e85c7637513643f8d02d7ad64c09da11c16429d60e5160c345844b8158ece62794e8ad280d4e4664150e74978609ece431e51a9f9e1ce8aa49c16f36c7fd12b71acc42d893e18476b8b1e144a8175519612efc93e0aecc61f3b21212c958b0e2331d76aaa62faf11a58fe2bd91ab9ab01b906406c9bbc02df2a106e67182aae0a20b538bf19f09c57f9de5e198ba254580fb1b11e22ad526550093420cb7c68628d4c3ad329c8acc6e219093d277810ed016b6099b7e3781de412a22dacedaa2acf29e8062debcd85c7b9529a20b2782a2470763ac27cf89611a527d43ac89b8063ffb93b6ed993425194f8ee821a8493a563072c896f9584f95db28e3f2fc5fb4a6f3c39d615cd563641717cd50afb73ed3989cbf504b2043882993ce9575f56402534173b1396fbc13df80920b46788ae340ad5a91f25177cc74aa69024d76f56166199d2e4d50a053555256c4e3137ea1cee1130e916a88b6ee5cf2c85652fb8824d5dacfa485e3ef6190591ac0c2fcacc4fc7deb65aca4b0b89b76e35a46b0627e2e967cc63a5d606a984c8e63eabb98fde3e69114340ae524c974cb936e57690e98a7a74533f6f7d1d0496976496b54d14a8163efb32b70dfbb79d80a3022c4f53571c08bf044270565716b435084376714b224ab23e9817c05af8223723afc0577af5c8fc28f71036ca82528aaa4ca9bcd18a50e25d2a528f183d3a2074d968d170876d8dce434c5937261b55173ab87e03d5632ca0834fdc5387c15ab3a17d75c0f274004f289ff1bf7d14e97fdf4172eb49adfb418cc2f4794806ae7c0111c97df4d65d38679ec93fea3ef738ed565e8906a8fe1861cafe3938c772fedcfab40159938e06ef414fd299f2355c6d3369bc1bd3c4db64ce205f0a1b70a40030f505b736e28230de82e97776b5ee7b10708bb3020d28cec7a8e124549ec80c547ac4e7b52bf397c72bcfce30820554ab8fb4d1f73b209bc32a0e7e878843cdbf5f01222728ccea7e6ab7cb5e3fee3234f5b85d1985f91492f6ceaa6454a658dab5074f163ce26ed753137fa61c940679de13bd7b212cd3cf2b334f5201cecbc7473342bd7a239e09169bccd56d03000000037a9068df0625e548e71263c8361b4e904c998378f6b9e32729c3f19b10ad752e093013788222f5c26bfc5da4eeb7d32f01486a54179f19c341b79d420ea041bc8878d22fad4692b2d609c3cf190903874d3682a714c7483518c9392e07c25035010b 0223d114dededb04f253816d6ad0ce78dd08c617c94ce3c53bf50dc74a5157bef8 7.6999 - -> 9d80ea79a65aaa0d464f8b762356fa01047e16e9793505a22ca04559f81a6eb6 - - to get the merkleroots onchain, from the multisig signers nodes run the oraclefeed program with acname oracletxid pubkey Ihh - ./oraclefeed AT5 1f1aefcca2bdea8196cfd77337fb21de22d200ddea977c2f9e8742c55829d808 02ebc786cb83de8dc3922ab83c21f3f8a2f3216940c3bf9da43ce39e2a3a882c92 Ihh - - gatewaysclaim bindtxid coin deposittxid destpub amount - ./c gatewaysclaim e6c99f79d4afb216aa8063658b4222edb773dd24bb0f8e91bd4ef341f3e47e5e HUSH 9d80ea79a65aaa0d464f8b762356fa01047e16e9793505a22ca04559f81a6eb6 0223d114dededb04f253816d6ad0ce78dd08c617c94ce3c53bf50dc74a5157bef8 7.6999 - - now the asset is in the pubkey's asset address! - it can be used, traded freely and any node who has the asset can do a gatewayswithdraw - - gatewayswithdraw bindtxid coin withdrawpub amount - ./c gatewayswithdraw e6c99f79d4afb216aa8063658b4222edb773dd24bb0f8e91bd4ef341f3e47e5e HUSH 03b7621b44118017a16043f19b30cc8a4cfe068ac4e42417bae16ba460c80f3828 1 - ef3cc452da006eb2edda6b6ed3d3347664be51260f3e91f59ec44ec9701367f0 - - Now there is a withdraw pending, so it needs to be processed by the signing nodes on the HUSH side - - gatewayspending bindtxid coin - gatewayspending will display all pending withdraws and if it is done on one of the msigpubkeys, then it will queue it for processing - ./c gatewayspending e6c99f79d4afb216aa8063658b4222edb773dd24bb0f8e91bd4ef341f3e47e5e HUSH - - - Implementation Issues: - -- When thinking about validation, it is clear that we cant use EVAL_ASSETS for the locked coins as there wont be any enforcement of the gateways locking. - -- This means we need a way to transfer assets into gateways outputs and back. It seems a tokenconvert rpc will be needed and hopefully that will be enough to make it all work properly. - ++ The use of tokenconvert has been changed to the use of the new Tokens contract which can enforce other contracts validation by forwarding eval->validate call to GatewaysValidate - ++ So all tokens remain within that Tokens contract eval code. - - -- Care must be taken so that tokens are not lost and can be converted back. - -- This changes the usage to require tokenconvert before doing the bind and also tokenconvert before doing a withdraw. EVAL_GATEWAYS has evalcode of 241 - ++ tokenconvert now returns 'not implemented', no need to use it at all. - - -- The gatewaysclaim automatically converts the deposit amount of tokens back to EVAL_ASSETS. - ++ The gatewaysclaim automatically transfers the deposit amount of tokens to depositor's address (within EVAL_TOKENS). - - */ -// start of consensus code - -#define HUSH_PUBTYPE 60 -#define HUSH_P2SHTYPE 85 -#define HUSH_WIFTYPE 188 -#define HUSH_TADDR 0 -#define CC_MARKER_VALUE 10000 - -CScript EncodeGatewaysBindOpRet(uint8_t funcid,uint256 tokenid,std::string coin,int64_t totalsupply,uint256 oracletxid,uint8_t M,uint8_t N,std::vector gatewaypubkeys,uint8_t taddr,uint8_t prefix,uint8_t prefix2,uint8_t wiftype) -{ - CScript opret; uint8_t evalcode = EVAL_GATEWAYS; struct CCcontract_info *cp,C; CPubKey gatewayspk; - std::vector pubkeys; - vscript_t vopret; - - cp = CCinit(&C,EVAL_GATEWAYS); - gatewayspk = GetUnspendable(cp,0); - pubkeys.push_back(gatewayspk); - vopret = E_MARSHAL(ss << evalcode << funcid << coin << totalsupply << oracletxid << M << N << gatewaypubkeys << taddr << prefix << prefix2 << wiftype); - return(EncodeTokenOpRet(tokenid,pubkeys, std::make_pair(OPRETID_GATEWAYSDATA, vopret))); -} - -uint8_t DecodeGatewaysBindOpRet(char *depositaddr,const CScript &scriptPubKey,uint256 &tokenid,std::string &coin,int64_t &totalsupply,uint256 &oracletxid,uint8_t &M,uint8_t &N,std::vector &gatewaypubkeys,uint8_t &taddr,uint8_t &prefix,uint8_t &prefix2,uint8_t &wiftype) -{ - std::vector> oprets; - std::vector vopret,vOpretExtra; uint8_t *script,e,f,tokenevalcode; std::vector pubkeys; - - if (DecodeTokenOpRet(scriptPubKey,tokenevalcode,tokenid,pubkeys,oprets)!=0 && GetOpretBlob(oprets, OPRETID_GATEWAYSDATA, vOpretExtra) && tokenevalcode==EVAL_TOKENS && vOpretExtra.size()>0) - { - vopret=vOpretExtra; - } - else GetOpReturnData(scriptPubKey, vopret); - script = (uint8_t *)vopret.data(); - depositaddr[0] = 0; - if ( vopret.size() > 2 && E_UNMARSHAL(vopret,ss >> e; ss >> f; ss >> coin; ss >> totalsupply; ss >> oracletxid; ss >> M; ss >> N; ss >> gatewaypubkeys; ss >> taddr; ss >> prefix; ss >> prefix2; ss >> wiftype) != 0 ) - { - if ( prefix == HUSH_PUBTYPE && prefix2 == HUSH_P2SHTYPE ) - { - if ( N > 1 ) - { - strcpy(depositaddr,CBitcoinAddress(CScriptID(GetScriptForMultisig(M,gatewaypubkeys))).ToString().c_str()); - LOGSTREAM("gatewayscc", CCLOG_DEBUG1, stream << "f." << f << " M." << (int)M << " of N." << (int)N << " size." << (int32_t)gatewaypubkeys.size() << " -> " << depositaddr << std::endl); - } else Getscriptaddress(depositaddr,CScript() << ParseHex(HexStr(gatewaypubkeys[0])) << OP_CHECKSIG); - } - else - { - if ( N > 1 ) strcpy(depositaddr,CCustomBitcoinAddress(CScriptID(GetScriptForMultisig(M,gatewaypubkeys)),taddr,prefix,prefix2).ToString().c_str()); - else GetCustomscriptaddress(depositaddr,CScript() << ParseHex(HexStr(gatewaypubkeys[0])) << OP_CHECKSIG,taddr,prefix,prefix2); - } - return(f); - } else LOGSTREAM("gatewayscc",CCLOG_DEBUG1, stream << "error decoding bind opret" << std::endl); - return(0); -} - -CScript EncodeGatewaysDepositOpRet(uint8_t funcid,uint256 bindtxid,std::string refcoin,std::vector publishers,std::vectortxids,int32_t height,uint256 cointxid,int32_t claimvout,std::string deposithex,std::vectorproof,CPubKey destpub,int64_t amount) -{ - CScript opret; uint8_t evalcode = EVAL_GATEWAYS; - - opret << OP_RETURN << E_MARSHAL(ss << evalcode << funcid << refcoin << bindtxid << publishers << txids << height << cointxid << claimvout << deposithex << proof << destpub << amount); - return(opret); -} - -uint8_t DecodeGatewaysDepositOpRet(const CScript &scriptPubKey,uint256 &bindtxid,std::string &refcoin,std::vector&publishers,std::vector&txids,int32_t &height,uint256 &cointxid, int32_t &claimvout,std::string &deposithex,std::vector &proof,CPubKey &destpub,int64_t &amount) -{ - std::vector vopret; uint8_t *script,e,f; - - GetOpReturnData(scriptPubKey, vopret); - script = (uint8_t *)vopret.data(); - if ( vopret.size() > 2 && E_UNMARSHAL(vopret,ss >> e; ss >> f; ss >> refcoin; ss >> bindtxid; ss >> publishers; ss >> txids; ss >> height; ss >> cointxid; ss >> claimvout; ss >> deposithex; ss >> proof; ss >> destpub; ss >> amount) != 0 ) - { - return(f); - } - return(0); -} - -CScript EncodeGatewaysClaimOpRet(uint8_t funcid,uint256 tokenid,uint256 bindtxid,std::string refcoin,uint256 deposittxid,CPubKey destpub,int64_t amount) -{ - CScript opret; uint8_t evalcode = EVAL_GATEWAYS; struct CCcontract_info *cp,C; CPubKey gatewayspk; - std::vector pubkeys; - vscript_t vopret; - - pubkeys.push_back(destpub); - vopret = /*<< OP_RETURN <<*/ E_MARSHAL(ss << evalcode << funcid << bindtxid << refcoin << deposittxid << destpub << amount); - return(EncodeTokenOpRet(tokenid,pubkeys, make_pair(OPRETID_GATEWAYSDATA, vopret))); -} - -uint8_t DecodeGatewaysClaimOpRet(const CScript &scriptPubKey,uint256 &tokenid,uint256 &bindtxid,std::string &refcoin,uint256 &deposittxid,CPubKey &destpub,int64_t &amount) -{ - std::vector> oprets; - std::vector vopret,vOpretExtra; uint8_t *script,e,f,tokenevalcode; std::vector pubkeys; - - if (DecodeTokenOpRet(scriptPubKey,tokenevalcode,tokenid,pubkeys, oprets)!=0 && GetOpretBlob(oprets, OPRETID_GATEWAYSDATA, vOpretExtra) && tokenevalcode==EVAL_TOKENS && vOpretExtra.size()>0) - { - vopret=vOpretExtra; - } - else GetOpReturnData(scriptPubKey, vopret); - script = (uint8_t *)vopret.data(); - if ( vopret.size() > 2 && E_UNMARSHAL(vopret, ss >> e; ss >> f; ss >> bindtxid; ss >> refcoin; ss >> deposittxid; ss >> destpub; ss >> amount) != 0 ) - { - return(f); - } - return(0); -} - -CScript EncodeGatewaysWithdrawOpRet(uint8_t funcid,uint256 tokenid,uint256 bindtxid,std::string refcoin,CPubKey withdrawpub,int64_t amount) -{ - CScript opret; uint8_t evalcode = EVAL_GATEWAYS; struct CCcontract_info *cp,C; CPubKey gatewayspk; - std::vector pubkeys; - vscript_t vopret; - - cp = CCinit(&C,EVAL_GATEWAYS); - gatewayspk = GetUnspendable(cp,0); - pubkeys.push_back(gatewayspk); - vopret = /*opret << OP_RETURN << */ E_MARSHAL(ss << evalcode << funcid << bindtxid << refcoin << withdrawpub << amount); - return(EncodeTokenOpRet(tokenid,pubkeys, std::make_pair(OPRETID_GATEWAYSDATA, vopret))); -} - -uint8_t DecodeGatewaysWithdrawOpRet(const CScript &scriptPubKey, uint256& tokenid, uint256 &bindtxid, std::string &refcoin, CPubKey &withdrawpub, int64_t &amount) -{ - std::vector> oprets; - std::vector vopret,vOpretExtra; uint8_t *script,e,f,tokenevalcode; std::vector pubkeys; - - if (DecodeTokenOpRet(scriptPubKey,tokenevalcode,tokenid,pubkeys, oprets)!=0 && GetOpretBlob(oprets, OPRETID_GATEWAYSDATA, vOpretExtra) && tokenevalcode==EVAL_TOKENS && vOpretExtra.size()>0) - { - vopret=vOpretExtra; - } - else GetOpReturnData(scriptPubKey, vopret); - script = (uint8_t *)vopret.data(); - if ( vopret.size() > 2 && E_UNMARSHAL(vopret, ss >> e; ss >> f; ss >> bindtxid; ss >> refcoin; ss >> withdrawpub; ss >> amount) != 0 ) - { - return(f); - } - return(0); -} - -CScript EncodeGatewaysPartialOpRet(uint8_t funcid, uint256 withdrawtxid,std::string refcoin,uint8_t K, CPubKey signerpk,std::string hex) -{ - CScript opret; uint8_t evalcode = EVAL_GATEWAYS; - - opret << OP_RETURN << E_MARSHAL(ss << evalcode << funcid << withdrawtxid << refcoin << K << signerpk << hex); - return(opret); -} - -uint8_t DecodeGatewaysPartialOpRet(const CScript &scriptPubKey,uint256 &withdrawtxid,std::string &refcoin,uint8_t &K,CPubKey &signerpk,std::string &hex) -{ - std::vector vopret; uint8_t *script,e,f; - GetOpReturnData(scriptPubKey, vopret); - script = (uint8_t *)vopret.data(); - if ( vopret.size() > 2 && E_UNMARSHAL(vopret,ss >> e; ss >> f; ss >> withdrawtxid; ss >> refcoin; ss >> K; ss >> signerpk; ss >> hex) != 0 ) - { - return(f); - } - return(0); -} - -CScript EncodeGatewaysCompleteSigningOpRet(uint8_t funcid,uint256 withdrawtxid,std::string refcoin,uint8_t K,std::string hex) -{ - CScript opret; uint8_t evalcode = EVAL_GATEWAYS; - opret << OP_RETURN << E_MARSHAL(ss << evalcode << funcid << withdrawtxid << refcoin << K << hex); - return(opret); -} - -uint8_t DecodeGatewaysCompleteSigningOpRet(const CScript &scriptPubKey,uint256 &withdrawtxid,std::string &refcoin,uint8_t &K,std::string &hex) -{ - std::vector vopret; uint8_t *script,e,f; - - GetOpReturnData(scriptPubKey, vopret); - script = (uint8_t *)vopret.data(); - if ( vopret.size() > 2 && E_UNMARSHAL(vopret,ss >> e; ss >> f; ss >> withdrawtxid; ss >> refcoin; ss >> K; ss >> hex) != 0 ) - { - return(f); - } - return(0); -} - -CScript EncodeGatewaysMarkDoneOpRet(uint8_t funcid,uint256 withdrawtxid,std::string refcoin,uint256 completetxid) -{ - CScript opret; uint8_t evalcode = EVAL_GATEWAYS; - - opret << OP_RETURN << E_MARSHAL(ss << evalcode << funcid << withdrawtxid << refcoin << completetxid); - return(opret); -} - -uint8_t DecodeGatewaysMarkDoneOpRet(const CScript &scriptPubKey, uint256 &withdrawtxid, std::string &refcoin, uint256 &completetxid) -{ - std::vector vopret; uint8_t *script,e,f; - - GetOpReturnData(scriptPubKey, vopret); - script = (uint8_t *)vopret.data(); - if ( vopret.size() > 2 && E_UNMARSHAL(vopret,ss >> e; ss >> f; ss >> withdrawtxid; ss >> refcoin; ss >> completetxid;) != 0 ) - { - return(f); - } - return(0); -} - -uint8_t DecodeGatewaysOpRet(const CScript &scriptPubKey) -{ - std::vector> oprets; - std::vector vopret,vOpretExtra; uint8_t *script,e,f,tokenevalcode; std::vector pubkeys; uint256 tokenid; - - if (DecodeTokenOpRet(scriptPubKey,tokenevalcode,tokenid,pubkeys, oprets)!=0 && GetOpretBlob(oprets, OPRETID_GATEWAYSDATA, vOpretExtra) && tokenevalcode==EVAL_TOKENS && vOpretExtra.size()>0) - { - vopret=vOpretExtra; - } - else GetOpReturnData(scriptPubKey, vopret); - script = (uint8_t *)vopret.data(); - if ( vopret.size() > 2 && script[0] == EVAL_GATEWAYS) - { - f=script[1]; - if (f == 'B' || f == 'D' || f == 'C' || f == 'W' || f == 'P' || f == 'S' || f == 'M') - return(f); - } - return(0); -} - -int64_t IsGatewaysvout(struct CCcontract_info *cp,const CTransaction& tx,int32_t v) -{ - char destaddr[64]; - - if ( tx.vout[v].scriptPubKey.IsPayToCryptoCondition() != 0 ) - { - if ( Getscriptaddress(destaddr,tx.vout[v].scriptPubKey) > 0 && strcmp(destaddr,cp->unspendableCCaddr) == 0 ) - return(tx.vout[v].nValue); - } - return(0); -} - -bool GatewaysExactAmounts(struct CCcontract_info *cp,Eval* eval,const CTransaction &tx,int32_t minage,uint64_t txfee) -{ - static uint256 zerohash; - CTransaction vinTx; uint256 hashBlock,activehash; int32_t i,numvins,numvouts; int64_t inputs=0,outputs=0,assetoshis; - - numvins = tx.vin.size(); - numvouts = tx.vout.size(); - for (i=0; iismyvin)(tx.vin[i].scriptSig) != 0 ) - { - LOGSTREAM("gatewayscc",CCLOG_DEBUG2, stream << "vini." << i << " check mempool" << std::endl); - if ( eval->GetTxUnconfirmed(tx.vin[i].prevout.hash,vinTx,hashBlock) == 0 ) - return eval->Invalid("cant find vinTx"); - else - { - LOGSTREAM("gatewayscc",CCLOG_DEBUG2, stream << "vini." << i << " check hash and vout" << std::endl); - if ( hashBlock == zerohash ) - return eval->Invalid("cant Gateways from mempool"); - if ( (assetoshis= IsGatewaysvout(cp,vinTx,tx.vin[i].prevout.n)) != 0 ) - inputs += assetoshis; - } - } - } - for (i=0; iInvalid("mismatched inputs != outputs + txfee"); - } - else return(true); -} - -int64_t GatewaysVerify(char *refdepositaddr,uint256 oracletxid,int32_t claimvout,std::string refcoin,uint256 cointxid,const std::string deposithex,std::vectorproof,uint256 merkleroot,CPubKey destpub,uint8_t taddr,uint8_t prefix,uint8_t prefix2) -{ - std::vector txids; uint256 proofroot,hashBlock,txid = zeroid; CTransaction tx; std::string name,description,format; - char destaddr[64],destpubaddr[64],claimaddr[64]; int32_t i,numvouts; int64_t nValue = 0; - - if ( myGetTransaction(oracletxid,tx,hashBlock) == 0 || (numvouts= tx.vout.size()) <= 0 ) - { - LOGSTREAM("gatewayscc",CCLOG_INFO, stream << "GatewaysVerify cant find oracletxid " << oracletxid.GetHex() << std::endl); - return(0); - } - if ( DecodeOraclesCreateOpRet(tx.vout[numvouts-1].scriptPubKey,name,description,format) != 'C' || name != refcoin ) - { - LOGSTREAM("gatewayscc",CCLOG_INFO, stream << "GatewaysVerify mismatched oracle name " << name << " != " << refcoin << std::endl); - return(0); - } - proofroot = BitcoinGetProofMerkleRoot(proof,txids); - if ( proofroot != merkleroot ) - { - LOGSTREAM("gatewayscc",CCLOG_INFO, stream << "GatewaysVerify mismatched merkleroot " << proofroot.GetHex() << " != " << merkleroot.GetHex() << std::endl); - return(0); - } - if (std::find(txids.begin(), txids.end(), cointxid) == txids.end()) - { - LOGSTREAM("gatewayscc",CCLOG_INFO, stream << "GatewaysVerify invalid proof for this cointxid" << std::endl); - return 0; - } - if ( DecodeHexTx(tx,deposithex) != 0 ) - { - GetCustomscriptaddress(claimaddr,tx.vout[claimvout].scriptPubKey,taddr,prefix,prefix2); - GetCustomscriptaddress(destpubaddr,CScript() << ParseHex(HexStr(destpub)) << OP_CHECKSIG,taddr,prefix,prefix2); - if ( strcmp(claimaddr,destpubaddr) == 0 ) - { - for (i=0; i publishers; std::vectortxids; uint256 bindtxid,cointxid; std::vector proof; CPubKey claimpubkey; - if ( (numvouts= tx.vout.size()) > 0 ) - { - if ( DecodeGatewaysDepositOpRet(tx.vout[numvouts-1].scriptPubKey,bindtxid,coin,publishers,txids,height,cointxid,claimvout,deposithex,proof,claimpubkey,amount) == 'D' && claimpubkey == mypk ) - { - return(amount); - } - } - return(0); -} - -int32_t GatewaysBindExists(struct CCcontract_info *cp,CPubKey gatewayspk,uint256 reftokenid) -{ - char markeraddr[64],depositaddr[64]; std::string coin; int32_t numvouts; int64_t totalsupply; uint256 tokenid,oracletxid,hashBlock; - uint8_t M,N,taddr,prefix,prefix2,wiftype; std::vector pubkeys; CTransaction tx; - std::vector txids; - - _GetCCaddress(markeraddr,EVAL_GATEWAYS,gatewayspk); - SetCCtxids(txids,markeraddr,true,EVAL_GATEWAYS,zeroid,'B'); - for (std::vector::const_iterator it=txids.begin(); it!=txids.end(); it++) - { - if ( myGetTransaction(*it,tx,hashBlock) != 0 && (numvouts= tx.vout.size()) > 0 && DecodeGatewaysOpRet(tx.vout[numvouts-1].scriptPubKey)=='B' ) - { - if ( DecodeGatewaysBindOpRet(depositaddr,tx.vout[numvouts-1].scriptPubKey,tokenid,coin,totalsupply,oracletxid,M,N,pubkeys,taddr,prefix,prefix2,wiftype) == 'B' ) - { - if ( tokenid == reftokenid ) - { - LOGSTREAM("gatewayscc",CCLOG_INFO, stream << "trying to bind an existing tokenid" << std::endl); - return(1); - } - } - } - } - std::vector tmp_txs; - myGet_mempool_txs(tmp_txs,EVAL_GATEWAYS,'B'); - for (std::vector::const_iterator it=tmp_txs.begin(); it!=tmp_txs.end(); it++) - { - const CTransaction &txmempool = *it; - - if ((numvouts=txmempool.vout.size()) > 0 && DecodeGatewaysOpRet(tx.vout[numvouts-1].scriptPubKey)=='B') - if (DecodeGatewaysBindOpRet(depositaddr,tx.vout[numvouts-1].scriptPubKey,tokenid,coin,totalsupply,oracletxid,M,N,pubkeys,taddr,prefix,prefix2,wiftype) == 'B' && - tokenid == reftokenid) - return(1); - } - - return(0); -} - -bool GatewaysValidate(struct CCcontract_info *cp,Eval *eval,const CTransaction &tx, uint32_t nIn) -{ - int32_t numvins,numvouts,preventCCvins,preventCCvouts,i,numblocks,height,claimvout; bool retval; uint8_t funcid,hash[32],K,M,N,taddr,prefix,prefix2,wiftype; - char str[65],destaddr[65],depositaddr[65],gatewaystokensaddr[65],validationError[512]; - std::vector txids; std::vector pubkeys,publishers,tmppublishers; std::vector proof; int64_t fullsupply,totalsupply,amount,tmpamount; - uint256 hashblock,txid,bindtxid,deposittxid,withdrawtxid,completetxid,tokenid,tmptokenid,oracletxid,bindtokenid,cointxid,tmptxid,merkleroot,mhash; CTransaction bindtx,tmptx; - std::string refcoin,tmprefcoin,hex,name,description,format; CPubKey pubkey,tmppubkey,gatewayspk; - - numvins = tx.vin.size(); - numvouts = tx.vout.size(); - preventCCvins = preventCCvouts = -1; - if ( numvouts < 1 ) - return eval->Invalid("no vouts"); - else - { - //LogPrint("gatewayscc-1","check amounts\n"); - // if ( GatewaysExactAmounts(cp,eval,tx,1,10000) == false ) - // { - // return eval->Invalid("invalid inputs vs. outputs!"); - // } - // else - // { - gatewayspk = GetUnspendable(cp,0); - GetTokensCCaddress(cp, gatewaystokensaddr, gatewayspk); - if ( (funcid = DecodeGatewaysOpRet(tx.vout[numvouts-1].scriptPubKey)) != 0) - { - switch ( funcid ) - { - case 'B': - //vin.0: normal input - //vin.1: CC input of tokens - //vout.0: CC vout of gateways tokens to gateways tokens CC address - //vout.1: CC vout marker - //vout.n-1: opreturn - 'B' tokenid coin totalsupply oracletxid M N pubkeys taddr prefix prefix2 wiftype - return eval->Invalid("unexpected GatewaysValidate for gatewaysbind!"); - break; - case 'D': - //vin.0: normal input - //vout.0: CC vout marker to destination pubkey - //vout.1: normal output marker to txidaddr - //vout.n-1: opreturn - 'D' bindtxid coin publishers txids height cointxid claimvout deposithex proof destpub amount - return eval->Invalid("unexpected GatewaysValidate for gatewaysdeposit!"); - break; - case 'C': - //vin.0: normal input - //vin.1: CC input of gateways tokens - //vin.2: CC input of marker from gatewaysdeposit tx - //vout.0: CC vout of tokens from deposit amount to destinatoin pubkey - //vout.1: CC vout change of gateways tokens to gateways tokens CC address (if any) - //vout.n-1: opreturn - 'C' tokenid bindtxid coin deposittxid destpub amount - if ((numvouts=tx.vout.size()) < 1 || DecodeGatewaysClaimOpRet(tx.vout[numvouts-1].scriptPubKey,tmptokenid,bindtxid,refcoin,deposittxid,pubkey,amount)!='C') - return eval->Invalid("invalid gatewaysclaim OP_RETURN data!"); - else if (myGetTransaction(bindtxid,tmptx,hashblock) == 0) - return eval->Invalid("invalid gatewaysbind txid!"); - else if ((numvouts=tmptx.vout.size()) < 1 || DecodeGatewaysBindOpRet(depositaddr,tmptx.vout[numvouts-1].scriptPubKey,tokenid,tmprefcoin,totalsupply,oracletxid,M,N,pubkeys,taddr,prefix,prefix2,wiftype) != 'B') - return eval->Invalid("invalid gatewaysbind OP_RETURN data!"); - else if ( IsCCInput(tmptx.vin[0].scriptSig) != 0 ) - return eval->Invalid("vin.0 is normal for gatewaysbind!"); - else if ( ConstrainVout(tmptx.vout[0],1,gatewaystokensaddr,totalsupply)==0) - return eval->Invalid("invalid tokens to gateways vout for gatewaysbind!"); - else if ( ConstrainVout(tmptx.vout[1],1,cp->unspendableCCaddr,CC_MARKER_VALUE)==0) - return eval->Invalid("invalid marker vout for gatewaysbind!"); - else if (tmprefcoin!=refcoin) - return eval->Invalid("refcoin different than in bind tx"); - else if (tmptokenid!=tokenid) - return eval->Invalid("tokenid does not match tokenid from gatewaysbind"); - else if ( N == 0 || N > 15 || M > N ) - return eval->Invalid("invalid MofN in gatewaysbind"); - else if (pubkeys.size()!=N) - { - sprintf(validationError,"not enough pubkeys(%ld) for N.%d gatewaysbind ",pubkeys.size(),N); - return eval->Invalid(validationError); - } - else if ( (fullsupply=CCfullsupply(tokenid)) != totalsupply ) - { - sprintf(validationError,"Gateway bind.%s (%s) globaladdr.%s totalsupply %.8f != fullsupply %.8f\n",refcoin.c_str(),uint256_str(str,tokenid),cp->unspendableCCaddr,(double)totalsupply/COIN,(double)fullsupply/COIN); - return eval->Invalid(validationError); - } - else if (myGetTransaction(oracletxid,tmptx,hashblock) == 0 || (numvouts=tmptx.vout.size()) <= 0 ) - { - sprintf(validationError,"cant find oracletxid %s\n",uint256_str(str,oracletxid)); - return eval->Invalid(validationError); - } - else if ( DecodeOraclesCreateOpRet(tmptx.vout[numvouts-1].scriptPubKey,name,description,format) != 'C' ) - return eval->Invalid("invalid oraclescreate OP_RETURN data"); - else if (refcoin!=name) - { - sprintf(validationError,"mismatched oracle name %s != %s\n",name.c_str(),refcoin.c_str()); - return eval->Invalid(validationError); - } - else if (format.size()!=3 || strncmp(format.c_str(),"Ihh",3)!=0) - { - sprintf(validationError,"illegal format %s != Ihh\n",format.c_str()); - return eval->Invalid(validationError); - } - else if (hush_txnotarizedconfirmed(bindtxid) == false) - return eval->Invalid("gatewaysbind tx is not yet confirmed(notarized)!"); - else if (myGetTransaction(deposittxid,tmptx,hashblock) == 0) - return eval->Invalid("invalid gatewaysdeposittxid!"); - else if ((numvouts=tmptx.vout.size()) < 1 || DecodeGatewaysDepositOpRet(tmptx.vout[numvouts-1].scriptPubKey,tmptxid,tmprefcoin,tmppublishers,txids,height,cointxid,claimvout,hex,proof,tmppubkey,tmpamount) != 'D') - return eval->Invalid("invalid gatewaysdeposit OP_RETURN data!"); - else if ( IsCCInput(tmptx.vin[0].scriptSig) != 0 ) - return eval->Invalid("vin.0 is normal for gatewaysdeposit!"); - else if ( GetCCaddress(cp,destaddr,tmppubkey)==0 || ConstrainVout(tmptx.vout[0],1,destaddr,CC_MARKER_VALUE)==0) - return eval->Invalid("invalid CC marker vout for gatewaysdeposit!"); - else if ( CCtxidaddr(destaddr,cointxid)==CPubKey() || ConstrainVout(tmptx.vout[1],0,destaddr,CC_MARKER_VALUE)==0) - return eval->Invalid("invalid normal marker vout for gatewaysdeposit!"); - else if (tmprefcoin!=refcoin) - return eval->Invalid("refcoin different than in deposit tx"); - else if (bindtxid!=tmptxid) - return eval->Invalid("bindtxid does not match to bindtxid from gatewaysdeposit"); - else if (tmpamount>totalsupply) - return eval->Invalid("deposit amount greater then bind total supply"); - else if (hush_txnotarizedconfirmed(deposittxid) == false) - return eval->Invalid("gatewaysdeposit tx is not yet confirmed(notarized)!"); - else if (tx.vin.size()>0) - { - i=0; - while (iInvalid("vin."+std::to_string(i)+" is CC for gatewaysclaim!"); - i++; - } - } - else if ((*cp->ismyvin)(tx.vin[tx.vin.size()-1].scriptSig) == 0 || tmptx.vout[tx.vin[tx.vin.size()-1].prevout.n].nValue!=CC_MARKER_VALUE) - return eval->Invalid("vin."+std::to_string(tx.vin.size()-1)+" is CC marker for gatewaysclaim or invalid marker amount!"); - else if (_GetCCaddress(destaddr,EVAL_TOKENS,pubkey)==0 || ConstrainVout(tx.vout[0],1,destaddr,amount)==0) - return eval->Invalid("invalid vout tokens to destpub for gatewaysclaim!"); - else if (numvouts>2 && tx.vout[1].scriptPubKey.IsPayToCryptoCondition() && (myGetTransaction(tx.vin[1].prevout.hash,tmptx,hashblock)==0 || ConstrainVout(tx.vout[1],1,gatewaystokensaddr,tmptx.vout[tx.vin[1].prevout.n].nValue-amount)==0)) - return eval->Invalid("invalid CC change vout for gatewaysclaim!"); - else if (amount!=tmpamount) - return eval->Invalid("claimed amount different then deposit amount"); - else if (pubkey!=tmppubkey) - return eval->Invalid("claim destination pubkey different than in deposit tx"); - else - { - int32_t m; - merkleroot = zeroid; - for (i=m=0; iInvalid(validationError); - } - else if (GatewaysVerify(depositaddr,oracletxid,claimvout,tmprefcoin,cointxid,hex,proof,merkleroot,pubkey,taddr,prefix,prefix2)!=amount) - return eval->Invalid("external deposit not verified\n"); - } - break; - case 'W': - //vin.0: normal input - //vin.1: CC input of tokens - //vout.0: CC vout marker to gateways CC address - //vout.1: CC vout of gateways tokens back to gateways tokens CC address - //vout.2: CC vout change of tokens back to owners pubkey (if any) - //vout.n-1: opreturn - 'W' tokenid bindtxid refcoin withdrawpub amount - return eval->Invalid("unexpected GatewaysValidate for gatewaysWithdraw!"); - break; - case 'P': - //vin.0: normal input - //vin.1: CC input of marker from previous tx (withdraw or partialsing) - //vout.0: CC vout marker to gateways CC address - //vout.n-1: opreturn - 'P' withdrawtxid refcoin number_of_signs mypk hex - if ((numvouts=tx.vout.size()) > 0 && DecodeGatewaysPartialOpRet(tx.vout[numvouts-1].scriptPubKey,withdrawtxid,refcoin,K,pubkey,hex)!='P') - return eval->Invalid("invalid gatewaysPartialSign OP_RETURN data!"); - else if (myGetTransaction(withdrawtxid,tmptx,hashblock) == 0) - return eval->Invalid("invalid withdraw txid!"); - else if ((numvouts=tmptx.vout.size()) > 0 && DecodeGatewaysWithdrawOpRet(tmptx.vout[numvouts-1].scriptPubKey,tmptokenid,bindtxid,tmprefcoin,pubkey,amount)!='W') - return eval->Invalid("invalid gatewayswithdraw OP_RETURN data!"); - else if (tmprefcoin!=refcoin) - return eval->Invalid("refcoin different than in bind tx"); - else if ( IsCCInput(tmptx.vin[0].scriptSig) != 0 ) - return eval->Invalid("vin.0 is normal for gatewaysWithdraw!"); - else if ( ConstrainVout(tmptx.vout[0],1,cp->unspendableCCaddr,CC_MARKER_VALUE)==0) - return eval->Invalid("invalid marker vout for gatewaysWithdraw!"); - else if ( ConstrainVout(tmptx.vout[1],1,gatewaystokensaddr,amount)==0) - return eval->Invalid("invalid tokens to gateways vout for gatewaysWithdraw!"); - else if (hush_txnotarizedconfirmed(withdrawtxid) == false) - return eval->Invalid("gatewayswithdraw tx is not yet confirmed(notarized)!"); - else if (myGetTransaction(bindtxid,tmptx,hashblock) == 0) - return eval->Invalid("invalid gatewaysbind txid!"); - else if ((numvouts=tmptx.vout.size()) < 1 || DecodeGatewaysBindOpRet(depositaddr,tmptx.vout[numvouts-1].scriptPubKey,tokenid,tmprefcoin,totalsupply,oracletxid,M,N,pubkeys,taddr,prefix,prefix2,wiftype) != 'B') - return eval->Invalid("invalid gatewaysbind OP_RETURN data!"); - else if (tmprefcoin!=refcoin) - return eval->Invalid("refcoin different than in bind tx"); - else if (tmptokenid!=tokenid) - return eval->Invalid("tokenid does not match tokenid from gatewaysbind"); - else if (hush_txnotarizedconfirmed(bindtxid) == false) - return eval->Invalid("gatewaysbind tx is not yet confirmed(notarized)!"); - else if (IsCCInput(tx.vin[0].scriptSig) != 0) - return eval->Invalid("vin.0 is normal for gatewayspartialsign!"); - else if ((*cp->ismyvin)(tx.vin[tx.vin.size()-1].scriptSig) == 0 || myGetTransaction(tx.vin[tx.vin.size()-1].prevout.hash,tmptx,hashblock)==0 || tmptx.vout[tx.vin[tx.vin.size()-1].prevout.n].nValue!=CC_MARKER_VALUE) - return eval->Invalid("vin."+std::to_string(tx.vin.size()-1)+" is CC marker for gatewayspartialsign or invalid marker amount!"); - else if (ConstrainVout(tx.vout[0],1,cp->unspendableCCaddr,CC_MARKER_VALUE) == 0 ) - return eval->Invalid("vout.0 invalid marker for gatewayspartialsign!"); - else if (K>M) - return eval->Invalid("invalid number of signs!"); - break; - case 'S': - //vin.0: normal input - //vin.1: CC input of marker from previous tx (withdraw or partialsing) - //vout.0: CC vout marker to gateways CC address - //vout.n-1: opreturn - 'S' withdrawtxid refcoin hex - if ((numvouts=tx.vout.size()) > 0 && DecodeGatewaysCompleteSigningOpRet(tx.vout[numvouts-1].scriptPubKey,withdrawtxid,refcoin,K,hex)!='S') - return eval->Invalid("invalid gatewayscompletesigning OP_RETURN data!"); - else if (myGetTransaction(withdrawtxid,tmptx,hashblock) == 0) - return eval->Invalid("invalid withdraw txid!"); - else if ((numvouts=tmptx.vout.size()) > 0 && DecodeGatewaysWithdrawOpRet(tmptx.vout[numvouts-1].scriptPubKey,tmptokenid,bindtxid,tmprefcoin,pubkey,amount)!='W') - return eval->Invalid("invalid gatewayswithdraw OP_RETURN data!"); - else if (tmprefcoin!=refcoin) - return eval->Invalid("refcoin different than in bind tx"); - else if ( IsCCInput(tmptx.vin[0].scriptSig) != 0 ) - return eval->Invalid("vin.0 is normal for gatewaysWithdraw!"); - else if ( ConstrainVout(tmptx.vout[0],1,cp->unspendableCCaddr,CC_MARKER_VALUE)==0) - return eval->Invalid("invalid marker vout for gatewaysWithdraw!"); - else if ( ConstrainVout(tmptx.vout[1],1,gatewaystokensaddr,amount)==0) - return eval->Invalid("invalid tokens to gateways vout for gatewaysWithdraw!"); - else if (tmptx.vout[1].nValue!=amount) - return eval->Invalid("amount in opret not matching tx tokens amount!"); - else if (hush_txnotarizedconfirmed(withdrawtxid) == false) - return eval->Invalid("gatewayswithdraw tx is not yet confirmed(notarized)!"); - else if (myGetTransaction(bindtxid,tmptx,hashblock) == 0) - return eval->Invalid("invalid gatewaysbind txid!"); - else if ((numvouts=tmptx.vout.size()) < 1 || DecodeGatewaysBindOpRet(depositaddr,tmptx.vout[numvouts-1].scriptPubKey,tokenid,tmprefcoin,totalsupply,oracletxid,M,N,pubkeys,taddr,prefix,prefix2,wiftype) != 'B') - return eval->Invalid("invalid gatewaysbind OP_RETURN data!"); - else if (tmprefcoin!=refcoin) - return eval->Invalid("refcoin different than in bind tx"); - else if (tmptokenid!=tokenid) - return eval->Invalid("tokenid does not match tokenid from gatewaysbind"); - else if (hush_txnotarizedconfirmed(bindtxid) == false) - return eval->Invalid("gatewaysbind tx is not yet confirmed(notarized)!"); - else if (IsCCInput(tx.vin[0].scriptSig) != 0) - return eval->Invalid("vin.0 is normal for gatewayscompletesigning!"); - else if ((*cp->ismyvin)(tx.vin[tx.vin.size()-1].scriptSig) == 0 || myGetTransaction(tx.vin[tx.vin.size()-1].prevout.hash,tmptx,hashblock)==0 || tmptx.vout[tx.vin[tx.vin.size()-1].prevout.n].nValue!=CC_MARKER_VALUE) - return eval->Invalid("vin."+std::to_string(tx.vin.size()-1)+" is CC marker for gatewayscompletesigning or invalid marker amount!"); - else if (ConstrainVout(tx.vout[0],1,cp->unspendableCCaddr,CC_MARKER_VALUE) == 0 ) - return eval->Invalid("vout.0 invalid marker for gatewayscompletesigning!"); - else if (KInvalid("invalid number of signs!"); - break; - case 'M': - //vin.0: normal input - //vin.1: CC input of gatewayscompletesigning tx marker to gateways CC address - //vout.0: opreturn - 'M' withdrawtxid refcoin completetxid - if ((numvouts=tx.vout.size()) > 0 && DecodeGatewaysMarkDoneOpRet(tx.vout[numvouts-1].scriptPubKey,withdrawtxid,refcoin,completetxid)!='M') - return eval->Invalid("invalid gatewaysmarkdone OP_RETURN data!"); - else if (myGetTransaction(completetxid,tmptx,hashblock) == 0) - return eval->Invalid("invalid gatewayscompletesigning txid!"); - else if ((numvouts=tmptx.vout.size()) > 0 && DecodeGatewaysCompleteSigningOpRet(tmptx.vout[numvouts-1].scriptPubKey,withdrawtxid,tmprefcoin,K,hex)!='S') - return eval->Invalid("invalid gatewayscompletesigning OP_RETURN data!"); - else if (hush_txnotarizedconfirmed(completetxid) == false) - return eval->Invalid("gatewayscompletesigning tx is not yet confirmed(notarized)!"); - else if (myGetTransaction(withdrawtxid,tmptx,hashblock) == 0) - return eval->Invalid("invalid withdraw txid!"); - else if ((numvouts=tmptx.vout.size()) > 0 && DecodeGatewaysWithdrawOpRet(tmptx.vout[numvouts-1].scriptPubKey,tmptokenid,bindtxid,tmprefcoin,pubkey,amount)!='W') - return eval->Invalid("invalid gatewayswithdraw OP_RETURN data!"); - else if (tmprefcoin!=refcoin) - return eval->Invalid("refcoin different than in bind tx"); - else if (hush_txnotarizedconfirmed(withdrawtxid) == false) - return eval->Invalid("gatewayswithdraw tx is not yet confirmed(notarized)!"); - else if (myGetTransaction(bindtxid,tmptx,hashblock) == 0) - return eval->Invalid("invalid gatewaysbind txid!"); - else if ((numvouts=tmptx.vout.size()) < 1 || DecodeGatewaysBindOpRet(depositaddr,tmptx.vout[numvouts-1].scriptPubKey,tokenid,tmprefcoin,totalsupply,oracletxid,M,N,pubkeys,taddr,prefix,prefix2,wiftype) != 'B') - return eval->Invalid("invalid gatewaysbind OP_RETURN data!"); - else if (tmprefcoin!=refcoin) - return eval->Invalid("refcoin different than in bind tx"); - else if (tmptokenid!=tokenid) - return eval->Invalid("tokenid does not match tokenid from gatewaysbind"); - else if (hush_txnotarizedconfirmed(bindtxid) == false) - return eval->Invalid("gatewaysbind tx is not yet confirmed(notarized)!"); - else if ( IsCCInput(tx.vin[0].scriptSig) != 0 ) - return eval->Invalid("vin.0 is normal for gatewaysmarkdone!"); - else if ((*cp->ismyvin)(tx.vin[tx.vin.size()-1].scriptSig) == 0 || myGetTransaction(tx.vin[tx.vin.size()-1].prevout.hash,tmptx,hashblock)==0 || tmptx.vout[tx.vin[tx.vin.size()-1].prevout.n].nValue!=CC_MARKER_VALUE) - return eval->Invalid("vin."+std::to_string(tx.vin.size()-1)+" is CC marker for gatewaysmarkdone or invalid marker amount!"); - else if (KInvalid("invalid number of signs!"); - break; - } - } - retval = PreventCC(eval,tx,preventCCvins,numvins,preventCCvouts,numvouts); - if ( retval != 0 ) - LOGSTREAM("gatewayscc",CCLOG_INFO, stream << "Gateways tx validated" << std::endl); - else fprintf(stderr,"Gateways tx invalid\n"); - return(retval); - // } - } -} -// end of consensus code - -// helper functions for rpc calls in rpcwallet.cpp - -int64_t AddGatewaysInputs(struct CCcontract_info *cp,CMutableTransaction &mtx,CPubKey pk,uint256 bindtxid,int64_t total,int32_t maxinputs) -{ - char coinaddr[64],depositaddr[64]; int64_t threshold,nValue,price,totalinputs = 0,totalsupply,amount; - CTransaction vintx,bindtx; int32_t vout,numvouts,n = 0; uint8_t M,N,evalcode,funcid,taddr,prefix,prefix2,wiftype; std::vector pubkeys; - std::vector > unspentOutputs; std::string refcoin,tmprefcoin; CPubKey withdrawpub,destpub; - uint256 tokenid,txid,oracletxid,tmpbindtxid,tmptokenid,deposittxid,hashBlock; - - if ( myGetTransaction(bindtxid,bindtx,hashBlock) != 0 ) - { - if ((numvouts=bindtx.vout.size())!=0 && DecodeGatewaysBindOpRet(depositaddr,bindtx.vout[numvouts-1].scriptPubKey,tokenid,refcoin,totalsupply,oracletxid,M,N,pubkeys,taddr,prefix,prefix2,wiftype) == 'B') - { - GetTokensCCaddress(cp,coinaddr,pk); - SetCCunspents(unspentOutputs,coinaddr,true); - if ( maxinputs > CC_MAXVINS ) - maxinputs = CC_MAXVINS; - if ( maxinputs > 0 ) - threshold = total/maxinputs; - else threshold = total; - LOGSTREAM("gatewayscc",CCLOG_DEBUG1, stream << "check " << coinaddr << " for gateway inputs" << std::endl); - for (std::vector >::const_iterator it=unspentOutputs.begin(); it!=unspentOutputs.end(); it++) - { - txid = it->first.txhash; - vout = (int32_t)it->first.index; - if ( myGetTransaction(txid,vintx,hashBlock) != 0 ) - { - funcid=DecodeGatewaysOpRet(vintx.vout[vintx.vout.size()-1].scriptPubKey); - if ((vout==0 && funcid=='B' && bindtxid==txid && total != 0 && maxinputs != 0) || - (vout==1 && funcid=='W' && DecodeGatewaysWithdrawOpRet(vintx.vout[vintx.vout.size()-1].scriptPubKey,tmptokenid,tmpbindtxid,tmprefcoin,withdrawpub,amount) == 'W' && - tmpbindtxid==bindtxid && tmprefcoin==refcoin && tmptokenid==tokenid && total != 0 && maxinputs != 0) || - (vout==1 && funcid=='C' && DecodeGatewaysClaimOpRet(vintx.vout[vintx.vout.size()-1].scriptPubKey,tmptokenid,tmpbindtxid,tmprefcoin,deposittxid,destpub,amount) == 'C' && - tmpbindtxid==bindtxid && tmprefcoin==refcoin && tmptokenid==tokenid && total != 0 && maxinputs != 0)) - { - mtx.vin.push_back(CTxIn(txid,vout,CScript())); - totalinputs += it->second.satoshis; - n++; - if ( (total > 0 && totalinputs >= total) || (maxinputs > 0 && n >= maxinputs)) break; - } - } - } - return(totalinputs); - } - else LOGSTREAM("gatewayscc",CCLOG_INFO, stream << "invalid GatewaysBind" << std::endl); - } - else LOGSTREAM("gatewayscc",CCLOG_INFO, stream << "can't find GatewaysBind txid" << std::endl); - return(0); -} - -UniValue GatewaysBind(const CPubKey& pk, uint64_t txfee,std::string coin,uint256 tokenid,int64_t totalsupply,uint256 oracletxid,uint8_t M,uint8_t N,std::vector pubkeys,uint8_t p1,uint8_t p2,uint8_t p3,uint8_t p4) -{ - CMutableTransaction mtx = CreateNewContextualCMutableTransaction(Params().GetConsensus(), hush_nextheight()); - CTransaction oracletx; uint8_t taddr,prefix,prefix2,wiftype; CPubKey mypk,gatewayspk; CScript opret; uint256 hashBlock; - struct CCcontract_info *cp,*cpTokens,C,CTokens; std::string name,description,format; int32_t i,numvouts; int64_t fullsupply; - char destaddr[64],coinaddr[64],myTokenCCaddr[64],*fstr; - - cp = CCinit(&C,EVAL_GATEWAYS); - cpTokens = CCinit(&CTokens,EVAL_TOKENS); - if (coin=="HUSH") - { - prefix = HUSH_PUBTYPE; - prefix2 = HUSH_P2SHTYPE; - wiftype = HUSH_WIFTYPE; - taddr = HUSH_TADDR; - } - else - { - prefix = p1; - prefix2 = p2; - wiftype = p3; - taddr = p4; - LOGSTREAM("gatewayscc",CCLOG_DEBUG1, stream << "set prefix " << prefix << ", prefix2 " << prefix2 << ", wiftype " << wiftype << ", taddr " << taddr << " for " << coin << std::endl); - } - if ( N == 0 || N > 15 || M > N ) - CCERR_RESULT("gatewayscc",CCLOG_INFO, stream << "illegal M." << M << " or N." << N); - if ( pubkeys.size() != N ) - CCERR_RESULT("gatewayscc",CCLOG_INFO, stream << "M."<< M << " N." << N << " but pubkeys[" <<( int32_t)pubkeys.size() << "]"); - for (i=0; iunspendableCCaddr << " totalsupply " << (double)totalsupply/COIN << " != fullsupply " << (double)fullsupply/COIN); - if ( CCtoken_balance(myTokenCCaddr,tokenid) != totalsupply ) - CCERR_RESULT("gatewayscc",CCLOG_INFO, stream << "token balance on " << myTokenCCaddr << " " << (double)CCtoken_balance((char *)myTokenCCaddr,tokenid)/COIN << "!=" << (double)totalsupply/COIN); - if ( myGetTransaction(oracletxid,oracletx,hashBlock) == 0 || (numvouts= oracletx.vout.size()) <= 0 ) - CCERR_RESULT("gatewayscc",CCLOG_INFO, stream << "cant find oracletxid " << oracletxid.GetHex()); - if ( DecodeOraclesCreateOpRet(oracletx.vout[numvouts-1].scriptPubKey,name,description,format) != 'C' ) - CCERR_RESULT("gatewayscc",CCLOG_INFO, stream << "mismatched oracle name " << name << " != " << coin); - if ( (fstr=(char *)format.c_str()) == 0 || strncmp(fstr,"Ihh",3) != 0 ) - CCERR_RESULT("gatewayscc",CCLOG_INFO, stream << "illegal format (" << fstr << ") != (Ihh)"); - if ( GatewaysBindExists(cp,gatewayspk,tokenid) != 0 ) - CCERR_RESULT("gatewayscc",CCLOG_INFO, stream << "Gateway bind." << coin << " (" << tokenid.GetHex() << ") already exists"); - if ( AddNormalinputs(mtx,mypk,txfee+CC_MARKER_VALUE,2,pk.IsValid()) > 0 ) - { - if (AddTokenCCInputs(cpTokens, mtx, mypk, tokenid, totalsupply, 64)>0) - { - mtx.vout.push_back(MakeTokensCC1vout(cp->evalcode,totalsupply,gatewayspk)); - mtx.vout.push_back(MakeCC1vout(cp->evalcode,CC_MARKER_VALUE,gatewayspk)); - return(FinalizeCCTxExt(pk.IsValid(),0,cp,mtx,mypk,txfee,EncodeGatewaysBindOpRet('B',tokenid,coin,totalsupply,oracletxid,M,N,pubkeys,taddr,prefix,prefix2,wiftype))); - } - } - CCERR_RESULT("gatewayscc",CCLOG_INFO, stream << "cant find enough inputs"); -} - -UniValue GatewaysDeposit(const CPubKey& pk, uint64_t txfee,uint256 bindtxid,int32_t height,std::string refcoin,uint256 cointxid,int32_t claimvout,std::string deposithex,std::vectorproof,CPubKey destpub,int64_t amount) -{ - CMutableTransaction mtx = CreateNewContextualCMutableTransaction(Params().GetConsensus(), hush_nextheight()); - CTransaction tx; CPubKey mypk; uint256 oracletxid,merkleroot,mhash,hashBlock,tokenid,txid; - int64_t totalsupply; int32_t i,m,n,numvouts; uint8_t M,N,taddr,prefix,prefix2,wiftype; std::string coin; struct CCcontract_info *cp,C; - std::vector pubkeys,publishers; std::vectortxids; char str[65],depositaddr[64],txidaddr[64]; - - cp = CCinit(&C,EVAL_GATEWAYS); - if ( txfee == 0 ) - txfee = 10000; - mypk = pk.IsValid()?pk:pubkey2pk(Mypubkey()); - LOGSTREAM("gatewayscc",CCLOG_DEBUG1, stream << "GatewaysDeposit ht." << height << " " << refcoin << " " << (double)amount/COIN << " numpks." << (int32_t)pubkeys.size() << std::endl); - if ( myGetTransaction(bindtxid,tx,hashBlock) == 0 || (numvouts= tx.vout.size()) <= 0 ) - CCERR_RESULT("gatewayscc",CCLOG_INFO, stream << "cant find bindtxid " << bindtxid.GetHex()); - if ( DecodeGatewaysBindOpRet(depositaddr,tx.vout[numvouts-1].scriptPubKey,tokenid,coin,totalsupply,oracletxid,M,N,pubkeys,taddr,prefix,prefix2,wiftype) != 'B' || refcoin != coin ) - CCERR_RESULT("gatewayscc",CCLOG_INFO, stream << "invalid coin - bindtxid " << bindtxid.GetHex() << " coin." << coin); - if (hush_txnotarizedconfirmed(bindtxid)==false) - CCERR_RESULT("gatewayscc",CCLOG_INFO, stream << "gatewaysbind tx not yet confirmed/notarized"); - n = (int32_t)pubkeys.size(); - merkleroot = zeroid; - for (i=m=0; i 0 ) - { - mtx.vout.push_back(MakeCC1vout(cp->evalcode,CC_MARKER_VALUE,destpub)); - mtx.vout.push_back(CTxOut(CC_MARKER_VALUE,CScript() << ParseHex(HexStr(CCtxidaddr(txidaddr,cointxid))) << OP_CHECKSIG)); - return(FinalizeCCTxExt(pk.IsValid(),0,cp,mtx,mypk,txfee,EncodeGatewaysDepositOpRet('D',bindtxid,coin,publishers,txids,height,cointxid,claimvout,deposithex,proof,destpub,amount))); - } - CCERR_RESULT("gatewayscc",CCLOG_INFO, stream << "cant find enough inputs"); -} - -UniValue GatewaysClaim(const CPubKey& pk, uint64_t txfee,uint256 bindtxid,std::string refcoin,uint256 deposittxid,CPubKey destpub,int64_t amount) -{ - CMutableTransaction mtx = CreateNewContextualCMutableTransaction(Params().GetConsensus(), hush_nextheight()); - CTransaction tx; CPubKey mypk,gatewayspk,tmpdestpub; struct CCcontract_info *cp,C; uint8_t M,N,taddr,prefix,prefix2,wiftype; - std::string coin, deposithex; std::vector pubkeys,publishers; int64_t totalsupply,depositamount,tmpamount,inputs,CCchange=0; - int32_t numvouts,claimvout,height; std::vector proof; - uint256 hashBlock,tokenid,oracletxid,tmptxid,cointxid; char depositaddr[64],coinaddr[64],destaddr[64]; std::vector txids; - - cp = CCinit(&C,EVAL_GATEWAYS); - if ( txfee == 0 ) - txfee = 10000; - mypk = pk.IsValid()?pk:pubkey2pk(Mypubkey()); - gatewayspk = GetUnspendable(cp,0); - if ( myGetTransaction(bindtxid,tx,hashBlock) == 0 || (numvouts= tx.vout.size()) <= 0 ) - CCERR_RESULT("gatewayscc",CCLOG_INFO, stream << "cant find bindtxid " << bindtxid.GetHex()); - if ( DecodeGatewaysBindOpRet(depositaddr,tx.vout[numvouts-1].scriptPubKey,tokenid,coin,totalsupply,oracletxid,M,N,pubkeys,taddr,prefix,prefix2,wiftype) != 'B' || refcoin != coin ) - CCERR_RESULT("gatewayscc",CCLOG_INFO, stream << "invalid coin - bindtxid " << bindtxid.GetHex() << " coin." << coin); - if (hush_txnotarizedconfirmed(bindtxid)==false) - CCERR_RESULT("gatewayscc",CCLOG_INFO, stream << "gatewaysbind tx not yet confirmed/notarized"); - if ( myGetTransaction(deposittxid,tx,hashBlock) == 0 || (numvouts= tx.vout.size()) <= 0 ) - CCERR_RESULT("gatewayscc",CCLOG_INFO, stream << "cant find deposittxid " << bindtxid.GetHex()); - if (DecodeGatewaysDepositOpRet(tx.vout[numvouts-1].scriptPubKey,tmptxid,coin,publishers,txids,height,cointxid,claimvout,deposithex,proof,tmpdestpub,tmpamount) != 'D' || coin != refcoin) - CCERR_RESULT("gatewayscc",CCLOG_INFO, stream << "invalid coin - deposittxid " << bindtxid.GetHex() << " coin." << coin); - if (hush_txnotarizedconfirmed(deposittxid)==false) - CCERR_RESULT("gatewayscc",CCLOG_INFO, stream << "gatewaysdeposit tx not yet confirmed/notarized"); - if (tmpdestpub!=destpub) - CCERR_RESULT("gatewayscc",CCLOG_INFO, stream << "different destination pubkey from desdeposit tx"); - if ( (depositamount=GatewaysDepositval(tx,mypk)) != amount ) - CCERR_RESULT("gatewayscc",CCLOG_INFO, stream << "invalid Gateways deposittxid " << deposittxid.GetHex() << " " << (double)depositamount/COIN << " != " << (double)amount/COIN << ", remember claim must be done from destination pubkey from deposit tx!"); - if ((inputs=AddGatewaysInputs(cp, mtx, gatewayspk, bindtxid, amount, 60)) > 0) - { - if ( inputs > amount ) CCchange = (inputs - amount); - mtx.vin.push_back(CTxIn(deposittxid,0,CScript())); - mtx.vout.push_back(MakeCC1vout(EVAL_TOKENS,amount,destpub)); - if ( CCchange != 0 ) mtx.vout.push_back(MakeTokensCC1vout(EVAL_GATEWAYS,CCchange,gatewayspk)); - return(FinalizeCCTxExt(pk.IsValid(),0,cp,mtx,mypk,txfee,EncodeGatewaysClaimOpRet('C',tokenid,bindtxid,refcoin,deposittxid,destpub,amount))); - } - CCERR_RESULT("gatewayscc",CCLOG_INFO, stream << "cant find enough tokens in gateways address for given amount"); -} - -UniValue GatewaysWithdraw(const CPubKey& pk, uint64_t txfee,uint256 bindtxid,std::string refcoin,CPubKey withdrawpub,int64_t amount) -{ - CMutableTransaction mtx = CreateNewContextualCMutableTransaction(Params().GetConsensus(), hush_nextheight()); - CTransaction tx; CPubKey mypk,gatewayspk,signerpk; uint256 txid,tokenid,hashBlock,oracletxid,tmptokenid,tmpbindtxid,withdrawtxid; int32_t vout,numvouts; - int64_t nValue,totalsupply,inputs,CCchange=0,tmpamount; uint8_t funcid,K,M,N,taddr,prefix,prefix2,wiftype; std::string coin,hex; - std::vector pubkeys; char depositaddr[64],coinaddr[64]; struct CCcontract_info *cp,C,*cpTokens,CTokens; - std::vector > unspentOutputs; - - cp = CCinit(&C,EVAL_GATEWAYS); - cpTokens = CCinit(&CTokens,EVAL_TOKENS); - if ( txfee == 0 ) - txfee = 10000; - mypk = pk.IsValid()?pk:pubkey2pk(Mypubkey()); - gatewayspk = GetUnspendable(cp, 0); - if ( myGetTransaction(bindtxid,tx,hashBlock) == 0 || (numvouts= tx.vout.size()) <= 0 ) - CCERR_RESULT("gatewayscc",CCLOG_INFO, stream << "cant find bindtxid " << bindtxid.GetHex()); - if ( DecodeGatewaysBindOpRet(depositaddr,tx.vout[numvouts-1].scriptPubKey,tokenid,coin,totalsupply,oracletxid,M,N,pubkeys,taddr,prefix,prefix2,wiftype) != 'B' || refcoin != coin ) - CCERR_RESULT("gatewayscc",CCLOG_INFO, stream << "invalid coin - bindtxid " << bindtxid.GetHex() << " coin." << coin); - if (hush_txnotarizedconfirmed(bindtxid)==false) - CCERR_RESULT("gatewayscc",CCLOG_INFO, stream << "gatewaysbind tx not yet confirmed/notarized"); - _GetCCaddress(coinaddr,EVAL_GATEWAYS,gatewayspk); - SetCCunspents(unspentOutputs,coinaddr,true); - for (std::vector >::const_iterator it=unspentOutputs.begin(); it!=unspentOutputs.end(); it++) - { - txid = it->first.txhash; - vout = (int32_t)it->first.index; - nValue = (int64_t)it->second.satoshis; - K=0; - if ( vout == 0 && nValue == CC_MARKER_VALUE && myGetTransaction(txid,tx,hashBlock) != 0 && (numvouts= tx.vout.size())>0 && - (funcid=DecodeGatewaysOpRet(tx.vout[numvouts-1].scriptPubKey))!=0 && (funcid=='W' || funcid=='P')) - { - if (funcid=='W' && DecodeGatewaysWithdrawOpRet(tx.vout[numvouts-1].scriptPubKey,tmptokenid,tmpbindtxid,coin,withdrawpub,tmpamount)=='W' - && refcoin==coin && tmptokenid==tokenid && tmpbindtxid==bindtxid) - CCERR_RESULT("gatewayscc",CCLOG_INFO, stream << "unable to create withdraw, another withdraw pending"); - else if (funcid=='P' && DecodeGatewaysPartialOpRet(tx.vout[numvouts-1].scriptPubKey,withdrawtxid,coin,K,signerpk,hex)=='P' && - myGetTransaction(withdrawtxid,tx,hashBlock)!=0 && (numvouts=tx.vout.size())>0 && DecodeGatewaysWithdrawOpRet(tx.vout[numvouts-1].scriptPubKey,tmptokenid,tmpbindtxid,coin,withdrawpub,tmpamount)=='W' - && refcoin==coin && tmptokenid==tokenid && tmpbindtxid==bindtxid) - CCERR_RESULT("gatewayscc",CCLOG_INFO, stream << "unable to create withdraw, another withdraw pending"); - } - } - if( AddNormalinputs(mtx, mypk, txfee+CC_MARKER_VALUE, 2,pk.IsValid()) > 0 ) - { - if ((inputs = AddTokenCCInputs(cpTokens, mtx, mypk, tokenid, amount, 60)) > 0) - { - if ( inputs > amount ) CCchange = (inputs - amount); - mtx.vout.push_back(MakeCC1vout(EVAL_GATEWAYS,CC_MARKER_VALUE,gatewayspk)); - mtx.vout.push_back(MakeTokensCC1vout(EVAL_GATEWAYS,amount,gatewayspk)); - if ( CCchange != 0 ) mtx.vout.push_back(MakeCC1vout(EVAL_TOKENS, CCchange, mypk)); - return(FinalizeCCTxExt(pk.IsValid(),0, cpTokens, mtx, mypk, txfee,EncodeGatewaysWithdrawOpRet('W',tokenid,bindtxid,refcoin,withdrawpub,amount))); - } - else - CCERR_RESULT("gatewayscc",CCLOG_INFO, stream << "not enough balance of tokens for withdraw"); - } - CCERR_RESULT("gatewayscc",CCLOG_INFO, stream << "cant find enough normal inputs"); -} - -UniValue GatewaysPartialSign(const CPubKey& pk, uint64_t txfee,uint256 lasttxid,std::string refcoin, std::string hex) -{ - CMutableTransaction mtx = CreateNewContextualCMutableTransaction(Params().GetConsensus(), hush_nextheight()); - CPubKey mypk,withdrawpub,signerpk,gatewayspk; struct CCcontract_info *cp,C; CTransaction tx,tmptx; - std::vector > unspentOutputs; char funcid,depositaddr[64]; - int32_t numvouts; uint256 withdrawtxid,hashBlock,bindtxid,tokenid,oracletxid,tmptokenid; std::string coin,tmphex; int64_t amount,totalsupply; - uint8_t K=0,M,N,taddr,prefix,prefix2,wiftype; std::vector pubkeys; - - cp = CCinit(&C,EVAL_GATEWAYS); - if ( txfee == 0 ) - txfee = 10000; - mypk = pk.IsValid()?pk:pubkey2pk(Mypubkey()); - gatewayspk = GetUnspendable(cp,0); - if (myGetTransaction(lasttxid,tx,hashBlock)==0 || (numvouts= tx.vout.size())<=0 - || (funcid=DecodeGatewaysOpRet(tx.vout[numvouts-1].scriptPubKey))==0 || (funcid!='W' && funcid!='P')) - CCERR_RESULT("gatewayscc",CCLOG_INFO, stream << "can't find last tx " << lasttxid.GetHex()); - if (funcid=='W') - { - withdrawtxid=lasttxid; - if (DecodeGatewaysWithdrawOpRet(tx.vout[numvouts-1].scriptPubKey,tmptokenid,bindtxid,coin,withdrawpub,amount)!='W' || refcoin!=coin) - CCERR_RESULT("gatewayscc",CCLOG_INFO, stream << "invalid withdraw tx " << lasttxid.GetHex()); - else if (hush_txnotarizedconfirmed(withdrawtxid)==false) - CCERR_RESULT("gatewayscc",CCLOG_INFO, stream << "gatewayswithdraw tx not yet confirmed/notarized"); - else if (myGetTransaction(bindtxid,tmptx,hashBlock)==0 || (numvouts=tmptx.vout.size())<=0) - CCERR_RESULT("gatewayscc",CCLOG_INFO, stream << "can't find bind tx " << bindtxid.GetHex()); - else if (DecodeGatewaysBindOpRet(depositaddr,tmptx.vout[numvouts-1].scriptPubKey,tokenid,coin,totalsupply,oracletxid,M,N,pubkeys,taddr,prefix,prefix2,wiftype) != 'B' - || refcoin!=coin || tokenid!=tmptokenid) - CCERR_RESULT("gatewayscc",CCLOG_INFO, stream << "invalid bind tx " << bindtxid.GetHex()); - } - else if (funcid=='P') - { - if (DecodeGatewaysPartialOpRet(tx.vout[numvouts-1].scriptPubKey,withdrawtxid,coin,K,signerpk,tmphex)!='P' || refcoin!=coin) - CCERR_RESULT("gatewayscc",CCLOG_INFO, stream << "cannot decode partialsign tx opret " << lasttxid.GetHex()); - else if (myGetTransaction(withdrawtxid,tmptx,hashBlock)==0 || (numvouts= tmptx.vout.size())<=0) - CCERR_RESULT("gatewayscc",CCLOG_INFO, stream << "can't find withdraw tx " << withdrawtxid.GetHex()); - else if (DecodeGatewaysWithdrawOpRet(tmptx.vout[numvouts-1].scriptPubKey,tmptokenid,bindtxid,coin,withdrawpub,amount)!='W' - || refcoin!=coin) - CCERR_RESULT("gatewayscc",CCLOG_INFO, stream << "invalid withdraw tx " << withdrawtxid.GetHex()); - else if (hush_txnotarizedconfirmed(withdrawtxid)==false) - CCERR_RESULT("gatewayscc",CCLOG_INFO, stream << "gatewayswithdraw tx not yet confirmed/notarized"); - else if (myGetTransaction(bindtxid,tmptx,hashBlock)==0 || (numvouts=tmptx.vout.size())<=0) - CCERR_RESULT("gatewayscc",CCLOG_INFO, stream << "can't find bind tx " << bindtxid.GetHex()); - else if (DecodeGatewaysBindOpRet(depositaddr,tmptx.vout[numvouts-1].scriptPubKey,tokenid,coin,totalsupply,oracletxid,M,N,pubkeys,taddr,prefix,prefix2,wiftype) != 'B' - || refcoin!=coin || tokenid!=tmptokenid) - CCERR_RESULT("gatewayscc",CCLOG_INFO, stream << "invalid bind tx " << bindtxid.GetHex()); - } - if (AddNormalinputs(mtx,mypk,txfee,1,pk.IsValid())!=0) - { - mtx.vin.push_back(CTxIn(tx.GetHash(),0,CScript())); - mtx.vout.push_back(MakeCC1vout(EVAL_GATEWAYS,CC_MARKER_VALUE,gatewayspk)); - return(FinalizeCCTxExt(pk.IsValid(),0,cp,mtx,mypk,txfee,EncodeGatewaysPartialOpRet('P',withdrawtxid,refcoin,K+1,mypk,hex))); - } - CCERR_RESULT("gatewayscc",CCLOG_INFO, stream << "error adding funds for partialsign"); -} - -UniValue GatewaysCompleteSigning(const CPubKey& pk, uint64_t txfee,uint256 lasttxid,std::string refcoin,std::string hex) -{ - CMutableTransaction mtx = CreateNewContextualCMutableTransaction(Params().GetConsensus(), hush_nextheight()); - CPubKey mypk,gatewayspk,signerpk,withdrawpub; struct CCcontract_info *cp,C; char funcid,depositaddr[64]; int64_t amount,totalsupply; - std::string coin,tmphex; CTransaction tx,tmptx; uint256 withdrawtxid,hashBlock,tokenid,tmptokenid,bindtxid,oracletxid; int32_t numvouts; - uint8_t K=0,M,N,taddr,prefix,prefix2,wiftype; std::vector pubkeys; - - cp = CCinit(&C,EVAL_GATEWAYS); - mypk = pk.IsValid()?pk:pubkey2pk(Mypubkey()); - gatewayspk = GetUnspendable(cp,0); - if ( txfee == 0 ) - txfee = 10000; - if (myGetTransaction(lasttxid,tx,hashBlock)==0 || (numvouts= tx.vout.size())<=0 - || (funcid=DecodeGatewaysOpRet(tx.vout[numvouts-1].scriptPubKey))==0 || (funcid!='W' && funcid!='P')) - CCERR_RESULT("gatewayscc",CCLOG_INFO, stream << "invalid last txid " << lasttxid.GetHex()); - if (funcid=='W') - { - withdrawtxid=lasttxid; - if (DecodeGatewaysWithdrawOpRet(tx.vout[numvouts-1].scriptPubKey,tmptokenid,bindtxid,coin,withdrawpub,amount)!='W' || refcoin!=coin) - CCERR_RESULT("gatewayscc",CCLOG_INFO, stream << "invalid withdraw tx " << lasttxid.GetHex()); - else if (hush_txnotarizedconfirmed(withdrawtxid)==false) - CCERR_RESULT("gatewayscc",CCLOG_INFO, stream << "gatewayswithdraw tx not yet confirmed/notarized"); - else if (myGetTransaction(bindtxid,tmptx,hashBlock)==0 || (numvouts=tmptx.vout.size())<=0) - CCERR_RESULT("gatewayscc",CCLOG_INFO, stream << "can't find bind tx " << bindtxid.GetHex()); - else if (DecodeGatewaysBindOpRet(depositaddr,tmptx.vout[numvouts-1].scriptPubKey,tokenid,coin,totalsupply,oracletxid,M,N,pubkeys,taddr,prefix,prefix2,wiftype) != 'B' - || refcoin!=coin || tokenid!=tmptokenid) - CCERR_RESULT("gatewayscc",CCLOG_INFO, stream << "invalid bind tx " << bindtxid.GetHex()); - } - else if (funcid=='P') - { - if (DecodeGatewaysPartialOpRet(tx.vout[numvouts-1].scriptPubKey,withdrawtxid,coin,K,signerpk,tmphex)!='P' || refcoin!=coin) - CCERR_RESULT("gatewayscc",CCLOG_INFO, stream << "cannot decode partialsign tx opret " << lasttxid.GetHex()); - else if (myGetTransaction(withdrawtxid,tmptx,hashBlock)==0 || (numvouts= tmptx.vout.size())<=0) - CCERR_RESULT("gatewayscc",CCLOG_INFO, stream << "can't find withdraw tx " << withdrawtxid.GetHex()); - else if (DecodeGatewaysWithdrawOpRet(tmptx.vout[numvouts-1].scriptPubKey,tmptokenid,bindtxid,coin,withdrawpub,amount)!='W' - || refcoin!=coin) - CCERR_RESULT("gatewayscc",CCLOG_INFO, stream << "invalid withdraw tx " << withdrawtxid.GetHex()); - else if (hush_txnotarizedconfirmed(withdrawtxid)==false) - CCERR_RESULT("gatewayscc",CCLOG_INFO, stream << "gatewayswithdraw tx not yet confirmed/notarized"); - else if (myGetTransaction(bindtxid,tmptx,hashBlock)==0 || (numvouts=tmptx.vout.size())<=0) - CCERR_RESULT("gatewayscc",CCLOG_INFO, stream << "can't find bind tx " << bindtxid.GetHex()); - else if (DecodeGatewaysBindOpRet(depositaddr,tmptx.vout[numvouts-1].scriptPubKey,tokenid,coin,totalsupply,oracletxid,M,N,pubkeys,taddr,prefix,prefix2,wiftype) != 'B' - || refcoin!=coin || tokenid!=tmptokenid) - CCERR_RESULT("gatewayscc",CCLOG_INFO, stream << "invalid bind tx " << bindtxid.GetHex()); - } - if (AddNormalinputs(mtx,mypk,txfee,1,pk.IsValid())!=0) - { - mtx.vin.push_back(CTxIn(lasttxid,0,CScript())); - mtx.vout.push_back(MakeCC1vout(EVAL_GATEWAYS,CC_MARKER_VALUE,gatewayspk)); - return(FinalizeCCTxExt(pk.IsValid(),0,cp,mtx,mypk,txfee,EncodeGatewaysCompleteSigningOpRet('S',withdrawtxid,refcoin,K+1,hex))); - } - CCERR_RESULT("gatewayscc",CCLOG_INFO, stream << "error adding funds for completesigning"); -} - -UniValue GatewaysMarkDone(const CPubKey& pk, uint64_t txfee,uint256 completetxid,std::string refcoin) -{ - CMutableTransaction mtx = CreateNewContextualCMutableTransaction(Params().GetConsensus(), hush_nextheight()); - CPubKey mypk; struct CCcontract_info *cp,C; char depositaddr[64]; CTransaction tx; int32_t numvouts; - uint256 withdrawtxid,bindtxid,oracletxid,tokenid,tmptokenid,hashBlock; std::string coin,hex; - uint8_t K,M,N,taddr,prefix,prefix2,wiftype; std::vector pubkeys; int64_t amount,totalsupply; CPubKey withdrawpub; - - cp = CCinit(&C,EVAL_GATEWAYS); - mypk = pk.IsValid()?pk:pubkey2pk(Mypubkey()); - if ( txfee == 0 ) - txfee = 10000; - if (myGetTransaction(completetxid,tx,hashBlock)==0 || (numvouts= tx.vout.size())<=0) - CCERR_RESULT("gatewayscc",CCLOG_INFO, stream << "invalid completesigning txid " << completetxid.GetHex()); - else if (DecodeGatewaysCompleteSigningOpRet(tx.vout[numvouts-1].scriptPubKey,withdrawtxid,coin,K,hex)!='S' || refcoin!=coin) - CCERR_RESULT("gatewayscc",CCLOG_INFO, stream << "cannot decode completesigning tx opret " << completetxid.GetHex()); - if (hush_txnotarizedconfirmed(completetxid)==false) - CCERR_RESULT("gatewayscc",CCLOG_INFO, stream << "gatewayscompletesigning tx not yet confirmed/notarized"); - else if (myGetTransaction(withdrawtxid,tx,hashBlock)==0 || (numvouts= tx.vout.size())==0) - CCERR_RESULT("gatewayscc",CCLOG_INFO, stream << "invalid withdraw txid " << withdrawtxid.GetHex()); - else if (DecodeGatewaysWithdrawOpRet(tx.vout[numvouts-1].scriptPubKey,tmptokenid,bindtxid,coin,withdrawpub,amount)!='W' || refcoin!=coin) - CCERR_RESULT("gatewayscc",CCLOG_INFO, stream << "cannot decode withdraw tx opret " << withdrawtxid.GetHex()); - else if (myGetTransaction(bindtxid,tx,hashBlock)==0 || (numvouts=tx.vout.size())<=0) - CCERR_RESULT("gatewayscc",CCLOG_INFO, stream << "can't find bind tx " << bindtxid.GetHex()); - else if (DecodeGatewaysBindOpRet(depositaddr,tx.vout[numvouts-1].scriptPubKey,tokenid,coin,totalsupply,oracletxid,M,N,pubkeys,taddr,prefix,prefix2,wiftype) != 'B' - || refcoin!=coin || tokenid!=tmptokenid) - CCERR_RESULT("gatewayscc",CCLOG_INFO, stream << "invalid bind tx " << bindtxid.GetHex()); - if (AddNormalinputs(mtx,mypk,txfee,1,pk.IsValid())!=0) - { - mtx.vin.push_back(CTxIn(completetxid,0,CScript())); - mtx.vout.push_back(CTxOut(CC_MARKER_VALUE,CScript() << ParseHex(HexStr(mypk)) << OP_CHECKSIG)); - return(FinalizeCCTxExt(pk.IsValid(),0,cp,mtx,mypk,txfee,EncodeGatewaysMarkDoneOpRet('M',withdrawtxid,refcoin,completetxid))); - } - CCERR_RESULT("gatewayscc",CCLOG_INFO, stream << "error adding funds for markdone"); -} - -UniValue GatewaysPendingDeposits(const CPubKey& pk, uint256 bindtxid,std::string refcoin) -{ - UniValue result(UniValue::VOBJ),pending(UniValue::VARR); CTransaction tx; std::string coin,hex,pub; - CPubKey mypk,gatewayspk,destpub; std::vector pubkeys,publishers; std::vector txids; - uint256 tmpbindtxid,hashBlock,txid,tokenid,oracletxid,cointxid; uint8_t M,N,taddr,prefix,prefix2,wiftype; - char depositaddr[65],coinaddr[65],str[65],destaddr[65],txidaddr[65]; std::vector proof; - int32_t numvouts,vout,claimvout,height; int64_t totalsupply,nValue,amount; struct CCcontract_info *cp,C; - std::vector > unspentOutputs; - - cp = CCinit(&C,EVAL_GATEWAYS); - mypk = pk.IsValid()?pk:pubkey2pk(Mypubkey()); - gatewayspk = GetUnspendable(cp,0); - _GetCCaddress(coinaddr,EVAL_GATEWAYS,mypk); - if ( myGetTransaction(bindtxid,tx,hashBlock) == 0 || (numvouts= tx.vout.size()) <= 0 ) - { - result.push_back(Pair("result","error")); - result.push_back(Pair("error",strprintf("cant find bindtxid %s",uint256_str(str,bindtxid)))); - return(result); - } - if ( DecodeGatewaysBindOpRet(depositaddr,tx.vout[numvouts-1].scriptPubKey,tokenid,coin,totalsupply,oracletxid,M,N,pubkeys,taddr,prefix,prefix2,wiftype) != 'B' || refcoin != coin) - { - result.push_back(Pair("result","error")); - result.push_back(Pair("error",strprintf("invalid bindtxid %s coin.%s",uint256_str(str,bindtxid),coin.c_str()))); - return(result); - } - SetCCunspents(unspentOutputs,coinaddr,true); - for (std::vector >::const_iterator it=unspentOutputs.begin(); it!=unspentOutputs.end(); it++) - { - txid = it->first.txhash; - vout = (int32_t)it->first.index; - nValue = (int64_t)it->second.satoshis; - if ( vout == 0 && nValue == CC_MARKER_VALUE && myGetTransaction(txid,tx,hashBlock) != 0 && (numvouts=tx.vout.size())>0 && - DecodeGatewaysDepositOpRet(tx.vout[numvouts-1].scriptPubKey,tmpbindtxid,coin,publishers,txids,height,cointxid,claimvout,hex,proof,destpub,amount) == 'D' - && tmpbindtxid==bindtxid && refcoin == coin && myIsutxo_spentinmempool(ignoretxid,ignorevin,txid,vout) == 0) - { - UniValue obj(UniValue::VOBJ); - obj.push_back(Pair("cointxid",uint256_str(str,cointxid))); - obj.push_back(Pair("deposittxid",uint256_str(str,txid))); - CCtxidaddr(txidaddr,txid); - obj.push_back(Pair("deposittxidaddr",txidaddr)); - _GetCCaddress(destaddr,EVAL_TOKENS,destpub); - obj.push_back(Pair("depositaddr",depositaddr)); - obj.push_back(Pair("tokens_destination_address",destaddr)); - pub=HexStr(destpub); - obj.push_back(Pair("claim_pubkey",pub)); - obj.push_back(Pair("amount",(double)amount/COIN)); - obj.push_back(Pair("confirmed_or_notarized",hush_txnotarizedconfirmed(txid))); - pending.push_back(obj); - } - } - result.push_back(Pair("coin",refcoin)); - result.push_back(Pair("pending",pending)); - return(result); -} - -UniValue GatewaysPendingWithdraws(const CPubKey& pk, uint256 bindtxid,std::string refcoin) -{ - UniValue result(UniValue::VOBJ),pending(UniValue::VARR); CTransaction tx; std::string coin,hex; CPubKey mypk,gatewayspk,withdrawpub,signerpk; - std::vector msigpubkeys; uint256 hashBlock,tokenid,txid,tmpbindtxid,tmptokenid,oracletxid,withdrawtxid; uint8_t K,M,N,taddr,prefix,prefix2,wiftype; - char funcid,depositaddr[65],coinaddr[65],tokensaddr[65],destaddr[65],str[65],withaddr[65],numstr[32],signeraddr[65],txidaddr[65]; - int32_t i,n,numvouts,vout,queueflag; int64_t totalsupply,amount,nValue; struct CCcontract_info *cp,C; - std::vector > unspentOutputs; - - cp = CCinit(&C,EVAL_GATEWAYS); - mypk = pk.IsValid()?pk:pubkey2pk(Mypubkey()); - gatewayspk = GetUnspendable(cp,0); - _GetCCaddress(coinaddr,EVAL_GATEWAYS,gatewayspk); - GetTokensCCaddress(cp,tokensaddr,gatewayspk); - if ( myGetTransaction(bindtxid,tx,hashBlock) == 0 || (numvouts= tx.vout.size()) <= 0 ) - { - result.push_back(Pair("result","error")); - result.push_back(Pair("error",strprintf("cant find bindtxid %s",uint256_str(str,bindtxid)))); - return(result); - } - if ( DecodeGatewaysBindOpRet(depositaddr,tx.vout[numvouts-1].scriptPubKey,tokenid,coin,totalsupply,oracletxid,M,N,msigpubkeys,taddr,prefix,prefix2,wiftype) != 'B' || refcoin != coin ) - { - result.push_back(Pair("result","error")); - result.push_back(Pair("error",strprintf("invalid bindtxid %s coin.%s",uint256_str(str,bindtxid),coin.c_str()))); - return(result); - } - n = msigpubkeys.size(); - queueflag = 0; - for (i=0; i >::const_iterator it=unspentOutputs.begin(); it!=unspentOutputs.end(); it++) - { - txid = it->first.txhash; - vout = (int32_t)it->first.index; - nValue = (int64_t)it->second.satoshis; - K=0; - if ( vout == 0 && nValue == CC_MARKER_VALUE && myGetTransaction(txid,tx,hashBlock) != 0 && (numvouts= tx.vout.size())>0 && - (funcid=DecodeGatewaysOpRet(tx.vout[numvouts-1].scriptPubKey))!=0 && (funcid=='W' || funcid=='P') && myIsutxo_spentinmempool(ignoretxid,ignorevin,txid,vout) == 0) - { - if (funcid=='W') - { - if (DecodeGatewaysWithdrawOpRet(tx.vout[numvouts-1].scriptPubKey,tmptokenid,tmpbindtxid,coin,withdrawpub,amount)==0 || refcoin!=coin || tmptokenid!=tokenid || tmpbindtxid!=bindtxid) continue; - } - else if (funcid=='P') - { - if (DecodeGatewaysPartialOpRet(tx.vout[numvouts-1].scriptPubKey,withdrawtxid,coin,K,signerpk,hex)!='P' || myGetTransaction(withdrawtxid,tx,hashBlock)==0 - || (numvouts=tx.vout.size())<=0 || DecodeGatewaysWithdrawOpRet(tx.vout[numvouts-1].scriptPubKey,tmptokenid,tmpbindtxid,coin,withdrawpub,amount)!='W' - || refcoin!=coin || tmptokenid!=tokenid || tmpbindtxid!=bindtxid) - continue; - } - Getscriptaddress(destaddr,tx.vout[1].scriptPubKey); - GetCustomscriptaddress(withaddr,CScript() << ParseHex(HexStr(withdrawpub)) << OP_CHECKSIG,taddr,prefix,prefix2); - if ( strcmp(destaddr,tokensaddr) == 0 ) - { - UniValue obj(UniValue::VOBJ); - obj.push_back(Pair("withdrawtxid",uint256_str(str,tx.GetHash()))); - CCCustomtxidaddr(txidaddr,tx.GetHash(),taddr,prefix,prefix2); - obj.push_back(Pair("withdrawtxidaddr",txidaddr)); - obj.push_back(Pair("withdrawaddr",withaddr)); - sprintf(numstr,"%.8f",(double)tx.vout[1].nValue/COIN); - obj.push_back(Pair("amount",numstr)); - obj.push_back(Pair("confirmed_or_notarized",hush_txnotarizedconfirmed(tx.GetHash()))); - if ( queueflag != 0 ) - { - obj.push_back(Pair("depositaddr",depositaddr)); - GetCustomscriptaddress(signeraddr,CScript() << ParseHex(HexStr(mypk)) << OP_CHECKSIG,taddr,prefix,prefix2); - obj.push_back(Pair("signeraddr",signeraddr)); - } - if (N>1) - { - obj.push_back(Pair("number_of_signs",K)); - obj.push_back(Pair("last_txid",uint256_str(str,txid))); - if (K>0) obj.push_back(Pair("hex",hex)); - } - pending.push_back(obj); - } - } - } - result.push_back(Pair("coin",refcoin)); - result.push_back(Pair("pending",pending)); - result.push_back(Pair("queueflag",queueflag)); - return(result); -} - -UniValue GatewaysProcessedWithdraws(const CPubKey& pk, uint256 bindtxid,std::string refcoin) -{ - UniValue result(UniValue::VOBJ),processed(UniValue::VARR); CTransaction tx; std::string coin,hex; - CPubKey mypk,gatewayspk,withdrawpub; std::vector msigpubkeys; - uint256 withdrawtxid,hashBlock,txid,tokenid,tmptokenid,oracletxid; uint8_t K,M,N,taddr,prefix,prefix2,wiftype; - char depositaddr[65],coinaddr[65],str[65],numstr[32],withaddr[65],txidaddr[65]; - int32_t i,n,numvouts,vout,queueflag; int64_t totalsupply,nValue,amount; struct CCcontract_info *cp,C; - std::vector > unspentOutputs; - - cp = CCinit(&C,EVAL_GATEWAYS); - mypk = pk.IsValid()?pk:pubkey2pk(Mypubkey()); - gatewayspk = GetUnspendable(cp,0); - _GetCCaddress(coinaddr,EVAL_GATEWAYS,gatewayspk); - if ( myGetTransaction(bindtxid,tx,hashBlock) == 0 || (numvouts= tx.vout.size()) <= 0 ) - { - result.push_back(Pair("result","error")); - result.push_back(Pair("error",strprintf("cant find bindtxid %s",uint256_str(str,bindtxid)))); - return(result); - } - if ( DecodeGatewaysBindOpRet(depositaddr,tx.vout[numvouts-1].scriptPubKey,tokenid,coin,totalsupply,oracletxid,M,N,msigpubkeys,taddr,prefix,prefix2,wiftype) != 'B' || refcoin != coin) - { - result.push_back(Pair("result","error")); - result.push_back(Pair("error",strprintf("invalid bindtxid %s coin.%s",uint256_str(str,bindtxid),coin.c_str()))); - return(result); - } - n = msigpubkeys.size(); - queueflag = 0; - for (i=0; i >::const_iterator it=unspentOutputs.begin(); it!=unspentOutputs.end(); it++) - { - txid = it->first.txhash; - vout = (int32_t)it->first.index; - nValue = (int64_t)it->second.satoshis; - if ( vout == 0 && nValue == CC_MARKER_VALUE && myGetTransaction(txid,tx,hashBlock) != 0 && (numvouts= tx.vout.size())>0 && - DecodeGatewaysCompleteSigningOpRet(tx.vout[numvouts-1].scriptPubKey,withdrawtxid,coin,K,hex) == 'S' && refcoin == coin && myIsutxo_spentinmempool(ignoretxid,ignorevin,txid,vout) == 0) - { - if (myGetTransaction(withdrawtxid,tx,hashBlock) != 0 && (numvouts= tx.vout.size())>0 - && DecodeGatewaysWithdrawOpRet(tx.vout[numvouts-1].scriptPubKey,tmptokenid,bindtxid,coin,withdrawpub,amount) == 'W' || refcoin!=coin || tmptokenid!=tokenid) - { - UniValue obj(UniValue::VOBJ); - obj.push_back(Pair("completesigningtxid",uint256_str(str,txid))); - obj.push_back(Pair("withdrawtxid",uint256_str(str,withdrawtxid))); - CCCustomtxidaddr(txidaddr,withdrawtxid,taddr,prefix,prefix2); - obj.push_back(Pair("withdrawtxidaddr",txidaddr)); - GetCustomscriptaddress(withaddr,CScript() << ParseHex(HexStr(withdrawpub)) << OP_CHECKSIG,taddr,prefix,prefix2); - obj.push_back(Pair("withdrawaddr",withaddr)); - obj.push_back(Pair("confirmed_or_notarized",hush_txnotarizedconfirmed(txid))); - sprintf(numstr,"%.8f",(double)tx.vout[1].nValue/COIN); - obj.push_back(Pair("amount",numstr)); - obj.push_back(Pair("hex",hex)); - processed.push_back(obj); - } - } - } - result.push_back(Pair("coin",refcoin)); - result.push_back(Pair("processed",processed)); - result.push_back(Pair("queueflag",queueflag)); - return(result); -} - -UniValue GatewaysList() -{ - UniValue result(UniValue::VARR); std::vector txids; struct CCcontract_info *cp,C; uint256 txid,hashBlock,oracletxid,tokenid; CTransaction vintx; std::string coin; int64_t totalsupply; char str[65],depositaddr[64]; uint8_t M,N,taddr,prefix,prefix2,wiftype; std::vector pubkeys; - cp = CCinit(&C,EVAL_GATEWAYS); - SetCCtxids(txids,cp->unspendableCCaddr,true,EVAL_GATEWAYS,zeroid,'B'); - for (std::vector::const_iterator it=txids.begin(); it!=txids.end(); it++) - { - txid = *it; - if ( myGetTransaction(txid,vintx,hashBlock) != 0 ) - { - if ( vintx.vout.size() > 0 && DecodeGatewaysBindOpRet(depositaddr,vintx.vout[vintx.vout.size()-1].scriptPubKey,tokenid,coin,totalsupply,oracletxid,M,N,pubkeys,taddr,prefix,prefix2,wiftype) != 0 ) - { - result.push_back(uint256_str(str,txid)); - } - } - } - return(result); -} - -UniValue GatewaysExternalAddress(uint256 bindtxid,CPubKey pubkey) -{ - UniValue result(UniValue::VOBJ); struct CCcontract_info *cp,C; uint256 txid,hashBlock,oracletxid,tokenid; CTransaction tx; - std::string coin; int64_t numvouts,totalsupply; char str[65],addr[65],depositaddr[65]; uint8_t M,N,taddr,prefix,prefix2,wiftype; std::vector msigpubkeys; - - cp = CCinit(&C,EVAL_GATEWAYS); - if ( myGetTransaction(bindtxid,tx,hashBlock) == 0 || (numvouts= tx.vout.size()) <= 0 ) - { - result.push_back(Pair("result","error")); - result.push_back(Pair("error",strprintf("cant find bindtxid %s",uint256_str(str,bindtxid)))); - return(result); - } - if ( DecodeGatewaysBindOpRet(depositaddr,tx.vout[numvouts-1].scriptPubKey,tokenid,coin,totalsupply,oracletxid,M,N,msigpubkeys,taddr,prefix,prefix2,wiftype) != 'B') - { - result.push_back(Pair("result","error")); - result.push_back(Pair("error",strprintf("invalid bindtxid %s coin.%s",uint256_str(str,bindtxid),coin.c_str()))); - return(result); - } - GetCustomscriptaddress(addr,CScript() << ParseHex(HexStr(pubkey)) << OP_CHECKSIG,taddr,prefix,prefix2); - result.push_back(Pair("result","success")); - result.push_back(Pair("address",addr)); - return(result); -} - -UniValue GatewaysDumpPrivKey(uint256 bindtxid,CKey key) -{ - UniValue result(UniValue::VOBJ); struct CCcontract_info *cp,C; uint256 txid,hashBlock,oracletxid,tokenid; CTransaction tx; - std::string coin,priv; int64_t numvouts,totalsupply; char str[65],addr[65],depositaddr[65]; uint8_t M,N,taddr,prefix,prefix2,wiftype; std::vector msigpubkeys; - - cp = CCinit(&C,EVAL_GATEWAYS); - if ( myGetTransaction(bindtxid,tx,hashBlock) == 0 || (numvouts= tx.vout.size()) <= 0 ) - { - result.push_back(Pair("result","error")); - result.push_back(Pair("error",strprintf("cant find bindtxid %s",uint256_str(str,bindtxid)))); - return(result); - } - if ( DecodeGatewaysBindOpRet(depositaddr,tx.vout[numvouts-1].scriptPubKey,tokenid,coin,totalsupply,oracletxid,M,N,msigpubkeys,taddr,prefix,prefix2,wiftype) != 'B') - { - result.push_back(Pair("result","error")); - result.push_back(Pair("error",strprintf("invalid bindtxid %s coin.%s",uint256_str(str,bindtxid),coin.c_str()))); - return(result); - } - - priv=EncodeCustomSecret(key,wiftype); - result.push_back(Pair("result","success")); - result.push_back(Pair("privkey",priv.c_str())); - return(result); -} - -UniValue GatewaysInfo(uint256 bindtxid) -{ - CMutableTransaction mtx = CreateNewContextualCMutableTransaction(Params().GetConsensus(), hush_nextheight()); - UniValue result(UniValue::VOBJ),a(UniValue::VARR); std::string coin; char str[67],numstr[65],depositaddr[64],gatewaystokens[64]; - uint8_t M,N; std::vector pubkeys; uint8_t taddr,prefix,prefix2,wiftype; uint256 tokenid,oracletxid,hashBlock; CTransaction tx; - CPubKey Gatewayspk; struct CCcontract_info *cp,C; int32_t i; int64_t numvouts,totalsupply,remaining; std::vector msigpubkeys; - - cp = CCinit(&C,EVAL_GATEWAYS); - Gatewayspk = GetUnspendable(cp,0); - GetTokensCCaddress(cp,gatewaystokens,Gatewayspk); - if ( myGetTransaction(bindtxid,tx,hashBlock) == 0 || (numvouts= tx.vout.size()) <= 0 ) - { - result.push_back(Pair("result","error")); - result.push_back(Pair("error",strprintf("cant find bindtxid %s",uint256_str(str,bindtxid)))); - return(result); - } - if ( DecodeGatewaysBindOpRet(depositaddr,tx.vout[numvouts-1].scriptPubKey,tokenid,coin,totalsupply,oracletxid,M,N,msigpubkeys,taddr,prefix,prefix2,wiftype) != 'B') - { - result.push_back(Pair("result","error")); - result.push_back(Pair("error",strprintf("invalid bindtxid %s coin.%s",uint256_str(str,bindtxid),coin.c_str()))); - return(result); - } - if ( myGetTransaction(bindtxid,tx,hashBlock) != 0 ) - { - result.push_back(Pair("result","success")); - result.push_back(Pair("name","Gateways")); - depositaddr[0] = 0; - if ( tx.vout.size() > 0 && DecodeGatewaysBindOpRet(depositaddr,tx.vout[tx.vout.size()-1].scriptPubKey,tokenid,coin,totalsupply,oracletxid,M,N,pubkeys,taddr,prefix,prefix2,wiftype) != 0 && M <= N && N > 0 ) - { - result.push_back(Pair("M",M)); - result.push_back(Pair("N",N)); - for (i=0; i Date: Thu, 11 Jan 2024 22:30:50 -0500 Subject: [PATCH 024/108] remove dice, channels, lotto --- src/Makefile.am | 3 - src/cc/CCchannels.h | 35 - src/cc/CCcustom.cpp | 15 +- src/cc/CCdice.h | 38 - src/cc/CClotto.h | 34 - src/cc/channels.cpp | 807 ---------------- src/cc/dice.cpp | 1871 -------------------------------------- src/cc/lotto.cpp | 344 ------- src/rpc/server.cpp | 22 - src/rpc/server.h | 9 - src/wallet/rpcwallet.cpp | 352 ------- 11 files changed, 6 insertions(+), 3524 deletions(-) delete mode 100644 src/cc/CCchannels.h delete mode 100644 src/cc/CCdice.h delete mode 100644 src/cc/CClotto.h delete mode 100644 src/cc/channels.cpp delete mode 100644 src/cc/dice.cpp delete mode 100644 src/cc/lotto.cpp diff --git a/src/Makefile.am b/src/Makefile.am index f99589472..d376665a5 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -282,13 +282,10 @@ libbitcoin_server_a_SOURCES = \ cc/assets.cpp \ cc/faucet.cpp \ cc/rewards.cpp \ - cc/dice.cpp \ - cc/lotto.cpp \ cc/fsm.cpp \ cc/heir.cpp \ cc/oracles.cpp \ cc/payments.cpp \ - cc/channels.cpp \ cc/auction.cpp \ cc/betprotocol.cpp \ chain.cpp \ diff --git a/src/cc/CCchannels.h b/src/cc/CCchannels.h deleted file mode 100644 index e1fca87e8..000000000 --- a/src/cc/CCchannels.h +++ /dev/null @@ -1,35 +0,0 @@ -// Copyright (c) 2016-2023 The Hush developers -// Distributed under the GPLv3 software license, see the accompanying -// file COPYING or https://www.gnu.org/licenses/gpl-3.0.en.html -/****************************************************************************** - * Copyright © 2014-2019 The SuperNET Developers. * - * * - * See the AUTHORS, DEVELOPER-AGREEMENT and LICENSE files at * - * the top-level directory of this distribution for the individual copyright * - * holder information and the developer policies on copyright and licensing. * - * * - * Unless otherwise agreed in a custom licensing agreement, no part of the * - * SuperNET software, including this file may be copied, modified, propagated * - * or distributed except according to the terms contained in the LICENSE file * - * * - * Removal or modification of this copyright notice is prohibited. * - * * - ******************************************************************************/ - - -#ifndef CC_CHANNELS_H -#define CC_CHANNELS_H - -#include "CCinclude.h" -#define CHANNELS_MAXPAYMENTS 1000 - -bool ChannelsValidate(struct CCcontract_info *cp,Eval* eval,const CTransaction &tx, uint32_t nIn); -UniValue ChannelOpen(const CPubKey& pk,uint64_t txfee,CPubKey destpub,int32_t numpayments,int64_t payment,uint256 tokenid); -UniValue ChannelPayment(const CPubKey& pk,uint64_t txfee,uint256 opentxid,int64_t amount, uint256 secret); -UniValue ChannelClose(const CPubKey& pk,uint64_t txfee,uint256 opentxid); -UniValue ChannelRefund(const CPubKey& pk,uint64_t txfee,uint256 opentxid,uint256 closetxid); -UniValue ChannelsList(const CPubKey& pk); -// CCcustom -UniValue ChannelsInfo(const CPubKey& pk,uint256 opentxid); - -#endif diff --git a/src/cc/CCcustom.cpp b/src/cc/CCcustom.cpp index f23d9e6ae..be3dccd17 100644 --- a/src/cc/CCcustom.cpp +++ b/src/cc/CCcustom.cpp @@ -21,12 +21,9 @@ #include "CCassets.h" #include "CCfaucet.h" #include "CCrewards.h" -#include "CCdice.h" #include "CCauction.h" -#include "CClotto.h" #include "CCfsm.h" #include "CCHeir.h" -#include "CCchannels.h" #include "CCOracles.h" #include "CCPrices.h" #include "CCPegs.h" @@ -325,16 +322,16 @@ struct CCcontract_info *CCinit(struct CCcontract_info *cp, uint8_t evalcode) strcpy(cp->normaladdr,DiceNormaladdr); strcpy(cp->CChexstr,DiceCChexstr); memcpy(cp->CCpriv,DiceCCpriv,32); - cp->validate = DiceValidate; - cp->ismyvin = IsDiceInput; + //cp->validate = DiceValidate; + //cp->ismyvin = IsDiceInput; break; case EVAL_LOTTO: strcpy(cp->unspendableCCaddr,LottoCCaddr); strcpy(cp->normaladdr,LottoNormaladdr); strcpy(cp->CChexstr,LottoCChexstr); memcpy(cp->CCpriv,LottoCCpriv,32); - cp->validate = LottoValidate; - cp->ismyvin = IsLottoInput; + //cp->validate = LottoValidate; + //cp->ismyvin = IsLottoInput; break; case EVAL_FSM: strcpy(cp->unspendableCCaddr,FSMCCaddr); @@ -365,8 +362,8 @@ struct CCcontract_info *CCinit(struct CCcontract_info *cp, uint8_t evalcode) strcpy(cp->normaladdr,ChannelsNormaladdr); strcpy(cp->CChexstr,ChannelsCChexstr); memcpy(cp->CCpriv,ChannelsCCpriv,32); - cp->validate = ChannelsValidate; - cp->ismyvin = IsChannelsInput; + //cp->validate = ChannelsValidate; + //cp->ismyvin = IsChannelsInput; break; case EVAL_ORACLES: strcpy(cp->unspendableCCaddr,OraclesCCaddr); diff --git a/src/cc/CCdice.h b/src/cc/CCdice.h deleted file mode 100644 index b1401ad2a..000000000 --- a/src/cc/CCdice.h +++ /dev/null @@ -1,38 +0,0 @@ -// Copyright (c) 2016-2023 The Hush developers -// Distributed under the GPLv3 software license, see the accompanying -// file COPYING or https://www.gnu.org/licenses/gpl-3.0.en.html -/****************************************************************************** - * Copyright © 2014-2019 The SuperNET Developers. * - * * - * See the AUTHORS, DEVELOPER-AGREEMENT and LICENSE files at * - * the top-level directory of this distribution for the individual copyright * - * holder information and the developer policies on copyright and licensing. * - * * - * Unless otherwise agreed in a custom licensing agreement, no part of the * - * SuperNET software, including this file may be copied, modified, propagated * - * or distributed except according to the terms contained in the LICENSE file * - * * - * Removal or modification of this copyright notice is prohibited. * - * * - ******************************************************************************/ - - -#ifndef CC_DICE_H -#define CC_DICE_H - -#include "CCinclude.h" - -#define EVAL_DICE 0xe6 - -bool DiceValidate(struct CCcontract_info *cp,Eval* eval,const CTransaction &tx, uint32_t nIn); - -std::string DiceBet(uint64_t txfee,char *planstr,uint256 fundingtxid,int64_t bet,int32_t odds); -std::string DiceBetFinish(uint8_t &funcid,uint256 &entropyused,int32_t &entropyvout,int32_t *resultp,uint64_t txfee,char *planstr,uint256 fundingtxid,uint256 bettxid,int32_t winlosetimeout,uint256 vin0txid,int32_t vin0vout); -double DiceStatus(uint64_t txfee,char *planstr,uint256 fundingtxid,uint256 bettxid); -std::string DiceCreateFunding(uint64_t txfee,char *planstr,int64_t funds,int64_t minbet,int64_t maxbet,int64_t maxodds,int64_t timeoutblocks); -std::string DiceAddfunding(uint64_t txfee,char *planstr,uint256 fundingtxid,int64_t amount); -UniValue DiceInfo(uint256 diceid); -UniValue DiceList(); -int64_t DicePlanFunds(uint64_t &entropyval,uint256 &entropytxid,uint64_t refsbits,struct CCcontract_info *cp,CPubKey dicepk,uint256 reffundingtxid, int32_t &entropytxs,bool random); - -#endif diff --git a/src/cc/CClotto.h b/src/cc/CClotto.h deleted file mode 100644 index ad9c7131a..000000000 --- a/src/cc/CClotto.h +++ /dev/null @@ -1,34 +0,0 @@ -// Copyright (c) 2016-2023 The Hush developers -// Distributed under the GPLv3 software license, see the accompanying -// file COPYING or https://www.gnu.org/licenses/gpl-3.0.en.html -/****************************************************************************** - * Copyright © 2014-2019 The SuperNET Developers. * - * * - * See the AUTHORS, DEVELOPER-AGREEMENT and LICENSE files at * - * the top-level directory of this distribution for the individual copyright * - * holder information and the developer policies on copyright and licensing. * - * * - * Unless otherwise agreed in a custom licensing agreement, no part of the * - * SuperNET software, including this file may be copied, modified, propagated * - * or distributed except according to the terms contained in the LICENSE file * - * * - * Removal or modification of this copyright notice is prohibited. * - * * - ******************************************************************************/ - - -#ifndef CC_LOTTO_H -#define CC_LOTTO_H - -#include "CCinclude.h" - -#define EVAL_LOTTO 0xe9 - -bool LottoValidate(struct CCcontract_info *cp,Eval* eval,const CTransaction &tx, uint32_t nIn); - -UniValue LottoInfo(uint256 lottoid); -UniValue LottoList(); -std::string LottoTicket(uint64_t txfee,int64_t numtickets); -std::string LottoWinner(uint64_t txfee); - -#endif diff --git a/src/cc/channels.cpp b/src/cc/channels.cpp deleted file mode 100644 index 498047196..000000000 --- a/src/cc/channels.cpp +++ /dev/null @@ -1,807 +0,0 @@ -// Copyright (c) 2016-2023 The Hush developers -// Distributed under the GPLv3 software license, see the accompanying -// file COPYING or https://www.gnu.org/licenses/gpl-3.0.en.html -/****************************************************************************** - * Copyright © 2014-2019 The SuperNET Developers. * - * * - * See the AUTHORS, DEVELOPER-AGREEMENT and LICENSE files at * - * the top-level directory of this distribution for the individual copyright * - * holder information and the developer policies on copyright and licensing. * - * * - * Unless otherwise agreed in a custom licensing agreement, no part of the * - * SuperNET software, including this file may be copied, modified, propagated * - * or distributed except according to the terms contained in the LICENSE file * - * * - * Removal or modification of this copyright notice is prohibited. * - * * - ******************************************************************************/ - -#include "CCchannels.h" - -/* - The idea here is to allow instant (mempool) payments that are secured by dPoW. In order to simplify things, channels CC will require creating reserves for each payee locked in the destination user's CC address. This will look like the payment is already made, but it is locked until further released. The dPoW protection comes from the cancel channel having a delayed effect until the next notarization. This way, if a payment release is made and the chain reorged, the same payment release will still be valid when it is re-broadcast into the mempool. - - In order to achieve this effect, the payment release needs to be in a special form where its input cannot be spent only by the sender. - - Given sender's payment to dest CC address, only the destination is able to spend, so we need to constrain that spending with a release mechanism. One idea is a 2of2 multisig, but that has the issue of needing confirmation and since a sender utxo is involved, subject to doublespend and we lose the speed. Another idea is release on secrets! since once revealed, the secret remains valid, this method is immune from double spend. Also, there is no worry about an MITM attack as the funds are only spendable by the destination pubkey and only with the secret. The secrets can be sent via any means, including OP_RETURN of normal transaction in the mempool. - - Now the only remaining issue for sending is how to allocate funds to the secrets. This needs to be sent as hashes of secrets when the channel is created. A bruteforce method would be one secret per COIN, but for large amount channels this is cumbersome. A more practical approach is to have a set of secrets for each order of magnitude: - - 123.45 channel funds -> 1x secret100, 2x secret10, 3x secret1, 4x secret.1, 5x secret.01 - 15 secrets achieves the 123.45 channel funding. - - In order to avoid networking issues, the convention can be to send tx to normal address of destination with just an OP_RETURN, for the cost of txfee. For micropayments, a separate method of secret release needs to be established, but that is beyond the scope of this CC. - - There is now the dPoW security that needs to be ensured. In order to close the channel, a tx needs to be confirmed that cancels the channel. As soon as this tx is seen, the destination will know that the channel will be closing soon, if the node is online. If not, the payments cant be credited anyway, so it seems no harm. Even after the channel is closed, it is possible for secrets to be releasing funds, but depending on when the notarization happens, it could invalidate the spends, so it is safest that as soon as the channel cancel tx is confirmed to invalidate any further payments released. - - Given a channelclose and notarization confirmation (or enough blocks), the remaining funds needs to be able to come back to the sender. this means the funds need to be in a 1of2 CC multisig to allow either party to spend. Cheating is prevented by the additional rules of spending, ie. denomination secrets, or channelclose. - - For efficiency we want to allow batch spend with multiple secrets to claim a single total - - Second iteration: - As implementing it, some efficieny gains to be made with a slightly different approach. - Instead of separate secrets for each amount, a hashchain will be used, each releasing the same amount - - To spend, the prior value in the hash chain is published, or can publish N deep. validation takes N hashes. - - Also, in order to be able to track open channels, a tag is needed to be sent and better to send to a normal CC address for a pubkey to isolate the transactions for channel opens. - -Possible third iteration: - Let us try to setup a single "hot wallet" address to have all the channel funds and use it for payments to any destination. If there are no problems with reorgs and double spends, this would allow everyone to be "connected" to everyone else via the single special address. - - So funds -> user's CC address along with hashchain, but likely best to have several utxo to span order of magnitudes. - - a micropayment would then spend a utxo and attach a shared secret encoded unhashed link from the hashchain. That makes the receiver the only one that can decode the actual hashchain's prior value. - - however, since this spend is only spendable by the sender, it is subject to a double spend attack. It seems it is a dead end. Alternative is to use the global CC address, but that commingles all funds from all users and any accounting error puts all funds at risk. - - So, back to the second iteration, which is the only one so far that is immune from doublespend attack as the funds are already in the destination's CC address. One complication is that due to CC sorting of pubkeys, the address for sending and receiving is the same, so the destination pubkey needs to be attached to each opreturn. - - Now when the prior hashchain value is sent via payment, it allows the receiver to spend the utxo, so the only protection needed is to prevent channel close from invalidating already made payments. - - In order to allow multiple payments included in a single transaction, presentation of the N prior hashchain value can be used to get N payments and all the spends create a spending chain in sequential order of the hashchain. - -*/ - -// start of consensus code - -#define CC_MARKER_VALUE 10000 - -int64_t IsChannelsvout(struct CCcontract_info *cp,const CTransaction& tx,CPubKey srcpub, CPubKey destpub,int32_t v) -{ - char destaddr[65],channeladdr[65],tokenschanneladdr[65]; - - GetCCaddress1of2(cp,channeladdr,srcpub,destpub); - GetTokensCCaddress1of2(cp,tokenschanneladdr,srcpub,destpub); - if ( tx.vout[v].scriptPubKey.IsPayToCryptoCondition() != 0 ) - { - if ( Getscriptaddress(destaddr,tx.vout[v].scriptPubKey) > 0 && (strcmp(destaddr,channeladdr) == 0 || strcmp(destaddr,tokenschanneladdr) == 0)) - return(tx.vout[v].nValue); - } - return(0); -} - -int64_t IsChannelsMarkervout(struct CCcontract_info *cp,const CTransaction& tx,CPubKey pubkey,int32_t v) -{ - char destaddr[65],ccaddr[65]; - - GetCCaddress(cp,ccaddr,pubkey); - if ( tx.vout[v].scriptPubKey.IsPayToCryptoCondition() != 0 ) - { - if ( Getscriptaddress(destaddr,tx.vout[v].scriptPubKey) > 0 && strcmp(destaddr,ccaddr) == 0 ) - return(tx.vout[v].nValue); - } - return(0); -} - -CScript EncodeChannelsOpRet(uint8_t funcid,uint256 tokenid,uint256 opentxid,CPubKey srcpub,CPubKey destpub,int32_t numpayments,int64_t payment,uint256 hashchain) -{ - CScript opret; uint8_t evalcode = EVAL_CHANNELS; - vscript_t vopret; - - vopret = E_MARSHAL(ss << evalcode << funcid << opentxid << srcpub << destpub << numpayments << payment << hashchain); - if (tokenid!=zeroid) - { - std::vector pks; - pks.push_back(srcpub); - pks.push_back(destpub); - return(EncodeTokenOpRet(tokenid,pks, std::make_pair(OPRETID_CHANNELSDATA, vopret))); - } - opret << OP_RETURN << vopret; - return(opret); -} - -uint8_t DecodeChannelsOpRet(const CScript &scriptPubKey, uint256 &tokenid, uint256 &opentxid, CPubKey &srcpub,CPubKey &destpub,int32_t &numpayments,int64_t &payment,uint256 &hashchain) -{ - std::vector> oprets; - std::vector vopret,vOpretExtra; uint8_t *script,e,f,tokenevalcode; - std::vector pubkeys; - - if (DecodeTokenOpRet(scriptPubKey,tokenevalcode,tokenid,pubkeys,oprets)!=0 && GetOpretBlob(oprets, OPRETID_CHANNELSDATA, vOpretExtra) && tokenevalcode==EVAL_TOKENS && vOpretExtra.size()>0) - { - vopret=vOpretExtra; - } - else GetOpReturnData(scriptPubKey, vopret); - if ( vopret.size() > 2 ) - { - script = (uint8_t *)vopret.data(); - if ( script[0] == EVAL_CHANNELS ) - { - if ( E_UNMARSHAL(vopret,ss >> e; ss >> f; ss >> opentxid; ss >> srcpub; ss >> destpub; ss >> numpayments; ss >> payment; ss >> hashchain) != 0 ) - { - return(f); - } - } else LOGSTREAM("channelscc",CCLOG_DEBUG1, stream << "script[0] " << script[0] << " != EVAL_CHANNELS" << std::endl); - } else LOGSTREAM("channelscc",CCLOG_DEBUG1, stream << "not enough opret.[" << vopret.size() << "]" << std::endl); - return(0); -} - -bool ChannelsExactAmounts(struct CCcontract_info *cp,Eval* eval,const CTransaction &tx,int32_t minage,uint64_t txfee) -{ - uint256 txid,param3,tokenid; - CPubKey srcpub,destpub; - int32_t param1,numvouts; int64_t param2; uint8_t funcid; - CTransaction vinTx; uint256 hashBlock; int64_t inputs=0,outputs=0; - - if ((numvouts=tx.vout.size()) > 0 && (funcid=DecodeChannelsOpRet(tx.vout[numvouts-1].scriptPubKey, tokenid, txid, srcpub, destpub, param1, param2, param3))!=0) - { - switch (funcid) - { - case 'O': - return (true); - case 'P': - if ( eval->GetTxUnconfirmed(tx.vin[1].prevout.hash,vinTx,hashBlock) == 0 ) - return eval->Invalid("cant find vinTx"); - inputs = vinTx.vout[tx.vin[1].prevout.n].nValue; - outputs = tx.vout[0].nValue + tx.vout[3].nValue; - break; - case 'C': - if ( eval->GetTxUnconfirmed(tx.vin[1].prevout.hash,vinTx,hashBlock) == 0 ) - return eval->Invalid("cant find vinTx"); - inputs = vinTx.vout[tx.vin[1].prevout.n].nValue; - outputs = tx.vout[0].nValue; - break; - case 'R': - if ( eval->GetTxUnconfirmed(tx.vin[1].prevout.hash,vinTx,hashBlock) == 0 ) - return eval->Invalid("cant find vinTx"); - inputs = vinTx.vout[tx.vin[1].prevout.n].nValue; - outputs = tx.vout[2].nValue; - break; - default: - return (false); - } - if ( inputs != outputs ) - { - LOGSTREAM("channelscc",CCLOG_INFO, stream << "inputs " << inputs << " vs outputs " << outputs << std::endl); - return eval->Invalid("mismatched inputs != outputs"); - } - else return (true); - } - else - { - return eval->Invalid("invalid op_return data"); - } - return(false); -} - -bool ChannelsValidate(struct CCcontract_info *cp,Eval* eval,const CTransaction &tx, uint32_t nIn) -{ - int32_t numvins,numvouts,preventCCvins,preventCCvouts,i,numpayments,p1,param1; bool retval; - uint256 txid,hashblock,p3,param3,opentxid,tmp_txid,genhashchain,hashchain,tokenid; - uint8_t funcid,hash[32],hashdest[32]; char channeladdress[65],srcmarker[65],destmarker[65],destaddr[65],srcaddr[65],desttokensaddr[65],srctokensaddr[65]; - int64_t p2,param2,payment; - CPubKey srcpub, destpub; - CTransaction channelOpenTx,channelCloseTx,prevTx; - - numvins = tx.vin.size(); - numvouts = tx.vout.size(); - preventCCvins = preventCCvouts = -1; - if ( numvouts < 1 ) - return eval->Invalid("no vouts"); - else - { - if (ChannelsExactAmounts(cp,eval,tx,1,10000) == false ) - { - return eval->Invalid("invalid channel inputs vs. outputs!"); - } - else - { - txid = tx.GetHash(); - memcpy(hash,&txid,sizeof(hash)); - if ( (funcid = DecodeChannelsOpRet(tx.vout[numvouts-1].scriptPubKey, tokenid, opentxid, srcpub, destpub, param1, param2, param3)) != 0) - { - if (myGetTransaction(opentxid,channelOpenTx,hashblock)== 0) - return eval->Invalid("invalid channelopen tx!"); - else if ((numvouts=channelOpenTx.vout.size()) > 0 && (DecodeChannelsOpRet(channelOpenTx.vout[numvouts-1].scriptPubKey, tokenid, tmp_txid, srcpub, destpub, numpayments, payment, hashchain)) != 'O') - return eval->Invalid("invalid channelopen OP_RETURN data!"); - GetCCaddress1of2(cp,channeladdress,srcpub,destpub); - GetCCaddress(cp,srcmarker,srcpub); - GetCCaddress(cp,destmarker,destpub); - Getscriptaddress(srcaddr,CScript() << ParseHex(HexStr(srcpub)) << OP_CHECKSIG); - Getscriptaddress(destaddr,CScript() << ParseHex(HexStr(destpub)) << OP_CHECKSIG); - _GetCCaddress(srctokensaddr,EVAL_TOKENS,srcpub); - _GetCCaddress(desttokensaddr,EVAL_TOKENS,destpub); - switch ( funcid ) - { - case 'O': - //vin.0: normal input - //vout.0: CC vout for channel funding on CC1of2 pubkey - //vout.1: CC vout marker to senders pubKey - //vout.2: CC vout marker to receiver pubkey - //vout.n-2: normal change - //vout.n-1: opreturn - 'O' zerotxid senderspubkey receiverspubkey totalnumberofpayments paymentamount hashchain - return eval->Invalid("unexpected ChannelsValidate for channelsopen!"); - case 'P': - //vin.0: normal input - //vin.1: CC input from channel funding - //vin.2: CC input from src marker - //vout.0: CC vout change to CC1of2 pubkey - //vout.1: CC vout marker to senders pubKey - //vout.2: CC vout marker to receiver pubkey - //vout.3: normal output of payment amount to receiver pubkey - //vout.n-2: normal change - //vout.n-1: opreturn - 'P' opentxid senderspubkey receiverspubkey depth numpayments secret - if ( IsCCInput(channelOpenTx.vin[0].scriptSig) != 0 ) - return eval->Invalid("vin.0 is normal for channelopen!"); - else if ( ConstrainVout(channelOpenTx.vout[0],1,channeladdress,numpayments*payment)==0 ) - return eval->Invalid("vout.0 is CC or invalid amount for channelopen!"); - else if ( ConstrainVout(channelOpenTx.vout[1],1,srcmarker,CC_MARKER_VALUE)==0 ) - return eval->Invalid("vout.1 is CC marker to srcpub or invalid amount for channelopen!"); - else if ( ConstrainVout(channelOpenTx.vout[2],1,destmarker,CC_MARKER_VALUE)==0 ) - return eval->Invalid("vout.2 is CC marker to destpub or invalid amount for channelopen!"); - else if (hush_txnotarizedconfirmed(opentxid) == 0) - return eval->Invalid("channelopen is not yet confirmed(notarized)!"); - else if ( IsCCInput(tx.vin[0].scriptSig) != 0 ) - return eval->Invalid("vin.0 is normal for channelpayment!"); - else if ( IsCCInput(tx.vin[tx.vin.size()-2].scriptSig) == 0 ) - return eval->Invalid("vin."+std::to_string(tx.vin.size()-2)+" is CC for channelpayment!"); - else if ( ConstrainVout(tx.vout[1],1,srcmarker,CC_MARKER_VALUE)==0 ) - return eval->Invalid("vout.1 is CC marker to srcpub or invalid amount for channelpayment!"); - else if ( ConstrainVout(tx.vout[2],1,destmarker,CC_MARKER_VALUE)==0 ) - return eval->Invalid("vout.2 is CC marker to destpub or invalid amount for channelpayment!"); - else if ( tokenid!=zeroid && ConstrainVout(tx.vout[3],1,desttokensaddr,param2*payment)==0 ) - return eval->Invalid("vout.3 is CC or invalid amount or invalid receiver for channelpayment!"); - else if ( tokenid==zeroid && ConstrainVout(tx.vout[3],0,destaddr,param2*payment)==0 ) - return eval->Invalid("vout.3 is normal or invalid amount or invalid receiver for channelpayment!"); - else if ( param1 > CHANNELS_MAXPAYMENTS) - return eval->Invalid("too many payment increments!"); - else - { - endiancpy(hash, (uint8_t * ) & param3, 32); - for (i = 0; i < numpayments-param1; i++) - { - vcalc_sha256(0, hashdest, hash, 32); - memcpy(hash, hashdest, 32); - } - endiancpy((uint8_t*)&genhashchain,hashdest,32); - if (hashchain!=genhashchain) - return eval->Invalid("invalid secret for payment, does not reach final hashchain!"); - else if (tx.vout[3].nValue != param2*payment) - return eval->Invalid("vout amount does not match number_of_payments*payment!"); - if (myGetTransaction(tx.vin[1].prevout.hash,prevTx,hashblock) != 0) - { - if ((numvouts=prevTx.vout.size()) > 0 && DecodeChannelsOpRet(prevTx.vout[numvouts-1].scriptPubKey, tokenid, tmp_txid, srcpub, destpub, p1, p2, p3) == 0) - return eval->Invalid("invalid previous tx OP_RETURN data!"); - else if ( ConstrainVout(tx.vout[0],1,channeladdress,(p1-param2)*payment)==0 ) - return eval->Invalid("vout.0 is CC or invalid CC change amount for channelpayment!"); - else if ((*cp->ismyvin)(tx.vin[tx.vin.size()-1].scriptSig) == 0 || prevTx.vout[tx.vin[tx.vin.size()-1].prevout.n].nValue!=CC_MARKER_VALUE) - return eval->Invalid("vin."+std::to_string(tx.vin.size()-1)+" is CC marker or invalid marker amount for channelpayment!"); - else if (param1+param2!=p1) - return eval->Invalid("invalid payment depth!"); - else if (tx.vout[3].nValue > prevTx.vout[0].nValue) - return eval->Invalid("not enough funds in channel for that amount!"); - } - } - break; - case 'C': - //vin.0: normal input - //vin.1: CC input from channel funding - //vin.2: CC input from src marker - //vout.0: CC vout for channel funding - //vout.1: CC vout marker to senders pubKey - //vout.2: CC vout marker to receiver pubkey - //vout.n-2: normal change - //vout.n-1: opreturn - 'C' opentxid senderspubkey receiverspubkey numpayments payment 0 - if ( IsCCInput(channelOpenTx.vin[0].scriptSig) != 0 ) - return eval->Invalid("vin.0 is normal for channelopen!"); - else if ( ConstrainVout(channelOpenTx.vout[0],1,channeladdress,numpayments*payment)==0 ) - return eval->Invalid("vout.0 is CC or invalid amount for channelopen!"); - else if ( ConstrainVout(channelOpenTx.vout[1],1,srcmarker,CC_MARKER_VALUE)==0 ) - return eval->Invalid("vout.1 is CC marker to srcpub or invalid amount for channelopen!"); - else if ( ConstrainVout(channelOpenTx.vout[2],1,destmarker,CC_MARKER_VALUE)==0 ) - return eval->Invalid("vout.2 is CC marker to destpub or invalid amount for channelopen!"); - else if (hush_txnotarizedconfirmed(opentxid) == 0) - return eval->Invalid("channelopen is not yet confirmed(notarized)!"); - else if ( IsCCInput(tx.vin[0].scriptSig) != 0 ) - return eval->Invalid("vin.0 is normal for channelclose!"); - else if ( IsCCInput(tx.vin[tx.vin.size()-2].scriptSig) == 0 ) - return eval->Invalid("vin."+std::to_string(tx.vin.size()-2)+" is CC for channelclose!"); - else if ( ConstrainVout(tx.vout[0],1,channeladdress,0)==0 ) - return eval->Invalid("vout.0 is CC for channelclose!"); - else if ( ConstrainVout(tx.vout[1],1,srcmarker,CC_MARKER_VALUE)==0 ) - return eval->Invalid("vout.1 is CC marker to srcpub or invalid amount for channelclose!"); - else if ( ConstrainVout(tx.vout[2],1,destmarker,CC_MARKER_VALUE)==0 ) - return eval->Invalid("vout.2 is CC marker to destpub or invalid amount for channelclose!"); - else if ( param1 > CHANNELS_MAXPAYMENTS) - return eval->Invalid("too many payment increments!"); - else if (myGetTransaction(tx.vin[1].prevout.hash,prevTx,hashblock) != 0) - { - if ((numvouts=prevTx.vout.size()) > 0 && DecodeChannelsOpRet(prevTx.vout[numvouts-1].scriptPubKey, tokenid, tmp_txid, srcpub, destpub, p1, p2, p3) == 0) - return eval->Invalid("invalid previous tx OP_RETURN data!"); - else if ((*cp->ismyvin)(tx.vin[tx.vin.size()-1].scriptSig) == 0 || prevTx.vout[tx.vin[tx.vin.size()-1].prevout.n].nValue!=CC_MARKER_VALUE) - return eval->Invalid("vin."+std::to_string(tx.vin.size()-1)+" is CC marker or invalid marker amount for channelclose!"); - else if (tx.vout[0].nValue != prevTx.vout[0].nValue) - return eval->Invalid("invalid CC amount, amount must match funds in channel"); - } - break; - case 'R': - //vin.0: normal input - //vin.1: CC input from channel funding - //vin.2: CC input from src marker - //vout.0: CC vout marker to senders pubKey - //vout.1: CC vout marker to receiver pubKey - //vout.2: normal output of CC input to senders pubkey - //vout.n-2: normal change - //vout.n-1: opreturn - 'R' opentxid senderspubkey receiverspubkey numpayments payment closetxid - if ( IsCCInput(channelOpenTx.vin[0].scriptSig) != 0 ) - return eval->Invalid("vin.0 is normal for channelopen!"); - else if ( ConstrainVout(channelOpenTx.vout[0],1,channeladdress,numpayments*payment)==0 ) - return eval->Invalid("vout.0 is CC or invalid amount for channelopen!"); - else if ( ConstrainVout(channelOpenTx.vout[1],1,srcmarker,CC_MARKER_VALUE)==0 ) - return eval->Invalid("vout.1 is CC marker to srcpub or invalid amount for channelopen!"); - else if ( ConstrainVout(channelOpenTx.vout[2],1,destmarker,CC_MARKER_VALUE)==0 ) - return eval->Invalid("vout.2 is CC marker to destpub or invalid amount for channelopen!"); - else if (hush_txnotarizedconfirmed(opentxid) == 0) - return eval->Invalid("channelopen is not yet confirmed(notarized)!"); - else if (hush_txnotarizedconfirmed(param3) == 0) - return eval->Invalid("channelClose is not yet confirmed(notarized)!"); - else if ( IsCCInput(tx.vin[0].scriptSig) != 0 ) - return eval->Invalid("vin.0 is normal for channelrefund!"); - else if ( IsCCInput(tx.vin[tx.vin.size()-2].scriptSig) == 0 ) - return eval->Invalid("vin."+std::to_string(tx.vin.size()-2)+" CC for channelrefund!"); - else if ( ConstrainVout(tx.vout[0],1,srcmarker,CC_MARKER_VALUE)==0 ) - return eval->Invalid("vout.0 is CC marker to srcpub or invalid amount for channelrefund!"); - else if ( ConstrainVout(tx.vout[1],1,destmarker,CC_MARKER_VALUE)==0 ) - return eval->Invalid("vout.1 is CC marker to destpub or invalid amount for channelrefund!"); - else if ( tokenid!=zeroid && ConstrainVout(tx.vout[2],1,srctokensaddr,param1*payment)==0 ) - return eval->Invalid("vout.2 is CC or invalid amount or invalid receiver for channelrefund!"); - else if ( tokenid==zeroid && ConstrainVout(tx.vout[2],0,srcaddr,param1*payment)==0 ) - return eval->Invalid("vout.2 is normal or invalid amount or invalid receiver for channelrefund!"); - else if ( param1 > CHANNELS_MAXPAYMENTS) - return eval->Invalid("too many payment increments!"); - else if (myGetTransaction(tx.vin[1].prevout.hash,prevTx,hashblock) != 0) - { - if ((numvouts=prevTx.vout.size()) > 0 && DecodeChannelsOpRet(prevTx.vout[numvouts-1].scriptPubKey, tokenid, tmp_txid, srcpub, destpub, p1, p2, p3) == 0) - return eval->Invalid("invalid previous tx OP_RETURN data!"); - else if ((*cp->ismyvin)(tx.vin[tx.vin.size()-1].scriptSig) == 0 || prevTx.vout[tx.vin[tx.vin.size()-1].prevout.n].nValue!=CC_MARKER_VALUE) - return eval->Invalid("vin."+std::to_string(tx.vin.size()-1)+" is CC marker or invalid marker amount for channelrefund!"); - else if (tx.vout[2].nValue != prevTx.vout[0].nValue) - return eval->Invalid("invalid amount, refund amount and funds in channel must match!"); - } - break; - default: - fprintf(stderr,"illegal channels funcid.(%c)\n",funcid); - return eval->Invalid("unexpected channels funcid"); - } - } - else return eval->Invalid("unexpected channels missing funcid"); - retval = PreventCC(eval,tx,preventCCvins,numvins,preventCCvouts,numvouts); - if ( retval != 0 ) - LOGSTREAM("channels",CCLOG_INFO, stream << "Channels tx validated" << std::endl); - else fprintf(stderr,"Channels tx invalid\n"); - return(retval); - } - } -} -// end of consensus code - -// helper functions for rpc calls in rpcwallet.cpp - -int64_t AddChannelsInputs(struct CCcontract_info *cp,CMutableTransaction &mtx, CTransaction openTx, uint256 &prevtxid, CPubKey mypk) -{ - char coinaddr[65]; int64_t param2,totalinputs = 0,numvouts; uint256 txid=zeroid,tmp_txid,hashBlock,param3,tokenid; CTransaction tx; int32_t marker,param1; - std::vector > unspentOutputs; - CPubKey srcpub,destpub; - uint8_t myprivkey[32]; - - if ((numvouts=openTx.vout.size()) > 0 && DecodeChannelsOpRet(openTx.vout[numvouts-1].scriptPubKey,tokenid,tmp_txid,srcpub,destpub,param1,param2,param3)=='O') - { - if (tokenid!=zeroid) GetTokensCCaddress1of2(cp,coinaddr,srcpub,destpub); - else GetCCaddress1of2(cp,coinaddr,srcpub,destpub); - SetCCunspents(unspentOutputs,coinaddr,true); - } - else - { - LOGSTREAM("channelscc",CCLOG_INFO, stream << "invalid channel open txid" << std::endl); - return 0; - } - if (srcpub==mypk) marker=1; - else marker=2; - for (std::vector >::const_iterator it=unspentOutputs.begin(); it!=unspentOutputs.end(); it++) - { - if ( (int32_t)it->first.index==0 && myGetTransaction(it->first.txhash,tx,hashBlock) != 0 && (numvouts=tx.vout.size()) > 0) - { - if (DecodeChannelsOpRet(tx.vout[numvouts-1].scriptPubKey,tokenid,tmp_txid,srcpub,destpub,param1,param2,param3)!=0 && - (tmp_txid==openTx.GetHash() || tx.GetHash()==openTx.GetHash()) && IsChannelsMarkervout(cp,tx,marker==1?srcpub:destpub,marker)>0 && - (totalinputs=IsChannelsvout(cp,tx,srcpub,destpub,0))>0) - { - txid = it->first.txhash; - break; - } - } - } - if (txid!=zeroid && myIsutxo_spentinmempool(ignoretxid,ignorevin,txid,0) != 0) - { - txid=zeroid; - int32_t mindepth=CHANNELS_MAXPAYMENTS; - std::vector tmp_txs; - myGet_mempool_txs(tmp_txs,EVAL_CHANNELS,'P'); - for (std::vector::const_iterator it=tmp_txs.begin(); it!=tmp_txs.end(); it++) - { - const CTransaction &txmempool = *it; - const uint256 &hash = txmempool.GetHash(); - - if ((numvouts=txmempool.vout.size()) > 0 && DecodeChannelsOpRet(txmempool.vout[numvouts-1].scriptPubKey,tokenid,tmp_txid,srcpub,destpub,param1,param2,param3)=='P' && - tmp_txid==openTx.GetHash() && param1 < mindepth) - { - txid=hash; - totalinputs=txmempool.vout[0].nValue; - mindepth=param1; - } - } - } - if (txid != zeroid) - { - prevtxid=txid; - mtx.vin.push_back(CTxIn(txid,0,CScript())); - mtx.vin.push_back(CTxIn(txid,marker,CScript())); - Myprivkey(myprivkey); - if (tokenid!=zeroid) CCaddrTokens1of2set(cp,srcpub,destpub,myprivkey,coinaddr); - else CCaddr1of2set(cp,srcpub,destpub,myprivkey,coinaddr); - memset(myprivkey,0,32); - return totalinputs; - } - else return 0; -} - -UniValue ChannelOpen(const CPubKey& pk, uint64_t txfee,CPubKey destpub,int32_t numpayments,int64_t payment, uint256 tokenid) -{ - CMutableTransaction mtx = CreateNewContextualCMutableTransaction(Params().GetConsensus(), hush_nextheight()); - uint8_t hash[32],hashdest[32]; uint64_t amount,tokens=0,funds; int32_t i; uint256 hashchain,entropy,hentropy; - CPubKey mypk; struct CCcontract_info *cp,*cpTokens,C,CTokens; - - if ( numpayments <= 0 || payment <= 0 || numpayments > CHANNELS_MAXPAYMENTS ) - CCERR_RESULT("channelscc",CCLOG_INFO, stream << "invalid ChannelOpen param numpayments." << numpayments << " payment." << payment << " - max_numpayments." << CHANNELS_MAXPAYMENTS); - if (!destpub.IsFullyValid()) - CCERR_RESULT("channelscc",CCLOG_INFO, stream << "invalid destination pubkey"); - if (numpayments <1) - CCERR_RESULT("channelscc",CCLOG_INFO, stream << "invalid number of payments, must be greater than 0"); - if (payment <1) - CCERR_RESULT("channelscc",CCLOG_INFO, stream << "invalid payment amount, must be greater than 0"); - cp = CCinit(&C,EVAL_CHANNELS); - cpTokens = CCinit(&CTokens,EVAL_TOKENS); - if ( txfee == 0 ) - txfee = 10000; - mypk = pk.IsValid()?pk:pubkey2pk(Mypubkey()); - funds = numpayments * payment; - if (tokenid!=zeroid) - { - amount=AddNormalinputs(mtx,mypk,txfee+2*CC_MARKER_VALUE,5,pk.IsValid()); - tokens=AddTokenCCInputs(cpTokens, mtx, mypk, tokenid, funds, 64); - } - else amount=AddNormalinputs(mtx,mypk,funds+txfee+2*CC_MARKER_VALUE,64,pk.IsValid()); - if (amount+tokens >= funds+txfee+2*CC_MARKER_VALUE) - { - hentropy = DiceHashEntropy(entropy,mtx.vin[0].prevout.hash,mtx.vin[0].prevout.n,1); - endiancpy(hash,(uint8_t *)&hentropy,32); - for (i=0; ifunds) mtx.vout.push_back(MakeCC1vout(EVAL_TOKENS,tokens-funds,mypk)); - return(FinalizeCCTxExt(pk.IsValid(),0,cp,mtx,mypk,txfee,EncodeChannelsOpRet('O',tokenid,zeroid,mypk,destpub,numpayments,payment,hashchain))); - } - CCERR_RESULT("channelscc",CCLOG_INFO, stream << "error adding funds"); -} - -UniValue ChannelPayment(const CPubKey& pk, uint64_t txfee,uint256 opentxid,int64_t amount, uint256 secret) -{ - CMutableTransaction mtx = CreateNewContextualCMutableTransaction(Params().GetConsensus(), hush_nextheight()); - CPubKey mypk,srcpub,destpub; uint256 txid,hashchain,gensecret,hashblock,entropy,hentropy,prevtxid,param3,tokenid; - struct CCcontract_info *cp,C; int32_t i,funcid,prevdepth,numvouts,numpayments,totalnumpayments; - int64_t payment,change,funds,param2; - uint8_t hash[32],hashdest[32]; - CTransaction channelOpenTx,prevTx; - - cp = CCinit(&C,EVAL_CHANNELS); - if ( txfee == 0 ) - txfee = 10000; - mypk = pk.IsValid()?pk:pubkey2pk(Mypubkey()); - if (amount <1) - CCERR_RESULT("channelscc",CCLOG_INFO, stream << "invalid payment amount, must be greater than 0"); - if (myGetTransaction(opentxid,channelOpenTx,hashblock) == 0) - CCERR_RESULT("channelscc",CCLOG_INFO, stream << "invalid channel open txid"); - if ((numvouts=channelOpenTx.vout.size()) > 0 && DecodeChannelsOpRet(channelOpenTx.vout[numvouts-1].scriptPubKey, tokenid, txid, srcpub, destpub, totalnumpayments, payment, hashchain)=='O') - { - if (mypk != srcpub && mypk != destpub) - CCERR_RESULT("channelscc",CCLOG_INFO, stream << "this is not our channel"); - else if (amount % payment != 0 || amount 0) - { - if ((funds=AddChannelsInputs(cp,mtx,channelOpenTx,prevtxid,mypk)) !=0 && (change=funds-amount)>=0) - { - numpayments=amount/payment; - if (myGetTransaction(prevtxid,prevTx,hashblock) != 0 && (numvouts=prevTx.vout.size()) > 0 && - ((funcid = DecodeChannelsOpRet(prevTx.vout[numvouts-1].scriptPubKey, tokenid, txid, srcpub, destpub, prevdepth, param2, param3)) != 0) && - (funcid == 'P' || funcid=='O')) - { - if (numpayments > prevdepth) - CCERR_RESULT("channelscc",CCLOG_INFO, stream << "not enough funds in channel for that amount"); - else if (numpayments == 0) - CCERR_RESULT("channelscc",CCLOG_INFO, stream << "invalid amount"); - if (secret!=zeroid) - { - endiancpy(hash, (uint8_t * ) & secret, 32); - for (i = 0; i < totalnumpayments-(prevdepth-numpayments); i++) - { - vcalc_sha256(0, hashdest, hash, 32); - memcpy(hash, hashdest, 32); - } - endiancpy((uint8_t * ) & gensecret, hashdest, 32); - if (gensecret!=hashchain) CCERR_RESULT("channelscc",CCLOG_INFO, stream << "invalid secret supplied"); - } - else - { - hentropy = DiceHashEntropy(entropy,channelOpenTx.vin[0].prevout.hash,channelOpenTx.vin[0].prevout.n,1); - if (prevdepth-numpayments) - { - endiancpy(hash, (uint8_t * ) & hentropy, 32); - for (i = 0; i < prevdepth-numpayments; i++) - { - vcalc_sha256(0, hashdest, hash, 32); - memcpy(hash, hashdest, 32); - } - endiancpy((uint8_t * ) & secret, hashdest, 32); - } - else endiancpy((uint8_t * ) & secret, (uint8_t * ) & hentropy, 32); - } - } - else - CCERR_RESULT("channelscc",CCLOG_INFO, stream << "invalid previous tx"); - if (tokenid!=zeroid) mtx.vout.push_back(MakeTokensCC1of2vout(EVAL_CHANNELS, change, srcpub, destpub)); - else mtx.vout.push_back(MakeCC1of2vout(EVAL_CHANNELS, change, srcpub, destpub)); - mtx.vout.push_back(MakeCC1vout(EVAL_CHANNELS,CC_MARKER_VALUE,srcpub)); - mtx.vout.push_back(MakeCC1vout(EVAL_CHANNELS,CC_MARKER_VALUE,destpub)); - if (tokenid!=zeroid) mtx.vout.push_back(MakeCC1vout(EVAL_TOKENS, amount, destpub)); - else mtx.vout.push_back(CTxOut(amount, CScript() << ParseHex(HexStr(destpub)) << OP_CHECKSIG)); - return (FinalizeCCTxExt(pk.IsValid(), 0, cp, mtx, mypk, txfee, EncodeChannelsOpRet('P', tokenid, opentxid, srcpub, destpub, prevdepth-numpayments, numpayments, secret))); - } - else - CCERR_RESULT("channelscc",CCLOG_INFO, stream << "error adding CC inputs"); - } - CCERR_RESULT("channelscc",CCLOG_INFO, stream << "error adding normal inputs"); -} - -UniValue ChannelClose(const CPubKey& pk, uint64_t txfee,uint256 opentxid) -{ - CMutableTransaction mtx = CreateNewContextualCMutableTransaction(Params().GetConsensus(), hush_nextheight()); - CPubKey mypk,srcpub,destpub; struct CCcontract_info *cp,C; - CTransaction channelOpenTx; - uint256 hashblock,tmp_txid,prevtxid,hashchain,tokenid; - int32_t numvouts,numpayments; - int64_t payment,funds; - - // verify this is one of our outbound channels - cp = CCinit(&C,EVAL_CHANNELS); - if ( txfee == 0 ) - txfee = 10000; - mypk = pk.IsValid()?pk:pubkey2pk(Mypubkey()); - if (myGetTransaction(opentxid,channelOpenTx,hashblock) == 0) - CCERR_RESULT("channelscc",CCLOG_INFO, stream << "invalid channel open txid"); - if ((numvouts=channelOpenTx.vout.size()) < 1 || DecodeChannelsOpRet(channelOpenTx.vout[numvouts-1].scriptPubKey,tokenid,tmp_txid,srcpub,destpub,numpayments,payment,hashchain)!='O') - CCERR_RESULT("channelscc",CCLOG_INFO, stream << "invalid channel open tx"); - if (hush_txnotarizedconfirmed(opentxid)==false) - CCERR_RESULT("channelscc",CCLOG_INFO, stream <<"channelsopen tx not yet confirmed/notarized"); - if (mypk != srcpub) - CCERR_RESULT("channelscc",CCLOG_INFO, stream << "cannot close, you are not channel owner"); - if ( AddNormalinputs(mtx,mypk,txfee+CC_MARKER_VALUE,3,pk.IsValid()) > 0 ) - { - if ((funds=AddChannelsInputs(cp,mtx,channelOpenTx,prevtxid,mypk)) !=0 && funds>0) - { - if (tokenid!=zeroid) mtx.vout.push_back(MakeTokensCC1of2vout(EVAL_CHANNELS, funds, mypk, destpub)); - else mtx.vout.push_back(MakeCC1of2vout(EVAL_CHANNELS, funds, mypk, destpub)); - mtx.vout.push_back(MakeCC1vout(EVAL_CHANNELS,CC_MARKER_VALUE,mypk)); - mtx.vout.push_back(MakeCC1vout(EVAL_CHANNELS,CC_MARKER_VALUE,destpub)); - return(FinalizeCCTx(0,cp,mtx,mypk,txfee,EncodeChannelsOpRet('C',tokenid,opentxid,mypk,destpub,funds/payment,payment,zeroid))); - } - else - CCERR_RESULT("channelscc",CCLOG_INFO, stream << "error adding CC inputs"); - } - CCERR_RESULT("channelscc",CCLOG_INFO, stream << "error adding normal inputs"); -} - -UniValue ChannelRefund(const CPubKey& pk, uint64_t txfee,uint256 opentxid,uint256 closetxid) -{ - CMutableTransaction mtx = CreateNewContextualCMutableTransaction(Params().GetConsensus(), hush_nextheight()); - CPubKey mypk; struct CCcontract_info *cp,C; int64_t funds,payment,param2; - int32_t i,numpayments,numvouts,param1; - uint256 hashchain,hashblock,txid,prevtxid,param3,tokenid; - CTransaction channelOpenTx,channelCloseTx,prevTx; - CPubKey srcpub,destpub; - - // verify stoptxid and origtxid match and are mine - cp = CCinit(&C,EVAL_CHANNELS); - if ( txfee == 0 ) - txfee = 10000; - mypk = pk.IsValid()?pk:pubkey2pk(Mypubkey()); - if (myGetTransaction(closetxid,channelCloseTx,hashblock) == 0) - CCERR_RESULT("channelscc",CCLOG_INFO, stream << "invalid channel close txid"); - if ((numvouts=channelCloseTx.vout.size()) < 1 || DecodeChannelsOpRet(channelCloseTx.vout[numvouts-1].scriptPubKey,tokenid,txid,srcpub,destpub,param1,param2,param3)!='C') - CCERR_RESULT("channelscc",CCLOG_INFO, stream << "invalid channel close tx"); - if (hush_txnotarizedconfirmed(closetxid)==false) - CCERR_RESULT("channelscc",CCLOG_INFO, stream << "channelsclose tx not yet confirmed/notarized"); - if (txid!=opentxid) - CCERR_RESULT("channelscc",CCLOG_INFO, stream << "open and close txid are not from same channel"); - if (myGetTransaction(opentxid,channelOpenTx,hashblock) == 0) - CCERR_RESULT("channelscc",CCLOG_INFO, stream << "invalid channel open txid"); - if (hush_txnotarizedconfirmed(opentxid)==false) - CCERR_RESULT("channelscc",CCLOG_INFO, stream << "channelsopen tx not yet confirmed/notarized"); - if ((numvouts=channelOpenTx.vout.size()) < 1 || DecodeChannelsOpRet(channelOpenTx.vout[numvouts-1].scriptPubKey,tokenid,txid,srcpub,destpub,numpayments,payment,hashchain)!='O') - CCERR_RESULT("channelscc",CCLOG_INFO, stream << "invalid channel open tx"); - if (mypk != srcpub) - CCERR_RESULT("channelscc",CCLOG_INFO, stream << "cannot refund, you are not the channel owner"); - if ( AddNormalinputs(mtx,mypk,txfee+CC_MARKER_VALUE,3,pk.IsValid()) > 0 ) - { - if ((funds=AddChannelsInputs(cp,mtx,channelOpenTx,prevtxid,mypk)) !=0 && funds>0) - { - if ((myGetTransaction(prevtxid,prevTx,hashblock) != 0) && (numvouts=prevTx.vout.size()) > 0 && - DecodeChannelsOpRet(prevTx.vout[numvouts-1].scriptPubKey, tokenid, txid, srcpub, destpub, param1, param2, param3) != 0) - { - mtx.vout.push_back(MakeCC1vout(EVAL_CHANNELS,CC_MARKER_VALUE,mypk)); - mtx.vout.push_back(MakeCC1vout(EVAL_CHANNELS,CC_MARKER_VALUE,destpub)); - if (tokenid!=zeroid) mtx.vout.push_back(MakeCC1vout(EVAL_TOKENS,funds,mypk)); - else mtx.vout.push_back(CTxOut(funds,CScript() << ParseHex(HexStr(mypk)) << OP_CHECKSIG)); - return(FinalizeCCTx(0,cp,mtx,mypk,txfee,EncodeChannelsOpRet('R',tokenid,opentxid,mypk,destpub,funds/payment,payment,closetxid))); - } - else - CCERR_RESULT("channelscc",CCLOG_INFO, stream << "previous tx is invalid"); - } - else - CCERR_RESULT("channelscc",CCLOG_INFO, stream << "error adding CC inputs"); - } - CCERR_RESULT("channelscc",CCLOG_INFO, stream << "error adding normal inputs"); -} - -UniValue ChannelsList(const CPubKey& pk) -{ - UniValue result(UniValue::VOBJ); std::vector txids; struct CCcontract_info *cp,C; uint256 txid,hashBlock,tmp_txid,param3,tokenid; - CTransaction tx; char myCCaddr[65],str[512],pub[34]; CPubKey mypk,srcpub,destpub; int32_t vout,numvouts,param1; - int64_t nValue,param2; - - cp = CCinit(&C,EVAL_CHANNELS); - mypk = pk.IsValid()?pk:pubkey2pk(Mypubkey()); - GetCCaddress(cp,myCCaddr,mypk); - SetCCtxids(txids,myCCaddr,true,EVAL_CHANNELS,zeroid,'O'); - result.push_back(Pair("result","success")); - result.push_back(Pair("name","Channels List")); - for (std::vector::const_iterator it=txids.begin(); it!=txids.end(); it++) - { - txid = *it; - if ( myGetTransaction(txid,tx,hashBlock) != 0 && (numvouts= tx.vout.size()) > 0 ) - { - if (DecodeChannelsOpRet(tx.vout[numvouts-1].scriptPubKey,tokenid,tmp_txid,srcpub,destpub,param1,param2,param3) == 'O') - { - sprintf(str,"%lld payments of %lld satoshi to %s",(long long)param1,(long long)param2,pubkey33_str(pub,(uint8_t *)&destpub)); - result.push_back(Pair(txid.GetHex().data(),str)); - } - } - } - return(result); -} - -UniValue ChannelsInfo(const CPubKey& pk,uint256 channeltxid) -{ - UniValue result(UniValue::VOBJ),array(UniValue::VARR); CTransaction tx,opentx; uint256 txid,tmp_txid,hashBlock,param3,opentxid,hashchain,tokenid; - struct CCcontract_info *cp,C; char CCaddr[65],addr[65],str[512]; int32_t vout,numvouts,param1,numpayments; - int64_t param2,payment; CPubKey srcpub,destpub,mypk; - std::vector txids; std::vector txs; - - cp = CCinit(&C,EVAL_CHANNELS); - mypk = pk.IsValid()?pk:pubkey2pk(Mypubkey()); - - if (myGetTransaction(channeltxid,tx,hashBlock) != 0 && (numvouts= tx.vout.size()) > 0 && - (DecodeChannelsOpRet(tx.vout[numvouts-1].scriptPubKey,tokenid,opentxid,srcpub,destpub,param1,param2,param3) == 'O')) - { - GetCCaddress1of2(cp,CCaddr,srcpub,destpub); - Getscriptaddress(addr,CScript() << ParseHex(HexStr(destpub)) << OP_CHECKSIG); - result.push_back(Pair("result","success")); - result.push_back(Pair("Channel CC address",CCaddr)); - result.push_back(Pair("Destination address",addr)); - result.push_back(Pair("Number of payments",param1)); - if(tokenid!=zeroid) - { - result.push_back(Pair("Token id",tokenid.GetHex().data())); - result.push_back(Pair("Denomination (token satoshi)",i64tostr(param2))); - result.push_back(Pair("Amount (token satoshi)",i64tostr(param1*param2))); - } - else - { - result.push_back(Pair("Denomination (satoshi)",i64tostr(param2))); - result.push_back(Pair("Amount (satoshi)",i64tostr(param1*param2))); - } - GetCCaddress(cp,CCaddr,mypk); - SetCCtxids(txids,CCaddr,true,EVAL_CHANNELS,channeltxid,0); - for (std::vector::const_iterator it=txids.begin(); it!=txids.end(); it++) - { - if (myGetTransaction(*it,tx,hashBlock) != 0 && (numvouts= tx.vout.size()) > 0 && - DecodeChannelsOpRet(tx.vout[numvouts-1].scriptPubKey,tokenid,tmp_txid,srcpub,destpub,param1,param2,param3)!=0 && (tmp_txid==channeltxid || tx.GetHash()==channeltxid)) - txs.push_back(tx); - } - std::vector tmp_txs; - myGet_mempool_txs(tmp_txs,EVAL_CHANNELS,'P'); - for (std::vector::const_iterator it=tmp_txs.begin(); it!=tmp_txs.end(); it++) - { - const CTransaction &txmempool = *it; - - if ((numvouts=txmempool.vout.size()) > 0 && DecodeChannelsOpRet(txmempool.vout[numvouts-1].scriptPubKey,tokenid,tmp_txid,srcpub,destpub,param1,param2,param3) == 'P' && tmp_txid==channeltxid) - txs.push_back(txmempool); - } - for (std::vector::const_iterator it=txs.begin(); it!=txs.end(); it++) - { - tx=*it; - if ((numvouts= tx.vout.size()) > 0 ) - { - UniValue obj(UniValue::VOBJ); - if (DecodeChannelsOpRet(tx.vout[numvouts-1].scriptPubKey,tokenid,tmp_txid,srcpub,destpub,param1,param2,param3) == 'O' && tx.GetHash()==channeltxid) - { - obj.push_back(Pair("Open",tx.GetHash().GetHex().data())); - } - else if (DecodeChannelsOpRet(tx.vout[numvouts-1].scriptPubKey,tokenid,opentxid,srcpub,destpub,param1,param2,param3) == 'P' && opentxid==channeltxid) - { - if (myGetTransaction(opentxid,opentx,hashBlock) != 0 && (numvouts=opentx.vout.size()) > 0 && - DecodeChannelsOpRet(opentx.vout[numvouts-1].scriptPubKey,tokenid,tmp_txid,srcpub,destpub,numpayments,payment,hashchain) == 'O') - { - Getscriptaddress(str,tx.vout[3].scriptPubKey); - obj.push_back(Pair("Payment",tx.GetHash().GetHex().data())); - obj.push_back(Pair("Number of payments",param2)); - obj.push_back(Pair("Amount",param2*payment)); - obj.push_back(Pair("Destination",str)); - obj.push_back(Pair("Secret",param3.ToString().c_str())); - obj.push_back(Pair("Payments left",param1)); - } - } - else if (DecodeChannelsOpRet(tx.vout[numvouts-1].scriptPubKey,tokenid,opentxid,srcpub,destpub,param1,param2,param3) == 'C' && opentxid==channeltxid) - { - obj.push_back(Pair("Close",tx.GetHash().GetHex().data())); - } - else if (DecodeChannelsOpRet(tx.vout[numvouts-1].scriptPubKey,tokenid,opentxid,srcpub,destpub,param1,param2,param3) == 'R' && opentxid==channeltxid) - { - Getscriptaddress(str,tx.vout[2].scriptPubKey); - obj.push_back(Pair("Refund",tx.GetHash().GetHex().data())); - obj.push_back(Pair("Amount",param1*param2)); - obj.push_back(Pair("Destination",str)); - } - array.push_back(obj); - } - } - result.push_back(Pair("Transactions",array)); - } - else - { - result.push_back(Pair("result","error")); - result.push_back(Pair("Error","Channel not found!")); - } - return(result); -} diff --git a/src/cc/dice.cpp b/src/cc/dice.cpp deleted file mode 100644 index 6b0d06075..000000000 --- a/src/cc/dice.cpp +++ /dev/null @@ -1,1871 +0,0 @@ -// Copyright (c) 2016-2023 The Hush developers -// Distributed under the GPLv3 software license, see the accompanying -// file COPYING or https://www.gnu.org/licenses/gpl-3.0.en.html -/****************************************************************************** - * Copyright © 2014-2019 The SuperNET Developers. * - * * - * See the AUTHORS, DEVELOPER-AGREEMENT and LICENSE files at * - * the top-level directory of this distribution for the individual copyright * - * holder information and the developer policies on copyright and licensing. * - * * - * Unless otherwise agreed in a custom licensing agreement, no part of the * - * SuperNET software, including this file may be copied, modified, propagated * - * or distributed except according to the terms contained in the LICENSE file * - * * - * Removal or modification of this copyright notice is prohibited. * - * * - ******************************************************************************/ - -#include "CCdice.h" - -// timeout - -/* - in order to implement a dice game, we need a source of entropy, reasonably fast completion time and a way to manage the utxos. - - 1. CC vout locks "house" funds with hash(entropy) - 2. bettor submits bet, with entropy, odds, houseid and sends combined amount into another CC vout. - 3. house account sends funds to winner/loser with proof of entropy - 4. if timeout, bettor gets refund - - 2. and 3. can be done in mempool - - The house commits to an entropy value by including the hash of the entropy value in the 'E' transaction. - - To bet, one of these 'E' transactions is used as the first input and its hashed entropy is combined with the unhashed entropy attached to the bet 'B' transaction. - - The house node monitors the 'B' transactions and if it sees one of its own, it creates either a winner 'W' or loser 'L' transaction, with proof of hash of entropy. - - In the even the house node doesnt respond before timeoutblocks, then anybody (including bettor) can undo the bet with funds going back to the house and bettor - - In order for people to play dice, someone (anyone) needs to create a funded dice plan and addfunding with enough utxo to allow players to find one. - -createfunding: - vins.*: normal inputs - vout.0: CC vout for funding - vout.1: owner vout - vout.2: dice marker address vout for easy searching - vout.3: normal change - vout.n-1: opreturn 'F' sbits minbet maxbet maxodds timeoutblocks - -addfunding (entropy): - vins.*: normal inputs - vout.0: CC vout for locked entropy funds - vout.1: tag to owner address for entropy funds - vout.2: normal change - vout.n-1: opreturn 'E' sbits fundingtxid hentropy - -bet: - vin.0: entropy txid from house (must validate vin0 of 'E') - vins.1+: normal inputs - vout.0: CC vout for locked entropy - vout.1: CC vout for locked bet - vout.2: tag for bettor's address (txfee + odds) - vout.3: change - vout.n-1: opreturn 'B' sbits fundingtxid entropy - -loser: - vin.0: normal input - vin.1: betTx CC vout.0 entropy from bet - vin.2: betTx CC vout.1 bet amount from bet - vin.3+: funding CC vout.0 from 'F', 'E', 'W', 'L' or 'T' - vout.0: funding CC to entropy owner - vout.1: tag to owner address for entropy funds - vout.2: change to fundingpk - vout.n-1: opreturn 'L' sbits fundingtxid hentropy proof - -winner: - same as loser, but vout.2 is winnings - vout.3: change to fundingpk - vout.n-1: opreturn 'W' sbits fundingtxid hentropy proof - -timeout: - same as winner, just without hentropy or proof - -WARNING: there is an attack vector that precludes betting any large amounts, it goes as follows: - 1. do dicebet to get the house entropy revealed - 2. calculate bettor entropy that would win against the house entropy - 3. reorg the chain and make a big bet using the winning entropy calculated in 2. - - In order to mitigate this, the disclosure of the house entropy needs to be delayed beyond a reasonable reorg depth (notarization). It is recommended for production dice game with significant amounts of money to use such a delayed disclosure method. - - Actually a much better solution to this is possible, which allows to retain the realtime response aspect of dice CC, which is critical to its usage. - -What is needed is for the dealer node to track the entropy tx that was already broadcast into the mempool with its entropy revealed. Then before processing a dicebet, it is checked against the already revealed list. If it is found, the dicebet is refunded with proof that a different dicebet was already used to reveal the entropy - - change to hashtables - validate refund - - */ - -#include "../compat/endian.h" - -#define MAX_ENTROPYUSED 8192 -#define DICE_MINUTXOS 15000 -extern int32_t HUSH_INSYNC; - -pthread_mutex_t DICE_MUTEX,DICEREVEALED_MUTEX; - -struct dicefinish_utxo { uint256 txid; int32_t vout; }; - -struct dicefinish_info -{ - struct dicefinish_info *prev,*next; - CTransaction betTx; - uint256 fundingtxid,bettxid,entropyused,txid; - uint64_t sbits; - int64_t winamount; - int32_t iswin,entropyvout,orphaned; - uint32_t bettxid_ready,revealed; - std::string rawtx; - uint8_t funcid; -} *DICEFINISH_LIST; - -struct dicehash_entry -{ - UT_hash_handle hh; - uint256 bettxid; -} *DICEHASH_TABLE; - -struct dice_entropy -{ - UT_hash_handle hh; - uint256 entropyused,bettxid; - CTransaction betTx; - int32_t entropyvout; -} *DICE_ENTROPY; - -struct dicehash_entry *_dicehash_find(uint256 bettxid) -{ - struct dicehash_entry *ptr; - HASH_FIND(hh,DICEHASH_TABLE,&bettxid,sizeof(bettxid),ptr); - return(ptr); -} - -int32_t _dicehash_clear(uint256 bettxid) -{ - struct dicehash_entry *ptr; - HASH_FIND(hh,DICEHASH_TABLE,&bettxid,sizeof(bettxid),ptr); - if ( ptr != 0 ) - { - fprintf(stderr,"delete %s\n",bettxid.GetHex().c_str()); - HASH_DELETE(hh,DICEHASH_TABLE,ptr); - return(0); - } else fprintf(stderr,"hashdelete couldnt find %s\n",bettxid.GetHex().c_str()); - return(-1); -} - -struct dicehash_entry *_dicehash_add(uint256 bettxid) -{ - struct dicehash_entry *ptr; - ptr = (struct dicehash_entry *)calloc(1,sizeof(*ptr)); - ptr->bettxid = bettxid; - HASH_ADD(hh,DICEHASH_TABLE,bettxid,sizeof(bettxid),ptr); - return(ptr); -} - -int32_t _dicerevealed_find(uint256 &oldbettxid,CTransaction &oldbetTx,int32_t &oldentropyvout,uint256 entropyused,uint256 bettxid,int32_t entropyvout) -{ - struct dice_entropy *ptr; - HASH_FIND(hh,DICE_ENTROPY,&entropyused,sizeof(entropyused),ptr); - if ( ptr != 0 ) - { - if ( entropyvout == ptr->entropyvout ) - { - if ( bettxid == ptr->bettxid ) - { - //fprintf(stderr,"identical %s E.%s v.%d\n",bettxid.GetHex().c_str(),entropyused.GetHex().c_str(),entropyvout); - return(entropyvout+1); - } - else - { - fprintf(stderr,"found identical entropy used.%s %s vs %s v.%d vs %d\n",entropyused.GetHex().c_str(),bettxid.GetHex().c_str(),ptr->bettxid.GetHex().c_str(),entropyvout,ptr->entropyvout); - oldbettxid = ptr->bettxid; - oldbetTx = ptr->betTx; - oldentropyvout = ptr->entropyvout; - return(-1); - } - } else fprintf(stderr,"shared entropy.%s vouts %d vs %d\n",entropyused.GetHex().c_str(),entropyvout,ptr->entropyvout); - } - return(0); -} - -struct dice_entropy *_dicerevealed_add(uint256 entropyused,uint256 bettxid,CTransaction betTx,int32_t entropyvout) -{ - struct dice_entropy *ptr; - ptr = (struct dice_entropy *)calloc(1,sizeof(*ptr)); - ptr->entropyused = entropyused; - ptr->bettxid = bettxid; - ptr->betTx = betTx; - ptr->entropyvout = entropyvout; - HASH_ADD(hh,DICE_ENTROPY,entropyused,sizeof(entropyused),ptr); - return(ptr); -} - -int32_t DiceEntropyUsed(CTransaction &oldbetTx,uint256 &oldbettxid,int32_t &oldentropyvout,uint256 entropyused,uint256 bettxid,CTransaction betTx,int32_t entropyvout) -{ - int32_t retval; - oldbettxid = zeroid; - if ( entropyused == zeroid || bettxid == zeroid ) - { - fprintf(stderr,"null entropyused or bettxid\n"); - return(1); - } - pthread_mutex_lock(&DICEREVEALED_MUTEX); - retval = _dicerevealed_find(oldbettxid,oldbetTx,oldentropyvout,entropyused,bettxid,entropyvout); - pthread_mutex_unlock(&DICEREVEALED_MUTEX); - return(retval); -} - -bool mySenddicetransaction(std::string res,uint256 entropyused,int32_t entropyvout,uint256 bettxid,CTransaction betTx,uint8_t funcid,struct dicefinish_info *ptr) -{ - CTransaction tx; int32_t i=0,retval=-1,oldentropyvout; uint256 oldbettxid; CTransaction oldbetTx; - if ( res.empty() == 0 && res.size() > 64 && is_hexstr((char *)res.c_str(),0) > 64 ) - { - if ( DecodeHexTx(tx,res) != 0 ) - { - if ( ptr != 0 ) - ptr->txid = tx.GetHash(); - //fprintf(stderr,"%s\n%s\n",res.c_str(),uint256_str(str,tx.GetHash())); - if ( funcid == 'R' || (retval= DiceEntropyUsed(oldbetTx,oldbettxid,oldentropyvout,entropyused,bettxid,betTx,entropyvout)) >= 0 ) - { - LOCK(cs_main); - if ( myAddtomempool(tx) != 0 ) - { - RelayTransaction(tx); - if ( retval == 0 ) - { - if ( ptr != 0 ) - ptr->revealed = (uint32_t)time(NULL); - pthread_mutex_lock(&DICEREVEALED_MUTEX); - _dicerevealed_add(entropyused,bettxid,betTx,entropyvout); - pthread_mutex_unlock(&DICEREVEALED_MUTEX); - fprintf(stderr,"added.%c to mempool.[%d] and broadcast entropyused.%s bettxid.%s -> %s\n",funcid,i,entropyused.GetHex().c_str(),bettxid.GetHex().c_str(),tx.GetHash().GetHex().c_str()); - } else fprintf(stderr,"rebroadcast.%c to mempool.[%d] and broadcast entropyused.%s bettxid.%s -> %s\n",funcid,i,entropyused.GetHex().c_str(),bettxid.GetHex().c_str(),tx.GetHash().GetHex().c_str()); - return(true); - } - else - { - RelayTransaction(tx); - fprintf(stderr,"rebroadcast.%c and clear [%d] and broadcast entropyused.%s bettxid.%s -> %s\n",funcid,i,entropyused.GetHex().c_str(),bettxid.GetHex().c_str(),tx.GetHash().GetHex().c_str()); - if ( ptr != 0 ) - { - if ( ptr->rawtx.empty() == 0 ) - ptr->rawtx.clear(); - ptr->txid = zeroid; - } - //fprintf(stderr,"error adding funcid.%c E.%s bet.%s -> %s to mempool, probably Disable replacement feature size.%d\n",funcid,entropyused.GetHex().c_str(),bettxid.GetHex().c_str(),tx.GetHash().GetHex().c_str(),(int32_t)ptr->rawtx.size()); - } - } else fprintf(stderr,"error duplicate entropyused different bettxid\n"); - } else fprintf(stderr,"error decoding hex\n"); - } - return(false); -} - -int32_t dicefinish_utxosget(int32_t &total,struct dicefinish_utxo *utxos,int32_t max,char *coinaddr) -{ - int32_t n = 0; int64_t threshold = 2 * 10000; - total = 0; - std::vector > unspentOutputs; - SetCCunspents(unspentOutputs,coinaddr,false); - { - LOCK(mempool.cs); - for (std::vector >::const_iterator it=unspentOutputs.begin(); it!=unspentOutputs.end(); it++) - { - if ( myIsutxo_spentinmempool(ignoretxid,ignorevin,it->first.txhash,(int32_t)it->first.index) == 0 ) - { - if ( it->second.satoshis < threshold || it->second.satoshis > 10*threshold ) - continue; - total++; - if ( n < max ) - { - if ( utxos != 0 ) - { - utxos[n].txid = it->first.txhash; - utxos[n].vout = (int32_t)it->first.index; - } - n++; - } - } - } - } - total -= n; - return(n); -} - -int32_t dice_betspent(char *debugstr,uint256 bettxid) -{ - CSpentIndexValue value,value2; - CSpentIndexKey key(bettxid,0); - CSpentIndexKey key2(bettxid,1); - if ( GetSpentIndex(key,value) != 0 || GetSpentIndex(key2,value2) != 0 ) - { - //fprintf(stderr,"%s txid.%s already spent\n",debugstr,bettxid.GetHex().c_str()); - return(1); - } - { - //LOCK(mempool.cs); - if ( myIsutxo_spentinmempool(ignoretxid,ignorevin,bettxid,0) != 0 || myIsutxo_spentinmempool(ignoretxid,ignorevin,bettxid,1) != 0 ) - { - fprintf(stderr,"%s bettxid.%s already spent in mempool\n",debugstr,bettxid.GetHex().c_str()); - return(-1); - } - } - return(0); -} - -void dicefinish_delete(struct dicefinish_info *ptr) -{ - pthread_mutex_lock(&DICE_MUTEX); - _dicehash_clear(ptr->bettxid); - pthread_mutex_unlock(&DICE_MUTEX); - DL_DELETE(DICEFINISH_LIST,ptr); - free(ptr); -} - -void *dicefinish(void *_ptr) -{ - std::vector mypk; struct CCcontract_info *cp,C; char name[32],coinaddr[64],CCaddr[64]; std::string res; int32_t newht,newblock,entropyvout,numblocks,lastheight=0,vin0_needed,i,n,m,num,iter,result; struct dicefinish_info *ptr,*tmp; uint32_t now; struct dicefinish_utxo *utxos; uint256 hashBlock,entropyused; CPubKey dicepk; CTransaction betTx,finishTx,tx; - mypk = Mypubkey(); - pubkey2addr(coinaddr,mypk.data()); - cp = CCinit(&C,EVAL_DICE); - dicepk = GetUnspendable(cp,0); - GetCCaddress(cp,CCaddr,GetUnspendable(cp,0)); - fprintf(stderr,"start dicefinish thread %s CCaddr.%s\n",coinaddr,CCaddr); - if ( (newht= HUSH_INSYNC) == 0 ) - sleep(7); - sleep(3); - while ( 1 ) - { - if ( newht != 0 && lastheight != newht ) - { - lastheight = newht; - newblock = 1; - fprintf(stderr,"dicefinish process lastheight.%d <- newht.%d\n",lastheight,newht); - } else newblock = 0; - now = (uint32_t)time(NULL); - for (iter=-1; iter<=1; iter+=2) - { - vin0_needed = 0; - DL_FOREACH_SAFE(DICEFINISH_LIST,ptr,tmp) - { - if ( ptr->iswin != iter ) - continue; - if ( ptr->revealed != 0 && now > ptr->revealed+3600 ) - { - fprintf(stderr,"purge %s\n",ptr->bettxid.GetHex().c_str()); - dicefinish_delete(ptr); - continue; - } - if ( ptr->bettxid_ready == 0 ) - { - if ( myGetTransaction(ptr->bettxid,betTx,hashBlock) != 0 && hashBlock != zeroid ) - ptr->bettxid_ready = (uint32_t)time(NULL); - else if ( mytxid_inmempool(ptr->bettxid) != 0 ) - ptr->bettxid_ready = (uint32_t)time(NULL); - } - else if ( newblock != 0 && (myGetTransaction(ptr->bettxid,betTx,hashBlock) == 0 || now > ptr->bettxid_ready+600) ) - { - fprintf(stderr,"ORPHANED bettxid.%s\n",ptr->bettxid.GetHex().c_str()); - dicefinish_delete(ptr); - continue; - } - else if ( newblock != 0 && ptr->txid != zeroid ) - { - if ( myGetTransaction(ptr->txid,finishTx,hashBlock) == 0 ) - { - ptr->orphaned++; - fprintf(stderr,"ORPHANED.%d finish txid.%s\n",ptr->orphaned,ptr->txid.GetHex().c_str()); - if ( ptr->orphaned < 4 ) - continue; - if ( ptr->rawtx.empty() == 0 ) - ptr->rawtx.clear(); - ptr->txid = zeroid; - unstringbits(name,ptr->sbits); - result = 0; - ptr->orphaned = 0; - res = DiceBetFinish(ptr->funcid,entropyused,entropyvout,&result,0,name,ptr->fundingtxid,ptr->bettxid,ptr->iswin,zeroid,-2); - if ( ptr->entropyused == zeroid ) - { - ptr->entropyused = entropyused; - ptr->entropyvout = entropyvout; - } - if ( entropyused != ptr->entropyused || entropyvout != ptr->entropyvout ) - { - fprintf(stderr,"WARNING entropy %s != %s || %d != %d\n",entropyused.GetHex().c_str(),ptr->entropyused.GetHex().c_str(),entropyvout,ptr->entropyvout); - } - if ( result > 0 ) - { - ptr->rawtx = res; - fprintf(stderr,"send refund!\n"); - mySenddicetransaction(ptr->rawtx,ptr->entropyused,ptr->entropyvout,ptr->bettxid,ptr->betTx,ptr->funcid,ptr); - } - dicefinish_delete(ptr); - continue; - } - } - if ( ptr->bettxid_ready != 0 ) - { - if ( now > ptr->bettxid_ready + 2*3600 ) - { - fprintf(stderr,"purge bettxid_ready %s\n",ptr->bettxid.GetHex().c_str()); - dicefinish_delete(ptr); - continue; - } - else if ( newblock != 0 ) - { - if ( ptr->txid != zeroid ) - { - CCduration(numblocks,ptr->txid); - //fprintf(stderr,"duration finish txid.%s\n",ptr->txid.GetHex().c_str()); - if ( numblocks == 0 ) - mySenddicetransaction(ptr->rawtx,ptr->entropyused,ptr->entropyvout,ptr->bettxid,ptr->betTx,ptr->funcid,ptr); - else continue; - } - } - if ( ptr->txid == zeroid ) - vin0_needed++; - } - } - if ( vin0_needed > 0 ) - { - num = 0; -//fprintf(stderr,"iter.%d vin0_needed.%d\n",iter,vin0_needed); - utxos = (struct dicefinish_utxo *)calloc(vin0_needed,sizeof(*utxos)); - if ( (n= dicefinish_utxosget(num,utxos,vin0_needed,coinaddr)) > 0 ) - { -//fprintf(stderr,"iter.%d vin0_needed.%d got %d, num 0.0002 %d\n",iter,vin0_needed,n,num); - m = 0; - DL_FOREACH_SAFE(DICEFINISH_LIST,ptr,tmp) - { - if ( ptr->iswin != iter ) - continue; - if ( ptr->revealed != 0 && time(NULL) > ptr->revealed+3600 ) - { - fprintf(stderr,"purge2 %s\n",ptr->bettxid.GetHex().c_str()); - dicefinish_delete(ptr); - continue; - } - if ( ptr->txid != zeroid ) - { - CCduration(numblocks,ptr->txid); - //fprintf(stderr,"numblocks %s %d\n",ptr->txid.GetHex().c_str(),numblocks); - if ( numblocks > 0 ) - continue; - } - if ( ptr->bettxid_ready != 0 && ptr->rawtx.size() == 0 && dice_betspent((char *)"dicefinish",ptr->bettxid) <= 0 && ptr->txid == zeroid ) - { - unstringbits(name,ptr->sbits); - result = 0; - res = DiceBetFinish(ptr->funcid,entropyused,entropyvout,&result,0,name,ptr->fundingtxid,ptr->bettxid,ptr->iswin,utxos[m].txid,utxos[m].vout); - if ( ptr->entropyused == zeroid ) - { - ptr->entropyused = entropyused; - ptr->entropyvout = entropyvout; - } - if ( entropyused != ptr->entropyused || entropyvout != ptr->entropyvout ) - { - fprintf(stderr,"WARNING entropy %s != %s || %d != %d\n",entropyused.GetHex().c_str(),ptr->entropyused.GetHex().c_str(),entropyvout,ptr->entropyvout); - } - if ( result > 0 ) - { - ptr->rawtx = res; - mySenddicetransaction(ptr->rawtx,ptr->entropyused,ptr->entropyvout,ptr->bettxid,ptr->betTx,ptr->funcid,ptr); - } - else if ( result != -2 ) - { - fprintf(stderr,"error doing the dicefinish %d of %d process %s %s using %s/v%d need %.8f\n",m,n,iter<0?"loss":"win",ptr->bettxid.GetHex().c_str(),utxos[m].txid.GetHex().c_str(),utxos[m].vout,(double)(iter<0 ? 0 : ptr->winamount)/COIN); - if ( ptr->rawtx.empty() == 0 ) - ptr->rawtx.clear(); - ptr->txid = zeroid; - } - if ( ++m >= n ) - break; - } - else - { - //fprintf(stderr,"error ready.%d dicefinish %d of %d process %s %s using need %.8f finish.%s size.%d betspent.%d\n",ptr->bettxid_ready,m,n,iter<0?"loss":"win",ptr->bettxid.GetHex().c_str(),(double)(iter<0 ? 0 : ptr->winamount)/COIN,ptr->txid.GetHex().c_str(),(int32_t)ptr->rawtx.size(),dice_betspent((char *)"dicefinish",ptr->bettxid)); - } - } - } else if ( system("cc/dapps/sendmany100") != 0 ) - fprintf(stderr,"error issing cc/dapps/sendmany100\n"); - free(utxos); - } - } - if ( (newht= HUSH_INSYNC) == 0 || newht == lastheight ) - sleep(3); - else usleep(500000); - } - return(0); -} - -void DiceQueue(int32_t iswin,uint64_t sbits,uint256 fundingtxid,uint256 bettxid,CTransaction betTx,int32_t entropyvout) -{ - static int32_t didinit; - struct dicefinish_info *ptr; int32_t i,duplicate=0; uint64_t txfee = 10000; - if ( didinit == 0 ) - { - if ( pthread_create((pthread_t *)malloc(sizeof(pthread_t)),NULL,dicefinish,0) == 0 ) - { - pthread_mutex_init(&DICE_MUTEX,NULL); - pthread_mutex_init(&DICEREVEALED_MUTEX,NULL); - didinit = 1; - } - else - { - fprintf(stderr,"error launching dicefinish thread\n"); - return; - } - } - //if ( dice_betspent((char *)"DiceQueue",bettxid) != 0 ) - // return; - pthread_mutex_lock(&DICE_MUTEX); - if ( _dicehash_find(bettxid) == 0 ) - { - _dicehash_add(bettxid); - ptr = (struct dicefinish_info *)calloc(1,sizeof(*ptr)); - ptr->fundingtxid = fundingtxid; - ptr->bettxid = bettxid; - ptr->betTx = betTx; - ptr->sbits = sbits; - ptr->iswin = iswin; - ptr->winamount = betTx.vout[1].nValue * ((betTx.vout[2].nValue - txfee)+1); - ptr->entropyvout = entropyvout; - DL_APPEND(DICEFINISH_LIST,ptr); - fprintf(stderr,"queued %dx iswin.%d %.8f -> %.8f %s\n",(int32_t)(betTx.vout[2].nValue - txfee),iswin,(double)betTx.vout[1].nValue/COIN,(double)ptr->winamount/COIN,bettxid.GetHex().c_str()); - } - else - { - //fprintf(stderr,"DiceQueue status bettxid.%s already in list\n",bettxid.GetHex().c_str()); - //_dicehash_clear(bettxid); - } - pthread_mutex_unlock(&DICE_MUTEX); -} - -CPubKey DiceFundingPk(CScript scriptPubKey) -{ - CPubKey pk; uint8_t *ptr,*dest; int32_t i; - if ( scriptPubKey.size() == 35 ) - { - dest = (uint8_t *)pk.begin(); - for (i=0; i<33; i++) - dest[i] = scriptPubKey[i+1]; - } else fprintf(stderr,"DiceFundingPk invalid size.%d\n",(int32_t)scriptPubKey.size()); - return(pk); -} - -uint256 DiceHashEntropy(uint256 &entropy,uint256 _txidpriv,int32_t vout,int32_t usevout) -{ - int32_t i; uint8_t _entropy[32],_hentropy[32]; bits256 tmp256,txidpub,txidpriv,mypriv,mypub,ssecret,ssecret2; uint256 hentropy; - memset(&hentropy,0,32); - endiancpy(txidpriv.bytes,(uint8_t *)&_txidpriv,32); - if ( usevout != 0 ) - { - txidpriv.bytes[1] ^= (vout & 0xff); - txidpriv.bytes[2] ^= ((vout>>8) & 0xff); - } - txidpriv.bytes[0] &= 0xf8, txidpriv.bytes[31] &= 0x7f, txidpriv.bytes[31] |= 0x40; - txidpub = curve25519(txidpriv,curve25519_basepoint9()); - - Myprivkey(tmp256.bytes); - vcalc_sha256(0,mypriv.bytes,tmp256.bytes,32); - mypriv.bytes[0] &= 0xf8, mypriv.bytes[31] &= 0x7f, mypriv.bytes[31] |= 0x40; - mypub = curve25519(mypriv,curve25519_basepoint9()); - - ssecret = curve25519(mypriv,txidpub); - ssecret2 = curve25519(txidpriv,mypub); - if ( memcmp(ssecret.bytes,ssecret2.bytes,32) == 0 ) - { - vcalc_sha256(0,(uint8_t *)&_entropy,ssecret.bytes,32); - vcalc_sha256(0,(uint8_t *)&_hentropy,_entropy,32); - endiancpy((uint8_t *)&entropy,_entropy,32); - endiancpy((uint8_t *)&hentropy,_hentropy,32); - } - else - { - for (i=0; i<32; i++) - fprintf(stderr,"%02x",ssecret.bytes[i]); - fprintf(stderr," ssecret\n"); - for (i=0; i<32; i++) - fprintf(stderr,"%02x",ssecret2.bytes[i]); - fprintf(stderr," ssecret2 dont match\n"); - } - memset(tmp256.bytes,0,32); - //char str[65],str2[65]; - //fprintf(stderr,"generated house hentropy.%s <- entropy.%s\n",uint256_str(str,hentropy),uint256_str(str2,entropy)); - return(hentropy); -} - -int32_t dice_5nibbles(uint8_t *fivevals) -{ - return(((int32_t)fivevals[0]<<16) + ((int32_t)fivevals[1]<<12) + ((int32_t)fivevals[2]<<8) + ((int32_t)fivevals[3]<<4) + ((int32_t)fivevals[4])); -} - -uint64_t DiceCalc(int64_t bet,int64_t vout2,int64_t minbet,int64_t maxbet,int64_t maxodds,int64_t timeoutblocks,uint256 houseentropy,uint256 bettorentropy) -{ - uint8_t buf[64],_house[32],_bettor[32],_hash[32],hash[32],hash16[64]; uint64_t odds,winnings; arith_uint256 house,bettor; char str[65],str2[65]; int32_t i,modval; - if ( vout2 <= 10000 ) - { - fprintf(stderr,"unexpected vout2.%llu\n",(long long)vout2); - return(0); - } - else odds = (vout2 - 10000); - if ( bet < minbet || bet > maxbet ) - { - CCerror = strprintf("bet size violation %.8f",(double)bet/COIN); - fprintf(stderr,"%s\n", CCerror.c_str() ); - return(0); - } - if ( odds > maxodds ) - { - CCerror = strprintf("invalid odds %d, must be <= %d",odds, maxodds); - fprintf(stderr,"%s\n", CCerror.c_str() ); - return(0); - } - - endiancpy(buf,(uint8_t *)&houseentropy,32); - endiancpy(&buf[32],(uint8_t *)&bettorentropy,32); - vcalc_sha256(0,(uint8_t *)&_house,buf,64); - endiancpy((uint8_t *)&house,_house,32); - - endiancpy(buf,(uint8_t *)&bettorentropy,32); - endiancpy(&buf[32],(uint8_t *)&houseentropy,32); - vcalc_sha256(0,(uint8_t *)&_bettor,buf,64); - endiancpy((uint8_t *)&bettor,_bettor,32); - winnings = 0; - //fprintf(stderr,"calc house entropy %s vs bettor %s\n",uint256_str(str,*(uint256 *)&house),uint256_str(str2,*(uint256 *)&bettor)); - if ( odds > 1 ) - { - if ( 0 ) - { // old way - bettor = (bettor / arith_uint256(odds)); - if ( bettor >= house ) - winnings = bet * (odds+1); - return(winnings); - } - if ( odds > 9999 ) // shouldnt happen - return(0); - endiancpy(buf,(uint8_t *)&house,32); - endiancpy(&buf[32],(uint8_t *)&bettor,32); - vcalc_sha256(0,(uint8_t *)&_hash,buf,64); - endiancpy(hash,_hash,32); - for (i=0; i<32; i++) - { - hash16[i<<1] = ((hash[i] >> 4) & 0x0f); - hash16[(i<<1) + 1] = (hash[i] & 0x0f); - } - modval = 0; - for (i=0; i<12; i++) - { - modval = dice_5nibbles(&hash16[i*5]); - if ( modval < 1000000 ) - { - modval %= 10000; - break; - } - } - //fprintf(stderr,"modval %d vs %d\n",modval,(int32_t)(10000/(odds+1))); - if ( modval < 10000/(odds+1) ) - winnings = bet * (odds+1); - } - else if ( bettor >= house ) - winnings = bet * (odds+1); - return(winnings); -} - -CScript EncodeDiceFundingOpRet(uint8_t funcid,uint64_t sbits,int64_t minbet,int64_t maxbet,int64_t maxodds,int64_t timeoutblocks) -{ - CScript opret; uint8_t evalcode = EVAL_DICE; - opret << OP_RETURN << E_MARSHAL(ss << evalcode << 'F' << sbits << minbet << maxbet << maxodds << timeoutblocks); - return(opret); -} - -uint8_t DecodeDiceFundingOpRet(const CScript &scriptPubKey,uint64_t &sbits,int64_t &minbet,int64_t &maxbet,int64_t &maxodds,int64_t &timeoutblocks) -{ - std::vector vopret; uint8_t *script,e,f; - GetOpReturnData(scriptPubKey, vopret); - script = (uint8_t *)vopret.data(); - if ( vopret.size() > 2 && E_UNMARSHAL(vopret,ss >> e; ss >> f; ss >> sbits; ss >> minbet; ss >> maxbet; ss >> maxodds; ss >> timeoutblocks) != 0 ) - { - if ( e == EVAL_DICE && f == 'F' ) - return(f); - } - return(0); -} - -CScript EncodeDiceOpRet(uint8_t funcid,uint64_t sbits,uint256 fundingtxid,uint256 hash,uint256 proof) -{ - CScript opret; uint8_t evalcode = EVAL_DICE; - opret << OP_RETURN << E_MARSHAL(ss << evalcode << funcid << sbits << fundingtxid << hash << proof); - return(opret); -} - -uint8_t DecodeDiceOpRet(uint256 txid,const CScript &scriptPubKey,uint64_t &sbits,uint256 &fundingtxid,uint256 &hash,uint256 &proof) -{ - std::vector vopret; uint8_t *script,e,f,funcid; int64_t minbet,maxbet,maxodds,timeoutblocks; - //script = (uint8_t *)scriptPubKey.data(); - //fprintf(stderr,"decode %02x %02x %02x\n",script[0],script[1],script[2]); - GetOpReturnData(scriptPubKey,vopret); - if ( vopret.size() > 2 )//&& script[0] == 0x6a ) - { - script = (uint8_t *)vopret.data(); - if ( script[0] == EVAL_DICE ) - { - if ( script[1] == 'F' ) - { - if ( E_UNMARSHAL(vopret,ss >> e; ss >> f; ss >> sbits; ss >> minbet; ss >> maxbet; ss >> maxodds; ss >> timeoutblocks) != 0 ) - { - memset(&hash,0,32); - fundingtxid = txid; - return('F'); - } else fprintf(stderr,"unmarshal error for F\n"); - } - else if ( E_UNMARSHAL(vopret,ss >> e; ss >> f; ss >> sbits; ss >> fundingtxid; ss >> hash; ss >> proof) != 0 ) - { - if ( e == EVAL_DICE && (f == 'R' || f == 'B' || f == 'W' || f == 'L' || f == 'T' || f == 'E') ) - return(f); - else fprintf(stderr,"mismatched e.%02x f.(%c)\n",e,f); - } - } else fprintf(stderr,"script[0] %02x != EVAL_DICE\n",script[0]); - } else fprintf(stderr,"not enough opret.[%d]\n",(int32_t)vopret.size()); - return(0); -} - -uint256 DiceGetEntropy(CTransaction tx,uint8_t reffuncid) -{ - uint256 hash,fundingtxid,proof; uint64_t sbits; int32_t numvouts; - if ( (numvouts= tx.vout.size()) > 0 && DecodeDiceOpRet(tx.GetHash(),tx.vout[numvouts-1].scriptPubKey,sbits,fundingtxid,hash,proof) == reffuncid ) - return(hash); - else return(zeroid); -} - -uint64_t IsDicevout(struct CCcontract_info *cp,const CTransaction& tx,int32_t v,uint64_t refsbits,uint256 reffundingtxid) -{ - char destaddr[64]; uint8_t funcid; int32_t numvouts; uint64_t sbits; uint256 fundingtxid,hash,proof; - if ( tx.vout[v].scriptPubKey.IsPayToCryptoCondition() != 0 ) - { - if ( Getscriptaddress(destaddr,tx.vout[v].scriptPubKey) > 0 && strcmp(destaddr,cp->unspendableCCaddr) == 0 && (numvouts= tx.vout.size()) > 0 ) - { - if ( (funcid= DecodeDiceOpRet(tx.GetHash(),tx.vout[numvouts-1].scriptPubKey,sbits,fundingtxid,hash,proof)) != 0 && sbits == refsbits && ((funcid == 'F' && tx.GetHash() == reffundingtxid) || fundingtxid == reffundingtxid) ) - return(tx.vout[v].nValue); - } - } - return(0); -} - -int64_t DiceAmounts(uint64_t &inputs,uint64_t &outputs,struct CCcontract_info *cp,Eval *eval,const CTransaction &tx,uint64_t refsbits,uint256 reffundingtxid) -{ - CTransaction vinTx; uint256 hashBlock; int32_t i,numvins,numvouts; uint64_t assetoshis; - numvins = tx.vin.size(); - numvouts = tx.vout.size(); - inputs = outputs = 0; - for (i=0; iismyvin)(tx.vin[i].scriptSig) != 0 ) - { - if ( eval->GetTxUnconfirmed(tx.vin[i].prevout.hash,vinTx,hashBlock) == 0 ) - return eval->Invalid("always should find vin, but didnt"); - else - { - if ( (assetoshis= IsDicevout(cp,vinTx,(int32_t)tx.vin[i].prevout.n,refsbits,reffundingtxid)) != 0 ) - inputs += assetoshis; - } - } - } - for (i=0; i 1 && DiceIsmine(vinTx.vout[1].scriptPubKey) != 0 && vinTx.vout[0].scriptPubKey.IsPayToCryptoCondition() != 0 ) - { - if ( ((funcid= DecodeDiceOpRet(txid,vinTx.vout[vinTx.vout.size()-1].scriptPubKey,vinsbits,vinfundingtxid,hentropy,vinproof)) == 'E' || funcid == 'W' || funcid == 'L') && sbits == vinsbits && fundingtxid == vinfundingtxid ) - { - hentropy2 = DiceHashEntropy(entropy,vinTx.vin[0].prevout.hash,vinTx.vin[0].prevout.n,0); - entropyvout = vinTx.vin[0].prevout.n; - //fprintf(stderr,"bettxid %s -> vin0 %s/v%d -> %s\n",txid.GetHex().c_str(),vinTx.vin[0].prevout.hash.GetHex().c_str(),entropyvout,entropy.GetHex().c_str()); - if ( hentropy != hentropy2 ) - { - hentropy2 = DiceHashEntropy(entropy,vinTx.vin[0].prevout.hash,vinTx.vin[0].prevout.n,1); - //fprintf(stderr,"alt bettxid %s -> vin0 %s/v%d -> %s\n",txid.GetHex().c_str(),vinTx.vin[0].prevout.hash.GetHex().c_str(),entropyvout,entropy.GetHex().c_str()); - } - if ( hentropy == hentropy2 ) - { - winnings = DiceCalc(tx.vout[1].nValue,tx.vout[2].nValue,minbet,maxbet,maxodds,timeoutblocks,entropy,bettorentropy); - //char str[65]; fprintf(stderr,"%s winnings %.8f bet %.8f at odds %d:1\n",uint256_str(str,tx.GetHash()),(double)winnings/COIN,(double)tx.vout[1].nValue/COIN,(int32_t)(tx.vout[2].nValue-10000)); - //fprintf(stderr,"I am house entropy %.8f entropy.(%s) vs %s -> winnings %.8f\n",(double)vinTx.vout[0].nValue/COIN,uint256_str(str,entropy),uint256_str(str2,hash),(double)winnings/COIN); - if ( winnings == 0 ) - { - // queue 'L' losing tx - return(-1); - } - else - { - // queue 'W' winning tx - return(1); - } - } - else - { - fprintf(stderr,"both hentropy != hentropy2\n"); - } - } else fprintf(stderr,"funcid.%c sbits %llx vs %llx cmp.%d\n",funcid,(long long)sbits,(long long)vinsbits,fundingtxid == vinfundingtxid); - } //else fprintf(stderr,"notmine.%d or not CC.%d\n",DiceIsmine(vinTx.vout[1].scriptPubKey) != 0,vinTx.vout[0].scriptPubKey.IsPayToCryptoCondition() != 0); - return(0); -} - -bool DiceVerifyTimeout(CTransaction &betTx,int32_t timeoutblocks) -{ - int32_t numblocks; - if ( CCduration(numblocks,betTx.GetHash()) <= 0 ) - return(false); - return(numblocks >= timeoutblocks); -} - -bool DiceValidate(struct CCcontract_info *cp,Eval *eval,const CTransaction &tx, uint32_t nIn) -{ - uint256 txid,fundingtxid,vinfundingtxid,vinhentropy,vinproof,hashBlock,hash,proof,entropy; int64_t minbet,maxbet,maxodds,timeoutblocks,odds,winnings; uint64_t vinsbits,refsbits=0,sbits,amount,inputs,outputs,txfee=10000; int32_t numvins,entropyvout,numvouts,preventCCvins,preventCCvouts,i,iswin; uint8_t funcid; CScript fundingPubKey; CTransaction fundingTx,vinTx,vinofvinTx; char CCaddr[64]; - numvins = tx.vin.size(); - numvouts = tx.vout.size(); - preventCCvins = preventCCvouts = -1; - if ( numvouts < 1 ) - return eval->Invalid("no vouts"); - else - { - txid = tx.GetHash(); - if ( (funcid= DecodeDiceOpRet(txid,tx.vout[numvouts-1].scriptPubKey,refsbits,fundingtxid,hash,proof)) != 0 ) - { - if ( eval->GetTxUnconfirmed(fundingtxid,fundingTx,hashBlock) == 0 ) - return eval->Invalid("cant find fundingtxid"); - else if ( fundingTx.vout.size() > 0 && DecodeDiceFundingOpRet(fundingTx.vout[fundingTx.vout.size()-1].scriptPubKey,sbits,minbet,maxbet,maxodds,timeoutblocks) != 'F' ) - return eval->Invalid("fundingTx not valid"); - if ( maxodds > 9999 ) - return eval->Invalid("maxodds too big"); - fundingPubKey = fundingTx.vout[1].scriptPubKey; - if ( sbits != refsbits ) - { - fprintf(stderr,"VALIDATION ERROR: sbits %llx != refsbits %llx\n",(long long)sbits,(long long)refsbits); - //return eval->Invalid("mismatched diceplan"); - } - switch ( funcid ) - { - case 'F': - //vins.*: normal inputs - //vout.0: CC vout for funding - //vout.1: normal marker vout for easy searching - //vout.2: normal change - //vout.n-1: opreturn 'F' sbits minbet maxbet maxodds timeoutblocks - return eval->Invalid("unexpected DiceValidate for createfunding"); - break; - case 'E': // check sig of vin to match fundingtxid in the 'B' tx - //vins.*: normal inputs - //vout.0: CC vout for locked entropy funds - //vout.1: tag to owner address for entropy funds - //vout.2: normal change - //vout.n-1: opreturn 'E' sbits fundingtxid hentropy - return eval->Invalid("unexpected DiceValidate for addfunding entropy"); - break; - case 'B': - //vin.0: entropy txid from house - //vins.1+: normal inputs - //vout.0: CC vout for locked entropy - //vout.1: CC vout for locked bet - //vout.2: tag for bettor's address (txfee + odds) - //vout.3: change - //vout.n-1: opreturn 'B' sbits fundingtxid entropy - preventCCvouts = 2; - preventCCvins = 1; - if ( IsCCInput(tx.vin[0].scriptSig) == 0 ) - return eval->Invalid("vin.0 is normal for bet"); - else if ( tx.vout[0].scriptPubKey.IsPayToCryptoCondition() == 0 ) - return eval->Invalid("vout.0 is normal for bet"); - else if ( tx.vout[1].scriptPubKey.IsPayToCryptoCondition() == 0 ) - return eval->Invalid("vout.1 is normal for bet"); - else if ( eval->GetTxUnconfirmed(tx.vin[0].prevout.hash,vinTx,hashBlock) == 0 ) - return eval->Invalid("always should find vin.0, but didnt for bet"); - else if ( vinTx.vout[1].scriptPubKey != fundingPubKey ) - return eval->Invalid("entropy tx not fundingPubKey for bet"); - else if ( ConstrainVout(tx.vout[0],1,cp->unspendableCCaddr,(int64_t)vinTx.vout[tx.vin[0].prevout.n].nValue) == 0 ) - { - fprintf(stderr,"%s prevout.%d %.8f\n",tx.vin[0].prevout.hash.GetHex().c_str(),(int32_t)tx.vin[0].prevout.n,(double)vinTx.vout[tx.vin[0].prevout.n].nValue/COIN); - return eval->Invalid("vout[0] != entropy nValue for bet"); - } - else if ( ConstrainVout(tx.vout[1],1,cp->unspendableCCaddr,0) == 0 ) - return eval->Invalid("vout[1] constrain violation for bet"); - else if ( tx.vout[2].nValue > txfee+maxodds || tx.vout[2].nValue <= txfee ) - return eval->Invalid("vout[2] nValue violation for bet"); - else if ( eval->GetTxUnconfirmed(vinTx.vin[0].prevout.hash,vinofvinTx,hashBlock) == 0 || vinofvinTx.vout.size() < 1 ) - return eval->Invalid("always should find vinofvin.0, but didnt for bet"); - else if ( vinTx.vin[0].prevout.hash != fundingtxid ) - { - if ( (int32_t)vinTx.vin[0].prevout.n < 0 || vinofvinTx.vout[vinTx.vin[0].prevout.n].scriptPubKey != fundingPubKey ) - { - uint8_t *ptr0,*ptr1; int32_t i; char str[65],addr0[64],addr1[64]; - Getscriptaddress(addr0,vinofvinTx.vout[vinTx.vin[0].prevout.n].scriptPubKey); - Getscriptaddress(addr1,fundingPubKey); - if ( strcmp(addr0,addr1) != 0 ) - { - fprintf(stderr,"%s != %s betTx.%s\n",addr0,addr1,uint256_str(str,txid)); - fprintf(stderr,"entropyTx.%s v%d\n",uint256_str(str,tx.vin[0].prevout.hash),(int32_t)tx.vin[0].prevout.n); - fprintf(stderr,"entropyTx vin0 %s v%d\n",uint256_str(str,vinTx.vin[0].prevout.hash),(int32_t)vinTx.vin[0].prevout.n); - ptr0 = (uint8_t *)&vinofvinTx.vout[vinTx.vin[0].prevout.n].scriptPubKey[0]; - ptr1 = (uint8_t *)&fundingPubKey[0]; - for (i=0; iInvalid("vin1 of entropy tx not fundingPubKey for bet"); - } - } - } - if ( (iswin= DiceIsWinner(entropy,entropyvout,txid,tx,vinTx,hash,sbits,minbet,maxbet,maxodds,timeoutblocks,fundingtxid)) != 0 ) - { - // will only happen for fundingPubKey - if ( HUSH_INSYNC != 0 && HUSH_DEALERNODE != 0 ) - DiceQueue(iswin,sbits,fundingtxid,txid,tx,entropyvout); - } - else - { - //fprintf(stderr,"why does node1 get VALIDATION ERROR: invalid dicebet bettxid %s\n",txid.GetHex().c_str()); - //return eval->Invalid("invalid dicebet bettxid"); - } - break; - // make sure all funding txid are from matching sbits and fundingtxid!! - case 'L': - case 'W': - case 'T': - //vin.0: normal input - //vin.1: betTx CC vout.0 entropy from bet - //vin.2: betTx CC vout.1 bet amount from bet - //vin.3+: funding CC vout.0 from 'F', 'E', 'W', 'L' or 'T' - //vout.1: tag to owner address for entropy funds - preventCCvouts = 1; - DiceAmounts(inputs,outputs,cp,eval,tx,sbits,fundingtxid); - if ( IsCCInput(tx.vin[1].scriptSig) == 0 || IsCCInput(tx.vin[2].scriptSig) == 0 ) - return eval->Invalid("vin0 or vin1 normal vin for bet"); - else if ( tx.vin[1].prevout.hash != tx.vin[2].prevout.hash ) - return eval->Invalid("vin0 != vin1 prevout.hash for bet"); - else if ( eval->GetTxUnconfirmed(tx.vin[1].prevout.hash,vinTx,hashBlock) == 0 ) - return eval->Invalid("always should find vin.0, but didnt for wlt"); - else if ( vinTx.vout.size() < 3 || DecodeDiceOpRet(tx.vin[1].prevout.hash,vinTx.vout[vinTx.vout.size()-1].scriptPubKey,vinsbits,vinfundingtxid,vinhentropy,vinproof) != 'B' ) - return eval->Invalid("not betTx for vin0/1 for wlt"); - else if ( sbits != vinsbits || fundingtxid != vinfundingtxid ) - return eval->Invalid("sbits or fundingtxid mismatch for wlt"); - else if ( fundingPubKey != tx.vout[1].scriptPubKey ) - return eval->Invalid("tx.vout[1] != fundingPubKey for wlt"); - if ( funcid == 'L' ) - { - //vout.0: funding CC to entropy owner - //vout.n-1: opreturn 'L' sbits fundingtxid hentropy proof - if ( ConstrainVout(tx.vout[0],1,cp->unspendableCCaddr,inputs) == 0 ) - return eval->Invalid("vout[0] != inputs-txfee for loss"); - else if ( tx.vout[2].scriptPubKey != fundingPubKey ) - { - if ( tx.vout[2].scriptPubKey.size() == 0 || tx.vout[2].scriptPubKey[0] != 0x6a ) - return eval->Invalid("vout[2] not send to fundingPubKey for loss"); - } - iswin = -1; - } - else - { - //vout.0: funding CC change to entropy owner - //vout.2: normal output to bettor's address - //vout.n-1: opreturn 'W' sbits fundingtxid hentropy proof - odds = vinTx.vout[2].nValue - txfee; - if ( ConstrainVout(tx.vout[0],1,cp->unspendableCCaddr,0) == 0 ) - return eval->Invalid("vout[0] != inputs-txfee for win/timeout"); - else if ( tx.vout[2].scriptPubKey != vinTx.vout[2].scriptPubKey ) - return eval->Invalid("vout[2] scriptPubKey mismatch for win/timeout"); - else if ( tx.vout[2].nValue != (odds+1)*vinTx.vout[1].nValue ) - return eval->Invalid("vout[2] payut mismatch for win/timeout"); - else if ( inputs != (outputs + tx.vout[2].nValue) && inputs != (outputs + tx.vout[2].nValue+txfee) ) - { - fprintf(stderr,"inputs %.8f != outputs %.8f (%.8f %.8f %.8f %.8f)\n",(double)inputs/COIN,(double)outputs/COIN,(double)tx.vout[0].nValue/COIN,(double)tx.vout[1].nValue/COIN,(double)tx.vout[2].nValue/COIN,(double)tx.vout[3].nValue/COIN); - return eval->Invalid("CC funds mismatch for win/timeout"); - } - else if ( tx.vout[3].scriptPubKey != fundingPubKey ) - { - if ( tx.vout[3].scriptPubKey.size() == 0 || tx.vout[3].scriptPubKey[0] != 0x6a ) - return eval->Invalid("vout[3] not send to fundingPubKey for win/timeout"); - } - iswin = (funcid == 'W'); - } - if ( iswin != 0 ) - { - //char str[65],str2[65]; - entropy = DiceGetEntropy(vinTx,'B'); - vcalc_sha256(0,(uint8_t *)&hash,(uint8_t *)&proof,32); - //fprintf(stderr,"calculated house hentropy.%s\n",uint256_str(str,hash)); - //fprintf(stderr,"verify house entropy %s vs bettor %s\n",uint256_str(str,proof),uint256_str(str2,entropy)); - winnings = DiceCalc(vinTx.vout[1].nValue,vinTx.vout[2].nValue,minbet,maxbet,maxodds,timeoutblocks,proof,entropy); - if ( (winnings == 0 && iswin > 0) || (winnings > 0 && iswin < 0) ) - return eval->Invalid("DiceCalc mismatch for win/loss"); - } - else if ( DiceVerifyTimeout(vinTx,timeoutblocks) == 0 ) - return eval->Invalid("invalid timeout claim for timeout"); - break; - case 'R': - if ( eval->GetTxUnconfirmed(tx.vin[0].prevout.hash,vinTx,hashBlock) == 0 ) - return eval->Invalid("always should find vin.0, but didnt for refund"); - else if ( vinTx.vout[tx.vin[0].prevout.n].scriptPubKey != fundingPubKey ) - { - char fundingaddr[64],cmpaddr[64]; - Getscriptaddress(fundingaddr,fundingPubKey); - Getscriptaddress(cmpaddr,vinTx.vout[tx.vin[0].prevout.n].scriptPubKey); - if ( strcmp(cmpaddr,fundingaddr) != 0 ) - { - fprintf(stderr,"cmpaddr.%s != fundingaddr.%s\n",cmpaddr,fundingaddr); - return eval->Invalid("vin.0 not from fundingPubKey for refund"); - } - } - if ( (rand() % 1000) == 0 ) - fprintf(stderr,"add more validation for refunds\n"); - break; - default: - fprintf(stderr,"illegal dice funcid.(%c)\n",funcid); - return eval->Invalid("unexpected dice funcid"); - break; - } - } else return eval->Invalid("unexpected dice missing funcid"); - return(PreventCC(eval,tx,preventCCvins,numvins,preventCCvouts,numvouts)); - } - return(true); -} - -uint64_t AddDiceInputs(struct CCcontract_info *cp,CMutableTransaction &mtx,CPubKey pk,uint64_t total,int32_t maxinputs,uint64_t refsbits,uint256 reffundingtxid) -{ - char coinaddr[64],str[65]; uint64_t threshold,sbits,nValue,totalinputs = 0; uint256 txid,hash,proof,hashBlock,fundingtxid; CTransaction tx; int32_t j,vout,n = 0; uint8_t funcid; - std::vector > unspentOutputs; - GetCCaddress(cp,coinaddr,pk); - SetCCunspents(unspentOutputs,coinaddr,true); - if ( maxinputs > CC_MAXVINS ) - maxinputs = CC_MAXVINS; - if ( maxinputs > 0 ) - threshold = total / maxinputs; - else threshold = total; - for (std::vector >::const_iterator it=unspentOutputs.begin(); it!=unspentOutputs.end(); it++) - { - txid = it->first.txhash; - vout = (int32_t)it->first.index; - if ( vout != 0 || it->second.satoshis < threshold ) - continue; - //fprintf(stderr,"(%s) %s/v%d %.8f\n",coinaddr,uint256_str(str,txid),vout,(double)it->second.satoshis/COIN); - for (j=0; j 0 && tx.vout[vout].scriptPubKey.IsPayToCryptoCondition() != 0 && myIsutxo_spentinmempool(ignoretxid,ignorevin,txid,vout) == 0 ) - { - if ( (funcid= DecodeDiceOpRet(txid,tx.vout[tx.vout.size()-1].scriptPubKey,sbits,fundingtxid,hash,proof)) != 0 ) - { - char str[65],sstr[16]; - unstringbits(sstr,sbits); - if ( sbits == refsbits && (funcid == 'F' && reffundingtxid == txid) || reffundingtxid == fundingtxid ) - { - if ( funcid == 'R' || funcid == 'F' || funcid == 'E' || funcid == 'W' || funcid == 'L' || funcid == 'T' ) - { - if ( total != 0 && maxinputs != 0 ) - { - if ( funcid == 'R' ) - fprintf(stderr,">>>>>>>>>>>> use (%c) %.8f %s %s/v%d\n",funcid,(double)tx.vout[0].nValue/COIN,sstr,uint256_str(str,txid),vout); - mtx.vin.push_back(CTxIn(txid,vout,CScript())); - } - totalinputs += it->second.satoshis; - n++; - if ( (total > 0 && totalinputs >= total) || (maxinputs > 0 && n >= maxinputs) ) - break; - } - } - } else fprintf(stderr,"null funcid\n"); - } - } - return(totalinputs); -} - -int64_t DicePlanFunds(uint64_t &entropyval,uint256 &entropytxid,uint64_t refsbits,struct CCcontract_info *cp,CPubKey dicepk,uint256 reffundingtxid, int32_t &entropytxs,bool random) -{ - char coinaddr[64],str[65]; uint64_t sbits; int64_t nValue,sum,totalinputs = 0; uint256 hash,txid,proof,hashBlock,fundingtxid; CScript fundingPubKey; CTransaction tx,vinTx; int32_t vout,first=0,n=0,i=0,pendingbets=0; uint8_t funcid; - std::vector > unspentOutputs; - entropyval = 0; - entropytxid = zeroid; - if ( myGetTransaction(reffundingtxid,tx,hashBlock) != 0 && tx.vout.size() > 1 && ConstrainVout(tx.vout[0],1,cp->unspendableCCaddr,0) != 0 ) - { - fundingPubKey = tx.vout[1].scriptPubKey; - } else return(0); - GetCCaddress(cp,coinaddr,dicepk); - SetCCunspents(unspentOutputs,coinaddr,true); - entropyval = 0; - int loops = 0; - int numtxs = unspentOutputs.size()/2; - int startfrom = rand() % (numtxs+1); - for (std::vector >::const_iterator it=unspentOutputs.begin(); it!=unspentOutputs.end(); it++) - { - txid = it->first.txhash; - vout = (int32_t)it->first.index; - if ( vout != 0 ) - continue; - sum += it->second.satoshis; - loops++; - if (random) { - if ( loops < startfrom ) - continue; - if ( (rand() % 100) < 90 ) - continue; - } - if ( myGetTransaction(txid,tx,hashBlock) != 0 && tx.vout[vout].scriptPubKey.IsPayToCryptoCondition() != 0 ) - { - if ( (funcid= DecodeDiceOpRet(txid,tx.vout[tx.vout.size()-1].scriptPubKey,sbits,fundingtxid,hash,proof)) != 0 && sbits == refsbits ) - { - if ( funcid == 'B' ) - { - pendingbets++; - fprintf(stderr,"%d: %s/v%d (%c %.8f) %.8f %.8f\n",n,uint256_str(str,txid),vout,funcid,(double)it->second.satoshis/COIN,(double)totalinputs/COIN,(double)sum/COIN); - } - if ( (funcid == 'F' && reffundingtxid == txid) || reffundingtxid == fundingtxid ) - { - //fprintf(stderr,"%d: %s/v%d (%c %.8f) %.8f %.8f\n",n,uint256_str(str,txid),vout,funcid,(double)it->second.satoshis/COIN,(double)totalinputs/COIN,(double)sum/COIN); - if ( (nValue= IsDicevout(cp,tx,vout,refsbits,reffundingtxid)) >= 10000 && (funcid == 'R' || funcid == 'F' || funcid == 'E' || funcid == 'W' || funcid == 'L' || funcid == 'T') ) - { - if ( funcid == 'L' || funcid == 'W' || funcid == 'E' ) - n++; - totalinputs += nValue; - if ( first == 0 && (funcid == 'E' || funcid == 'W' || funcid == 'L') ) - { - //fprintf(stderr,"check first\n"); - if ( tx.vout.size() > 1 && fundingPubKey == tx.vout[1].scriptPubKey ) - { - if ( myGetTransaction(tx.vin[0].prevout.hash,vinTx,hashBlock) == 0 || (int32_t)tx.vin[0].prevout.n < 0 ) - { - fprintf(stderr,"cant find entropy vin0 %s or vin0prev %d vouts[%d], iscoinbase.%d\n",uint256_str(str,tx.vin[0].prevout.hash),(int32_t)tx.vin[0].prevout.n,(int32_t)vinTx.vout.size(),(int32_t)vinTx.vin.size()); - continue; - } - if ( (int32_t)vinTx.vin[0].prevout.n < 0 || vinTx.vout.size() < 2 ) - { - fprintf(stderr,"skip coinbase or strange entropy tx\n"); - continue; - } - //if ( fundingtxid != tx.vin[0].prevout.hash && vinTx.vout[tx.vin[0].prevout.n].scriptPubKey != fundingPubKey ) - if ( fundingtxid != tx.vin[0].prevout.hash && vinTx.vout[1].scriptPubKey != fundingPubKey ) - { - uint8_t *ptr0,*ptr1; int32_t i; char str[65],addr0[64],addr1[64]; - Getscriptaddress(addr0,vinTx.vout[1].scriptPubKey); - Getscriptaddress(addr1,fundingPubKey); - if ( strcmp(addr0,addr1) != 0 ) - { - ptr0 = (uint8_t *)&vinTx.vout[1].scriptPubKey[0]; - ptr1 = (uint8_t *)&fundingPubKey[0]; - for (i=0; i txids; - GetCCaddress(cp,CCaddr,dicepk); - SetCCtxids(txids,cp->normaladdr,false,cp->evalcode,zeroid,'F'); - if ( fundingtxid != zeroid ) // avoid scan unless creating new funding plan - { - //fprintf(stderr,"check fundingtxid\n"); - if ( myGetTransaction(fundingtxid,tx,hashBlock) != 0 && tx.vout.size() > 1 && ConstrainVout(tx.vout[0],1,CCaddr,0) != 0 ) - { - if ( DecodeDiceFundingOpRet(tx.vout[tx.vout.size()-1].scriptPubKey,sbits,minbet,maxbet,maxodds,timeoutblocks) == 'F' && sbits == refsbits ) - { - fundingPubKey = tx.vout[1].scriptPubKey; - return(true); - } else fprintf(stderr,"error decoding opret or sbits mismatch %llx vs %llx\n",(long long)sbits,(long long)refsbits); - } else fprintf(stderr,"couldnt get funding tx\n"); - return(false); - } - for (std::vector::const_iterator it=txids.begin(); it!=txids.end(); it++) - { - txid = *it; - if ( fundingtxid != zeroid && txid != fundingtxid ) - continue; - if ( myGetTransaction(txid,tx,hashBlock) != 0 && tx.vout.size() > 0 && ConstrainVout(tx.vout[0],1,CCaddr,0) != 0 ) - { - if ( DecodeDiceFundingOpRet(tx.vout[tx.vout.size()-1].scriptPubKey,sbits,minbet,maxbet,maxodds,timeoutblocks) == 'F' ) - { - if ( sbits == refsbits ) - { - fundingPubKey = tx.vout[1].scriptPubKey; - fundingtxid = txid; - return(true); - } - } - } - } - return(false); -} - -struct CCcontract_info *Diceinit(CScript &fundingPubKey,uint256 reffundingtxid,struct CCcontract_info *C,char *planstr,uint64_t &txfee,CPubKey &mypk,CPubKey &dicepk,uint64_t &sbits,int64_t &minbet,int64_t &maxbet,int64_t &maxodds,int64_t &timeoutblocks) -{ - struct CCcontract_info *cp; int32_t cmpflag; - cp = CCinit(C,EVAL_DICE); - if ( txfee == 0 ) - txfee = 10000; - mypk = pubkey2pk(Mypubkey()); - dicepk = GetUnspendable(cp,0); - sbits = stringbits(planstr); - if ( reffundingtxid == zeroid ) - cmpflag = 0; - else cmpflag = 1; - if ( DicePlanExists(fundingPubKey,reffundingtxid,cp,sbits,dicepk,minbet,maxbet,maxodds,timeoutblocks) != cmpflag ) - { - fprintf(stderr,"Dice plan (%s) exists.%d vs cmpflag.%d\n",planstr,!cmpflag,cmpflag); - return(0); - } - return(cp); -} - -UniValue DiceInfo(uint256 diceid) -{ - UniValue result(UniValue::VOBJ); CPubKey dicepk; uint256 hashBlock,entropytxid; CTransaction vintx; int64_t minbet,maxbet,maxodds,timeoutblocks; uint64_t sbits,funding,entropyval; char str[67],numstr[65]; struct CCcontract_info *cp,C; - if ( myGetTransaction(diceid,vintx,hashBlock) == 0 ) - { - fprintf(stderr,"cant find fundingtxid\n"); - ERR_RESULT("cant find fundingtxid"); - return(result); - } - if ( vintx.vout.size() > 0 && DecodeDiceFundingOpRet(vintx.vout[vintx.vout.size()-1].scriptPubKey,sbits,minbet,maxbet,maxodds,timeoutblocks) == 0 ) - { - fprintf(stderr,"fundingtxid isnt dice creation txid\n"); - ERR_RESULT("fundingtxid isnt dice creation txid"); - return(result); - } - result.push_back(Pair("result","success")); - result.push_back(Pair("fundingtxid",uint256_str(str,diceid))); - unstringbits(str,sbits); - result.push_back(Pair("name",str)); - result.push_back(Pair("sbits",sbits)); - sprintf(numstr,"%.8f",(double)minbet/COIN); - result.push_back(Pair("minbet",numstr)); - sprintf(numstr,"%.8f",(double)maxbet/COIN); - result.push_back(Pair("maxbet",numstr)); - result.push_back(Pair("maxodds",maxodds)); - result.push_back(Pair("timeoutblocks",timeoutblocks)); - cp = CCinit(&C,EVAL_DICE); - dicepk = GetUnspendable(cp,0); - int32_t entropytxs; - funding = DicePlanFunds(entropyval,entropytxid,sbits,cp,dicepk,diceid,entropytxs,false); - sprintf(numstr,"%.8f",(double)funding/COIN); - result.push_back(Pair("funding",numstr)); - result.push_back(Pair("entropytxs",entropytxs)); - return(result); -} - -UniValue DiceList() -{ - UniValue result(UniValue::VARR); std::vector txids; struct CCcontract_info *cp,C; uint256 txid,hashBlock; CTransaction vintx; uint64_t sbits; int64_t minbet,maxbet,maxodds,timeoutblocks; char str[65]; - cp = CCinit(&C,EVAL_DICE); - SetCCtxids(txids,cp->normaladdr,false,cp->evalcode,zeroid,'F'); - for (std::vector::const_iterator it=txids.begin(); it!=txids.end(); it++) - { - txid = *it; - if ( myGetTransaction(txid,vintx,hashBlock) != 0 ) - { - if ( vintx.vout.size() > 0 && DecodeDiceFundingOpRet(vintx.vout[vintx.vout.size()-1].scriptPubKey,sbits,minbet,maxbet,maxodds,timeoutblocks) != 0 ) - { - result.push_back(uint256_str(str,txid)); - } - } - } - return(result); -} - -std::string DiceCreateFunding(uint64_t txfee,char *planstr,int64_t funds,int64_t minbet,int64_t maxbet,int64_t maxodds,int64_t timeoutblocks) -{ - CMutableTransaction mtx = CreateNewContextualCMutableTransaction(Params().GetConsensus(), hush_nextheight()); - uint256 zero; CScript fundingPubKey; CPubKey mypk,dicepk; int64_t a,b,c,d; uint64_t sbits; struct CCcontract_info *cp,C; - if ( funds < 0 || minbet < 0 || maxbet < 0 || maxodds < 1 || maxodds > 9999 || timeoutblocks < 0 || timeoutblocks > 1440 ) - { - CCerror = "invalid parameter error"; - fprintf(stderr,"%s\n", CCerror.c_str() ); - return(""); - } - if ( funds < 100*COIN ) - { - CCerror = "dice plan needs at least 100 coins"; - fprintf(stderr,"%s\n", CCerror.c_str() ); - return(""); - } - memset(&zero,0,sizeof(zero)); - if ( (cp= Diceinit(fundingPubKey,zero,&C,planstr,txfee,mypk,dicepk,sbits,a,b,c,d)) == 0 ) - { - CCerror = "Diceinit error in create funding, is your transaction confirmed?"; - fprintf(stderr,"%s\n", CCerror.c_str() ); - return(""); - } - if ( AddNormalinputs(mtx,mypk,funds+3*txfee,60) > 0 ) - { - mtx.vout.push_back(MakeCC1vout(cp->evalcode,funds,dicepk)); - mtx.vout.push_back(CTxOut(txfee,CScript() << ParseHex(HexStr(mypk)) << OP_CHECKSIG)); - mtx.vout.push_back(CTxOut(txfee,CScript() << ParseHex(HexStr(dicepk)) << OP_CHECKSIG)); - return(FinalizeCCTx(0,cp,mtx,mypk,txfee,EncodeDiceFundingOpRet('F',sbits,minbet,maxbet,maxodds,timeoutblocks))); - } - CCerror = "cant find enough inputs"; - fprintf(stderr,"%s\n", CCerror.c_str() ); - return(""); -} - -std::string DiceAddfunding(uint64_t txfee,char *planstr,uint256 fundingtxid,int64_t amount) -{ - CMutableTransaction mtx = CreateNewContextualCMutableTransaction(Params().GetConsensus(), hush_nextheight()); - CScript fundingPubKey,scriptPubKey; uint256 entropy,hentropy; CPubKey mypk,dicepk; uint64_t sbits; struct CCcontract_info *cp,C; int64_t minbet,maxbet,maxodds,timeoutblocks; - if ( amount < 0 ) - { - CCerror = "amount must be positive"; - fprintf(stderr,"%s\n", CCerror.c_str() ); - return(""); - } - if ( (cp= Diceinit(fundingPubKey,fundingtxid,&C,planstr,txfee,mypk,dicepk,sbits,minbet,maxbet,maxodds,timeoutblocks)) == 0 ) { - CCerror = "Diceinit error in add funding, is your transaction confirmed?"; - return(""); - } - scriptPubKey = CScript() << ParseHex(HexStr(mypk)) << OP_CHECKSIG; - if ( 0 ) - { - uint8_t *ptr0,*ptr1; int32_t i; - for (i=0; i<35; i++) - fprintf(stderr,"%02x",scriptPubKey[i]); - fprintf(stderr," script vs "); - for (i=0; i<35; i++) - fprintf(stderr,"%02x",fundingPubKey[i]); - fprintf(stderr," funding\n"); - } - if ( scriptPubKey == fundingPubKey ) - { - if ( AddNormalinputs2(mtx,amount+2*txfee,60) > 0 ) - { - hentropy = DiceHashEntropy(entropy,mtx.vin[0].prevout.hash,mtx.vin[0].prevout.n,1); - mtx.vout.push_back(MakeCC1vout(cp->evalcode,amount,dicepk)); - mtx.vout.push_back(CTxOut(txfee,fundingPubKey)); - return(FinalizeCCTx(0,cp,mtx,mypk,txfee,EncodeDiceOpRet('E',sbits,fundingtxid,hentropy,zeroid))); - } else { - CCerror = "cant find enough inputs"; - fprintf(stderr,"%s\n", CCerror.c_str() ); - } - } else { - CCerror = "only fund creator can add more funds (entropy)"; - fprintf(stderr,"%s\n", CCerror.c_str() ); - } - return(""); -} - -std::string DiceBet(uint64_t txfee,char *planstr,uint256 fundingtxid,int64_t bet,int32_t odds) -{ - CMutableTransaction mtx = CreateNewContextualCMutableTransaction(Params().GetConsensus(), hush_nextheight()); - CScript fundingPubKey; CPubKey mypk,dicepk; uint64_t sbits,entropyval,entropyval2; int64_t funding,minbet,maxbet,maxodds,timeoutblocks; uint256 entropytxid,entropytxid2,entropy,hentropy; struct CCcontract_info *cp,C; - if ( bet < 0 ) - { - CCerror = "bet must be positive"; - return(""); - } - if ( odds < 2 || odds > 9999 ) - { - CCerror = "odds must be between 2 and 9999"; - return(""); - } - if ( (cp= Diceinit(fundingPubKey,fundingtxid,&C,planstr,txfee,mypk,dicepk,sbits,minbet,maxbet,maxodds,timeoutblocks)) == 0 ) { - CCerror = "Diceinit error in bet, is your transaction confirmed?"; - return(""); - } - if ( bet < minbet || bet > maxbet || odds > maxodds ) - { - CCerror = strprintf("Dice plan %s illegal bet %.8f: minbet %.8f maxbet %.8f or odds %d vs max.%d\n",planstr,(double)bet/COIN,(double)minbet/COIN,(double)maxbet/COIN,(int32_t)odds,(int32_t)maxodds); - return(""); - } - int32_t entropytxs=0,emptyvar=0; - funding = DicePlanFunds(entropyval,entropytxid,sbits,cp,dicepk,fundingtxid,entropytxs,false); - DicePlanFunds(entropyval2,entropytxid2,sbits,cp,dicepk,fundingtxid,emptyvar,true); - if ( entropyval2 != 0 && entropytxid2 != zeroid ) - { - entropyval = entropyval2; - entropytxid = entropytxid2; - } - if ( funding >= 2*bet*odds+txfee && entropyval != 0 ) - { - if ( entropytxs < 100 ) { - CCerror = "Your dealer is broke, find a new casino."; - return(""); - } - if ( myIsutxo_spentinmempool(ignoretxid,ignorevin,entropytxid,0) != 0 ) - { - CCerror = "entropy txid is spent"; - return(""); - } - mtx.vin.push_back(CTxIn(entropytxid,0,CScript())); - if ( AddNormalinputs(mtx,mypk,bet+2*txfee+odds,60) > 0 ) - { - hentropy = DiceHashEntropy(entropy,mtx.vin[0].prevout.hash,mtx.vin[0].prevout.n,1); - mtx.vout.push_back(MakeCC1vout(cp->evalcode,entropyval,dicepk)); - mtx.vout.push_back(MakeCC1vout(cp->evalcode,bet,dicepk)); - mtx.vout.push_back(CTxOut(txfee+odds,CScript() << ParseHex(HexStr(mypk)) << OP_CHECKSIG)); - return(FinalizeCCTx(0,cp,mtx,mypk,txfee,EncodeDiceOpRet('B',sbits,fundingtxid,entropy,zeroid))); - } else CCerror = "cant find enough normal inputs for %.8f, plan funding %.8f\n"; - } - if ( entropyval == 0 && funding != 0 ) - CCerror = "cant find dice entropy inputs"; - else - CCerror = "cant find dice input"; - return(""); -} - -std::string DiceBetFinish(uint8_t &funcid,uint256 &entropyused,int32_t &entropyvout,int32_t *resultp,uint64_t txfee,char *planstr,uint256 fundingtxid,uint256 bettxid,int32_t winlosetimeout,uint256 vin0txid,int32_t vin0vout) -{ - CMutableTransaction savemtx,mtx = CreateNewContextualCMutableTransaction(Params().GetConsensus(), hush_nextheight()); - CScript scriptPubKey,fundingPubKey; CTransaction oldbetTx,betTx,entropyTx; uint256 hentropyproof,entropytxid,hashBlock,bettorentropy,entropy,hentropy,oldbettxid; CPubKey mypk,dicepk,fundingpk; struct CCcontract_info *cp,C; int64_t inputs=0,CCchange=0,odds,fundsneeded,minbet,maxbet,maxodds,timeoutblocks; int32_t oldentropyvout,retval=0,iswin=0; uint64_t entropyval,sbits; - entropyused = zeroid; - *resultp = 0; - funcid = 0; - if ( (cp= Diceinit(fundingPubKey,fundingtxid,&C,planstr,txfee,mypk,dicepk,sbits,minbet,maxbet,maxodds,timeoutblocks)) == 0 ) - { - CCerror = "Diceinit error in finish, is your transaction confirmed?"; - fprintf(stderr,"%s\n", CCerror.c_str() ); - return(""); - } - fundingpk = DiceFundingPk(fundingPubKey); - scriptPubKey = CScript() << ParseHex(HexStr(mypk)) << OP_CHECKSIG; - if ( winlosetimeout != 0 ) // must be dealernode - { - if ( scriptPubKey != fundingPubKey ) - { - //fprintf(stderr,"only dice fund creator can submit winner or loser\n"); - winlosetimeout = 0; - } - } - if ( myGetTransaction(bettxid,betTx,hashBlock) != 0 && myGetTransaction(betTx.vin[0].prevout.hash,entropyTx,hashBlock) != 0 ) - { - entropytxid = betTx.vin[0].prevout.hash; - /*if ( dice_betspent((char *)"DiceBetFinish",bettxid) != 0 ) - { - CCerror = "bettxid already spent"; - fprintf(stderr,"%s\n", CCerror.c_str() ); - return(""); - }*/ - bettorentropy = DiceGetEntropy(betTx,'B'); - if ( winlosetimeout == 0 || (iswin= DiceIsWinner(hentropyproof,entropyvout,bettxid,betTx,entropyTx,bettorentropy,sbits,minbet,maxbet,maxodds,timeoutblocks,fundingtxid)) != 0 ) - { - if ( vin0txid == zeroid || vin0vout < 0 ) - { - if ( AddNormalinputs2(mtx,2*txfee,3) == 0 ) // must be a single vin!! - { - CCerror = "no txfee inputs for win/lose"; - fprintf(stderr,"%s\n", CCerror.c_str() ); - return(""); - } - } - else - { - //fprintf(stderr,"use vin0 %s/%d\n",vin0txid.GetHex().c_str(),vin0vout); - mtx.vin.push_back(CTxIn(vin0txid,vin0vout,CScript())); - } - if ( winlosetimeout != 0 ) // dealernode - { - entropyused = hentropyproof; - if ( vin0vout == -2 ) - retval = -1; - /*if ( iswin == 0 ) - { - retval = -1; - fprintf(stderr,"invalid dicebet %s\n",bettxid.GetHex().c_str()); - } else retval = 0;*/ - if ( retval < 0 || (retval= DiceEntropyUsed(oldbetTx,oldbettxid,oldentropyvout,entropyused,bettxid,betTx,entropyvout)) != 0 ) - { - if ( retval < 0 ) - { - fprintf(stderr,"orphan that reveals entropy, generate refund tx with proofs\n"); - // make sure we dont refund wrong amounts - mtx.vin.push_back(CTxIn(bettxid,0,CScript())); - mtx.vin.push_back(CTxIn(bettxid,1,CScript())); - funcid = 'R'; - mtx.vout.push_back(MakeCC1vout(cp->evalcode,betTx.vout[0].nValue,dicepk)); - //mtx.vout.push_back(CTxOut(betTx.vout[0].nValue,fundingPubKey)); - mtx.vout.push_back(CTxOut(txfee,fundingPubKey)); - mtx.vout.push_back(CTxOut(betTx.vout[1].nValue,betTx.vout[2].scriptPubKey)); - *resultp = 1; - return(FinalizeCCTx(0,cp,mtx,fundingpk,txfee,EncodeDiceOpRet(funcid,sbits,fundingtxid,entropyused,oldbettxid))); // need to change opreturn to include oldbetTx to allow validation - } - else - { - CCerror = "DiceBetFinish: duplicate betTx"; - *resultp = -2; // demote error to warning - } - //fprintf(stderr,"%s\n", CCerror.c_str() ); - return(""); - } - //fprintf(stderr,"set winlosetimeout %d <- %d\n",winlosetimeout,iswin); - if ( (winlosetimeout= iswin) > 0 ) - funcid = 'W'; - else funcid = 'L'; - } - if ( iswin == winlosetimeout ) // dealernode and normal node paths should always get here - { - //fprintf(stderr,"iswin.%d matches\n",iswin); - mtx.vin.push_back(CTxIn(bettxid,0,CScript())); - mtx.vin.push_back(CTxIn(bettxid,1,CScript())); - if ( iswin == 0 && funcid != 'L' && funcid != 'W' ) // normal node path - { - if ( DiceVerifyTimeout(betTx,timeoutblocks) == 0 ) // hasnt timed out yet - { - return(""); - } - else - { - funcid = 'T'; - hentropy = hentropyproof = zeroid; - iswin = 1; - fprintf(stderr,"set timeout win T\n"); - } - } - if ( iswin > 0 && funcid != 0 ) // dealernode 'W' or normal node 'T' path - { - odds = (betTx.vout[2].nValue - txfee); - if ( odds < 1 || odds > maxodds ) - { - CCerror = strprintf("illegal odds.%d vs maxodds.%d\n",(int32_t)odds,(int32_t)maxodds); - fprintf(stderr,"%s\n", CCerror.c_str() ); - return(""); - } - CCchange = betTx.vout[0].nValue + betTx.vout[1].nValue; - fundsneeded = txfee + (odds+1)*betTx.vout[1].nValue; - savemtx = mtx; - if ( CCchange >= fundsneeded ) - CCchange -= fundsneeded; - else if ( (inputs= AddDiceInputs(cp,mtx,dicepk,fundsneeded,1,sbits,fundingtxid)) >= fundsneeded ) - { - if ( inputs > fundsneeded ) - CCchange += (inputs - fundsneeded); - } - else - { - mtx = savemtx; - if ( (inputs= AddDiceInputs(cp,mtx,dicepk,fundsneeded,60,sbits,fundingtxid)) > 0 ) - { - if ( inputs > fundsneeded ) - CCchange += (inputs - fundsneeded); - } - else - { - CCerror = strprintf("not enough inputs for %.8f\n",(double)fundsneeded/COIN); - fprintf(stderr,"%s\n", CCerror.c_str() ); - return(""); - } - } - mtx.vout.push_back(MakeCC1vout(cp->evalcode,CCchange,dicepk)); - mtx.vout.push_back(CTxOut(txfee,fundingPubKey)); - mtx.vout.push_back(CTxOut((odds+1) * betTx.vout[1].nValue,betTx.vout[2].scriptPubKey)); - } - else // dealernode 'L' path - { - funcid = 'L'; - mtx.vout.push_back(MakeCC1vout(cp->evalcode,betTx.vout[0].nValue + betTx.vout[1].nValue,dicepk)); - mtx.vout.push_back(CTxOut(txfee,fundingPubKey)); - } - //fprintf(stderr,"make tx.%c\n",funcid); - if ( funcid == 'L' || funcid == 'W' ) // dealernode only - hentropy = DiceHashEntropy(entropy,mtx.vin[0].prevout.hash,mtx.vin[0].prevout.n,1); - else - { - if ( scriptPubKey != betTx.vout[2].scriptPubKey ) - { - CCerror = strprintf("can only finish your own bettxid\n"); - fprintf(stderr,"%s\n", CCerror.c_str() ); - return(""); - } - } - *resultp = 1; - //char str[65],str2[65]; - //fprintf(stderr,"iswin.%d house entropy %s vs bettor %s\n",iswin,uint256_str(str,hentropyproof),uint256_str(str2,bettorentropy)); - return(FinalizeCCTx(0,cp,mtx,fundingpk,txfee,EncodeDiceOpRet(funcid,sbits,fundingtxid,hentropy,hentropyproof))); - } else fprintf(stderr,"iswin.%d does not match.%d\n",iswin,winlosetimeout); - } - else - { - *resultp = -1; - fprintf(stderr,"iswin.%d winlosetimeout.%d\n",iswin,winlosetimeout); - return(""); - } - } - *resultp = -1; - return("couldnt find bettx or entropytx"); -} - -static uint256 dealer0_fundingtxid; -void *dealer0_loop(void *_arg) -{ - char *planstr = (char *)_arg; - CTransaction tx,*entropytxs,entropytx; CPubKey mypk,dicepk; uint64_t entropyval; uint256 hashBlock,entropytxid,txid; int32_t height,lastht,numentropytxs,i,n,m,num; CScript fundingPubKey; struct CCcontract_info *cp,C; char coinaddr[64]; std::string res; int64_t minbet,maxbet,maxodds,timeoutblocks; uint64_t refsbits,txfee = 10000; - if ( (cp= Diceinit(fundingPubKey,dealer0_fundingtxid,&C,planstr,txfee,mypk,dicepk,refsbits,minbet,maxbet,maxodds,timeoutblocks)) == 0 ) - { - fprintf(stderr,"error initializing dealer0_loop\n"); - StartShutdown(); - } - fprintf(stderr,"dealer0 node running\n"); - height = lastht = 0; - entropytxs = (CTransaction *)calloc(sizeof(*entropytxs),DICE_MINUTXOS); - while ( 1 ) - { - while ( HUSH_INSYNC == 0 || (height= HUSH_INSYNC) == lastht ) - { - sleep(3); - } - lastht = height; - fprintf(stderr,"New height.%d\n",height); - DicePlanFunds(entropyval,entropytxid,refsbits,cp,dicepk,dealer0_fundingtxid,numentropytxs,false); - if ( numentropytxs < DICE_MINUTXOS ) - { - n = sqrt(DICE_MINUTXOS - numentropytxs); - //if ( n > 10 ) - // n = 10; - for (i=m=0; i 64 && is_hexstr((char *)res.c_str(),0) > 64 ) - { - if ( DecodeHexTx(tx,res) != 0 ) - { - LOCK(cs_main); - if ( myAddtomempool(tx) != 0 ) - { - fprintf(stderr,"ENTROPY %s: %d of %d, %d\n",tx.GetHash().GetHex().c_str(),i,n,DICE_MINUTXOS - numentropytxs); - RelayTransaction(tx); - entropytxs[m++] = tx; - } else break; - } else break; - } else break; - } - for (i=0; i n.%d\n",num,DICE_MINUTXOS,n); - for (i=0; i > unspentOutputs; - SetCCunspents(unspentOutputs,coinaddr,true); - for (std::vector >::const_iterator it=unspentOutputs.begin(); it!=unspentOutputs.end(); it++) - { - txid = it->first.txhash; - vout = (int32_t)it->first.index; - if ( vout != 0 ) - continue; - sum += it->second.satoshis; - if ( myGetTransaction(txid,betTx,hashBlock) != 0 && betTx.vout.size() >= 4 && betTx.vout[vout].scriptPubKey.IsPayToCryptoCondition() != 0 ) - { - if ( DecodeDiceOpRet(txid,betTx.vout[betTx.vout.size()-1].scriptPubKey,sbits,fundingtxid,hash,proof) == 'B' && sbits == refsbits ) - { - if ( myGetTransaction(betTx.vin[0].prevout.hash,entropyTx,hashBlock) != 0 ) - { - flag = HUSH_DEALERNODE != 0; - if ( HUSH_DEALERNODE != 0 && scriptPubKey == fundingPubKey ) - { - bettorentropy = DiceGetEntropy(betTx,'B'); - if ( (iswin= DiceIsWinner(hentropyproof,entropyvout,txid,betTx,entropyTx,bettorentropy,sbits,minbet,maxbet,maxodds,timeoutblocks,fundingtxid)) != 0 ) - { - if ( iswin > 0 ) - win++; - else if ( iswin < 0 ) - loss++; - n++; - DiceQueue(iswin,sbits,fundingtxid,txid,betTx,entropyvout); - } - } - if ( scriptPubKey != fundingPubKey ) - { - fprintf(stderr,"serialized bettxid %d: iswin.%d W.%d L.%d %s/v%d (%c %.8f) %.8f\n",n,iswin,win,loss,txid.GetHex().c_str(),vout,funcid,(double)it->second.satoshis/COIN,(double)sum/COIN); - res = DiceBetFinish(funcid,entropyused,entropyvout,&result,txfee,planstr,fundingtxid,txid,scriptPubKey == fundingPubKey,zeroid,-1); - if ( result > 0 ) - { - mySenddicetransaction(res,entropyused,entropyvout,txid,betTx,funcid,0); - n++; - if ( n > 10 ) - break; - } - } - } else fprintf(stderr,"bettxid.%s cant find entropyTx.%s\n",txid.GetHex().c_str(),betTx.vin[0].prevout.hash.GetHex().c_str()); - } - } - } - if ( didinit == 0 && HUSH_DEALERNODE == 0 && scriptPubKey == fundingPubKey ) - { - strcpy(_planstr,planstr); - dealer0_fundingtxid = fundingtxid; - if ( pthread_create((pthread_t *)malloc(sizeof(pthread_t)),NULL,dealer0_loop,_planstr) == 0 ) - didinit = 1; - } - return(n); - } - else - { - char str[65]; - if ( (vout= myIsutxo_spent(spenttxid,bettxid,1)) >= 0 ) - { - //fprintf(stderr,"bettx is spent\n"); - if ( myGetTransaction(bettxid,betTx,hashBlock) != 0 && myGetTransaction(spenttxid,spenttx,hashBlock) != 0 && spenttx.vout.size() > 2 ) - { - //fprintf(stderr,"found spenttxid %s\n",uint256_str(str,spenttxid)); - if ( betTx.vout[1].scriptPubKey.IsPayToCryptoCondition() == 0 || betTx.vout[2].scriptPubKey.IsPayToCryptoCondition() != 0 || spenttx.vout[2].scriptPubKey != betTx.vout[2].scriptPubKey ) - return(0.); - else return((double)spenttx.vout[2].nValue/COIN); - } - CCerror = "couldnt find bettx or spenttx %s\n",uint256_str(str,spenttxid); - return(-1.); - } - else if ( scriptPubKey == fundingPubKey ) - res = DiceBetFinish(funcid,entropyused,entropyvout,&result,txfee,planstr,fundingtxid,bettxid,1,zeroid,-1); - else res = DiceBetFinish(funcid,entropyused,entropyvout,&result,txfee,planstr,fundingtxid,bettxid,0,zeroid,-1); - if ( result > 0 ) - { - mySenddicetransaction(res,entropyused,entropyvout,bettxid,betTx,funcid,0); - sleep(1); - if ( (vout= myIsutxo_spent(spenttxid,bettxid,1)) >= 0 ) - { - if ( myGetTransaction(txid,betTx,hashBlock) != 0 && myGetTransaction(spenttxid,spenttx,hashBlock) != 0 && spenttx.vout.size() >= 2 ) - { - if ( funcid == 'L' )//betTx.vout[1].scriptPubKey.IsPayToCryptoCondition() == 0 || betTx.vout[2].scriptPubKey.IsPayToCryptoCondition() != 0 || spenttx.vout[2].scriptPubKey != betTx.vout[2].scriptPubKey ) - //if ( spenttx.vout[2].scriptPubKey == fundingPubKey || ((uint8_t *)spenttx.vout[2].scriptPubKey.data())[0] == 0x6a ) - return(0.); - else return((double)spenttx.vout[2].nValue/COIN); - } else return(0.); - } - CCerror = "didnt find dicefinish tx"; - } else CCerror = res; - return(-1.); - } - return(0.); -} diff --git a/src/cc/lotto.cpp b/src/cc/lotto.cpp deleted file mode 100644 index c7621178a..000000000 --- a/src/cc/lotto.cpp +++ /dev/null @@ -1,344 +0,0 @@ -// Copyright (c) 2016-2023 The Hush developers -// Distributed under the GPLv3 software license, see the accompanying -// file COPYING or https://www.gnu.org/licenses/gpl-3.0.en.html -/****************************************************************************** - * Copyright © 2014-2019 The SuperNET Developers. * - * * - * See the AUTHORS, DEVELOPER-AGREEMENT and LICENSE files at * - * the top-level directory of this distribution for the individual copyright * - * holder information and the developer policies on copyright and licensing. * - * * - * Unless otherwise agreed in a custom licensing agreement, no part of the * - * SuperNET software, including this file may be copied, modified, propagated * - * or distributed except according to the terms contained in the LICENSE file * - * * - * Removal or modification of this copyright notice is prohibited. * - * * - ******************************************************************************/ - -#include "CClotto.h" -#include "../txmempool.h" - -/* - A blockchain lotto has the problem of generating the deterministic random numbers needed to get a winner in a way that doesnt allow cheating. If we save the entropy for later publishing and display the hash of the entropy, it is true that the players wont know what the entropy value is, however the creator of the lotto funds will be able to know and simply create a winning ticket when the jackpot is large enough. - - We also need to avoid chain reorgs from disclosing the entropy and then allowing people to submit a winning ticket calculated based on the disclosed entropy (see attack vector in dice.cpp) - - As usual it needs to be provably fair and random - - The solution is for everybody to post the hash of their entropy when purchasing tickets. Then at the time of the drawing, nodes would post their entropy over an N block period to avoid censorship attack. After the N block period, then we have valid entropy that we know was locked in prior to the start of the N blocks and that nobody would have been able to know ahead of time the final entropy value. - - As long as one node submits a high entropy value, then just by combining all the submissions together, we get the drawing's entropy value. Given that, the usual process can determine if there was a winner at the specified odds. In fact, all the nodes are able to determine exactly how many winners there were and whether to validate 1/w payouts to the w winners or rollover the jackpot to the next drawing. - - To remove the need for an autopayout, the winning node(s) would need to submit a 1/w payout tx, this would be able to be done at any time and the winner does not have to have submitted proof of hentropy. In order to prevent a player from opportunistically withholding their entropy, the lotto creator will post the original proof of hentropy after the N block player submission period. This masks to all the players the final value of entropy. - - Attack vector: the lotto creator can have many player tickets in reserve all with their entropy ready to submit, but based on the actual submissions, find the one which gives him the best outcome. since all the player submissions will be known via mempool, along with the original hentropy. However the lotto creator would have to mine the final block in order to know the order of the player tickets. - - Thinking about this evil miner attack, it seems pretty bad, so a totally new approach is needed. Preferably with a simple enough protocol. Let us remove any special knowledge by the lotto creator, so like the faucet, it seems just that there is a single lotto for a chain. - - >>>>>>>>>>>> second iteration - - What we need is something that gives each ticket an equal chance at the jackpot, without allowing miner or relayer to gain an advantage. ultimately the jackpot payout tx needs to be confirmed, so there needs to be some number of blocks to make a claim to avoid censorship attack. If onchain entropy is needed, then it should be reduced to 1 bit per block to reduce the grinding that is possible. This does mean a block miner for the last bit of entropy can double their chances at winning, but the alternative is to have an external source of entropy, which creates its own set of issues like what prevents the nodes getting the external entropy from cheating? - - Conveniently the lotto mechanics are similar to a PoS staking, so it can be based on everybody trying to stake a single lotto jackpot. - - The calculation would need to be based on the payout address and utxosize, so relayers cant intercept it to steal the jackpot. - - each jackpot would effectively restart the lotto - - the funds from new lotto tickets can be spent by the jackpot, but those tickets can still win the new jackpot - - each set of tickets (utxo) would become eligible to claim the jackpot after some time is elapsed so the entropy for that utxo can be obtained. [6 bits * 32 + 1 bit * 16] 48 blocks - -It is possible to have a jackpot but miss out on it due to not claiming it. To minimize the effect from this, each ticket would have one chance to win, which can be calculated and a jackpot claim submitted just once. - - in order to randomize the timing of claim, a txid PoW similar to faucetget will maximize the chance of only a single jackpot txid that can propagate throughout the mempools, which will prevent the second one broadcast. Granted the mining node can override this if they also have a winning ticket, but assuming the PoS lottery makes it unlikely for two winners in a single block, this is not a big issue. - - In order to adapt the difficulty of winning the lotto, but not requiring recalculating all past tickets, as new lotto tickets are sold without a jackpot, it needs to become easier to win. Basically as the lotto jackpot gets bigger and bigger, it keeps getting easier to win! This convergence will avoid having unwinnable jackpots. - - rpc calls - lottoinfo - lottotickets - lottostatus - lottowinner tickethash ticketid - -*/ - -// start of consensus code - -int64_t IsLottovout(struct CCcontract_info *cp,const CTransaction& tx,int32_t v) -{ - char destaddr[64]; - if ( tx.vout[v].scriptPubKey.IsPayToCryptoCondition() != 0 ) - { - if ( Getscriptaddress(destaddr,tx.vout[v].scriptPubKey) > 0 && strcmp(destaddr,cp->unspendableCCaddr) == 0 ) - return(tx.vout[v].nValue); - } - return(0); -} - -bool LottoExactAmounts(struct CCcontract_info *cp,Eval* eval,const CTransaction &tx,int32_t minage,uint64_t txfee) -{ - static uint256 zerohash; - CTransaction vinTx; uint256 hashBlock,activehash; int32_t i,numvins,numvouts; int64_t inputs=0,outputs=0,assetoshis; - numvins = tx.vin.size(); - numvouts = tx.vout.size(); - for (i=0; iismyvin)(tx.vin[i].scriptSig) != 0 ) - { - //fprintf(stderr,"vini.%d check mempool\n",i); - if ( eval->GetTxUnconfirmed(tx.vin[i].prevout.hash,vinTx,hashBlock) == 0 ) - return eval->Invalid("cant find vinTx"); - else - { - //fprintf(stderr,"vini.%d check hash and vout\n",i); - if ( hashBlock == zerohash ) - return eval->Invalid("cant Lotto from mempool"); - if ( (assetoshis= IsLottovout(cp,vinTx,tx.vin[i].prevout.n)) != 0 ) - inputs += assetoshis; - } - } - } - for (i=0; iInvalid("mismatched inputs != outputs + txfee"); - } - else return(true); -} - -bool LottoValidate(struct CCcontract_info *cp,Eval* eval,const CTransaction &tx, uint32_t nIn) -{ - int32_t numvins,numvouts,preventCCvins,preventCCvouts,i; bool retval; - return eval->Invalid("no validation yet"); - numvins = tx.vin.size(); - numvouts = tx.vout.size(); - preventCCvins = preventCCvouts = -1; - if ( numvouts < 1 ) - return eval->Invalid("no vouts"); - else - { - //fprintf(stderr,"check vins\n"); - for (i=0; iInvalid("illegal normal vini"); - } - } - //fprintf(stderr,"check amounts\n"); - if ( LottoExactAmounts(cp,eval,tx,1,10000) == false ) - { - fprintf(stderr,"Lottoget invalid amount\n"); - return false; - } - else - { - preventCCvouts = 1; - if ( IsLottovout(cp,tx,0) != 0 ) - { - preventCCvouts++; - i = 1; - } else i = 0; - if ( tx.vout[i].nValue != COIN ) - return eval->Invalid("invalid Lotto output"); - retval = PreventCC(eval,tx,preventCCvins,numvins,preventCCvouts,numvouts); - if ( retval != 0 ) - fprintf(stderr,"Lottoget validated\n"); - else fprintf(stderr,"Lottoget invalid\n"); - return(retval); - } - } -} -// end of consensus code - -// helper functions for rpc calls in rpcwallet.cpp - -int64_t AddLottoInputs(struct CCcontract_info *cp,CMutableTransaction &mtx,CPubKey pk,int64_t total,int32_t maxinputs) -{ - // add threshold check - char coinaddr[64]; int64_t nValue,price,totalinputs = 0; uint256 txid,hashBlock; std::vector origpubkey; CTransaction vintx; int32_t n = 0; - std::vector > unspentOutputs; - GetCCaddress(cp,coinaddr,pk); - SetCCunspents(unspentOutputs,coinaddr,true); - for (std::vector >::const_iterator it=unspentOutputs.begin(); it!=unspentOutputs.end(); it++) - { - txid = it->first.txhash; - // prevent dup - if ( it->second.satoshis < COIN ) - continue; - if ( myGetTransaction(txid,vintx,hashBlock) != 0 ) - { - if ( (nValue= IsLottovout(cp,vintx,(int32_t)it->first.index)) > 0 ) - { - if ( total != 0 && maxinputs != 0 ) - mtx.vin.push_back(CTxIn(txid,(int32_t)it->first.index,CScript())); - nValue = it->second.satoshis; - totalinputs += nValue; - n++; - if ( (total > 0 && totalinputs >= total) || (maxinputs > 0 && n >= maxinputs) ) - break; - } - } - } - return(totalinputs); -} - -uint8_t DecodeLottoFundingOpRet(const CScript &scriptPubKey,uint64_t &sbits,int32_t ticketsize,int32_t odds,int32_t firstheight,int32_t period,uint256 hentropy) -{ - std::vector vopret; uint8_t *script,e,f; - GetOpReturnData(scriptPubKey, vopret); - script = (uint8_t *)vopret.data(); - if ( vopret.size() > 2 && E_UNMARSHAL(vopret,ss >> e; ss >> f; ss >> sbits; ss >> ticketsize; ss >> odds; ss >> firstheight; ss >> period; ss >> hentropy) != 0 ) - { - if ( e == EVAL_LOTTO && f == 'F' ) - return(f); - } - return(0); -} - -int64_t LottoPlanFunds(uint64_t refsbits,struct CCcontract_info *cp,CPubKey pk,uint256 reffundingtxid) -{ - char coinaddr[64]; uint64_t sbits; int64_t nValue,lockedfunds; uint256 txid,hashBlock,fundingtxid; CTransaction tx; int32_t vout; uint8_t funcid; - std::vector > unspentOutputs; - lockedfunds = 0; - GetCCaddress(cp,coinaddr,pk); - SetCCunspents(unspentOutputs,coinaddr,true); - for (std::vector >::const_iterator it=unspentOutputs.begin(); it!=unspentOutputs.end(); it++) - { - txid = it->first.txhash; - vout = (int32_t)it->first.index; - if ( myGetTransaction(txid,tx,hashBlock) != 0 && tx.vout[vout].scriptPubKey.IsPayToCryptoCondition() != 0 ) - { - // need to implement this! if ( (funcid= DecodeLottoOpRet(txid,tx.vout[tx.vout.size()-1].scriptPubKey,sbits,fundingtxid)) == 'F' || funcid == 'T' ) - { - if ( refsbits == sbits && (funcid == 'F' && reffundingtxid == txid) || reffundingtxid == fundingtxid ) - { - if ( (nValue= IsLottovout(cp,tx,vout)) > 0 ) - lockedfunds += nValue; - else fprintf(stderr,"refsbits.%llx sbits.%llx nValue %.8f\n",(long long)refsbits,(long long)sbits,(double)nValue/COIN); - } //else fprintf(stderr,"else case\n"); - } //else fprintf(stderr,"funcid.%d %c skipped %.8f\n",funcid,funcid,(double)tx.vout[vout].nValue/COIN); - } - } - return(lockedfunds); -} - -UniValue LottoInfo(uint256 lottoid) -{ - UniValue result(UniValue::VOBJ); uint256 hashBlock,hentropy; CTransaction vintx; uint64_t lockedfunds,sbits; int32_t ticketsize,odds,firstheight,period; CPubKey lottopk; struct CCcontract_info *cp,C; char str[67],numstr[65]; - if ( myGetTransaction(lottoid,vintx,hashBlock) == 0 ) - { - fprintf(stderr,"cant find lottoid\n"); - result.push_back(Pair("result","error")); - result.push_back(Pair("error","cant find lottoid")); - return(result); - } - if ( vintx.vout.size() > 0 && DecodeLottoFundingOpRet(vintx.vout[vintx.vout.size()-1].scriptPubKey,sbits,ticketsize,odds,firstheight,period,hentropy) == 0 ) - { - fprintf(stderr,"lottoid isnt lotto creation txid\n"); - result.push_back(Pair("result","error")); - result.push_back(Pair("error","lottoid isnt lotto creation txid")); - return(result); - } - result.push_back(Pair("result","success")); - result.push_back(Pair("lottoid",uint256_str(str,lottoid))); - unstringbits(str,sbits); - result.push_back(Pair("name",str)); - result.push_back(Pair("sbits",sbits)); - result.push_back(Pair("ticketsize",ticketsize)); - result.push_back(Pair("odds",odds)); - cp = CCinit(&C,EVAL_LOTTO); - lottopk = GetUnspendable(cp,0); - lockedfunds = LottoPlanFunds(sbits,cp,lottopk,lottoid); - sprintf(numstr,"%.8f",(double)lockedfunds/COIN); - result.push_back(Pair("jackpot",numstr)); - return(result); -} - -UniValue LottoList() -{ - UniValue result(UniValue::VARR); std::vector txids; struct CCcontract_info *cp,C; uint256 txid,hashBlock,hentropy; CTransaction vintx; uint64_t sbits; int32_t ticketsize,odds,firstheight,period; char str[65]; - cp = CCinit(&C,EVAL_LOTTO); - SetCCtxids(txids,cp->normaladdr,true,cp->evalcode,zeroid,'F'); - for (std::vector::const_iterator it=txids.begin(); it!=txids.end(); it++) - { - txid = *it; - if ( myGetTransaction(txid,vintx,hashBlock) != 0 ) - { - if ( vintx.vout.size() > 0 && DecodeLottoFundingOpRet(vintx.vout[vintx.vout.size()-1].scriptPubKey,sbits,ticketsize,odds,firstheight,period,hentropy) == 'F' ) - { - result.push_back(uint256_str(str,txid)); - } - } - } - return(result); -} - -std::string LottoCreate(uint64_t txfee,char *planstr,int64_t funding,int32_t ticketsize,int32_t odds,int32_t firstheight,int32_t period) -{ - CMutableTransaction mtx = CreateNewContextualCMutableTransaction(Params().GetConsensus(), hush_nextheight()); - uint256 entropy,hentropy; CPubKey mypk,lottopk; uint64_t sbits; int64_t inputs,CCchange=0,nValue=COIN; struct CCcontract_info *cp,C; - cp = CCinit(&C,EVAL_LOTTO); - if ( txfee == 0 ) - txfee = 10000; - lottopk = GetUnspendable(cp,0); - mypk = pubkey2pk(Mypubkey()); - sbits = stringbits(planstr); - if ( AddNormalinputs(mtx,mypk,funding+txfee,60) > 0 ) - { - hentropy = DiceHashEntropy(entropy,mtx.vin[0].prevout.hash,mtx.vin[0].prevout.n,1); - mtx.vout.push_back(MakeCC1vout(EVAL_LOTTO,funding,lottopk)); - return(FinalizeCCTx(0,cp,mtx,mypk,txfee,CScript() << OP_RETURN << E_MARSHAL(ss << (uint8_t)EVAL_LOTTO << (uint8_t)'F' << sbits << ticketsize << odds << firstheight << period << hentropy))); - } - return(""); -} - -std::string LottoTicket(uint64_t txfee,uint256 lottoid,int64_t numtickets) -{ - CMutableTransaction mtx = CreateNewContextualCMutableTransaction(Params().GetConsensus(), hush_nextheight()); - CPubKey mypk,lottopk; CScript opret; int64_t inputs,CCchange=0,nValue=COIN; struct CCcontract_info *cp,C; - cp = CCinit(&C,EVAL_LOTTO); - if ( txfee == 0 ) - txfee = 10000; - lottopk = GetUnspendable(cp,0); - mypk = pubkey2pk(Mypubkey()); - if ( (inputs= AddLottoInputs(cp,mtx,lottopk,nValue+txfee,60)) > 0 ) - { - if ( inputs > nValue ) - CCchange = (inputs - nValue - txfee); - if ( CCchange != 0 ) - mtx.vout.push_back(MakeCC1vout(EVAL_LOTTO,CCchange,lottopk)); - mtx.vout.push_back(CTxOut(nValue,CScript() << ParseHex(HexStr(mypk)) << OP_CHECKSIG)); - return(FinalizeCCTx(-1LL,cp,mtx,mypk,txfee,opret)); - } else fprintf(stderr,"cant find Lotto inputs\n"); - return(""); -} - -std::string LottoWinner(uint64_t txfee) -{ - CMutableTransaction mtx = CreateNewContextualCMutableTransaction(Params().GetConsensus(), hush_nextheight()); - CPubKey mypk,lottopk; int64_t winnings = 0; CScript opret; struct CCcontract_info *cp,C; - cp = CCinit(&C,EVAL_LOTTO); - if ( txfee == 0 ) - txfee = 10000; - mypk = pubkey2pk(Mypubkey()); - lottopk = GetUnspendable(cp,0); - if ( AddNormalinputs(mtx,mypk,txfee,64) > 0 ) - { - mtx.vout.push_back(MakeCC1vout(EVAL_LOTTO,winnings,lottopk)); - return(FinalizeCCTx(0,cp,mtx,mypk,txfee,opret)); - } - return(""); -} - - diff --git a/src/rpc/server.cpp b/src/rpc/server.cpp index d764f392d..1fd035660 100644 --- a/src/rpc/server.cpp +++ b/src/rpc/server.cpp @@ -389,9 +389,6 @@ static const CRPCCommand vRPCCommands[] = // auction { "auction", "auctionaddress", &auctionaddress, true }, - // lotto - { "lotto", "lottoaddress", &lottoaddress, true }, - // fsm { "FSM", "FSMaddress", &FSMaddress, true }, { "FSM", "FSMcreate", &FSMcreate, true }, @@ -439,15 +436,6 @@ static const CRPCCommand vRPCCommands[] = { "heir", "heirinfo", &heirinfo, true }, { "heir", "heirlist", &heirlist, true }, - // Channels - { "channels", "channelsaddress", &channelsaddress, true }, - { "channels", "channelslist", &channelslist, true }, - { "channels", "channelsinfo", &channelsinfo, true }, - { "channels", "channelsopen", &channelsopen, true }, - { "channels", "channelspayment", &channelspayment, true }, - { "channels", "channelsclose", &channelsclose, true }, - { "channels", "channelsrefund", &channelsrefund, true }, - // Oracles { "oracles", "oraclesaddress", &oraclesaddress, true }, { "oracles", "oracleslist", &oracleslist, true }, @@ -476,16 +464,6 @@ static const CRPCCommand vRPCCommands[] = { "CClib", "cclibinfo", &cclibinfo, true }, { "CClib", "cclib", &cclib, true }, - // dice - { "dice", "dicelist", &dicelist, true }, - { "dice", "diceinfo", &diceinfo, true }, - { "dice", "dicefund", &dicefund, true }, - { "dice", "diceaddfunds", &diceaddfunds, true }, - { "dice", "dicebet", &dicebet, true }, - { "dice", "dicefinish", &dicefinish, true }, - { "dice", "dicestatus", &dicestatus, true }, - { "dice", "diceaddress", &diceaddress, true }, - // tokens & assets { "tokens", "assetsaddress", &assetsaddress, true }, { "tokens", "tokeninfo", &tokeninfo, true }, diff --git a/src/rpc/server.h b/src/rpc/server.h index 8f90627fe..d805fab63 100644 --- a/src/rpc/server.h +++ b/src/rpc/server.h @@ -303,15 +303,6 @@ extern UniValue rewardscreatefunding(const UniValue& params, bool fHelp, const C extern UniValue rewardsaddfunding(const UniValue& params, bool fHelp, const CPubKey& mypk); extern UniValue rewardslock(const UniValue& params, bool fHelp, const CPubKey& mypk); extern UniValue rewardsunlock(const UniValue& params, bool fHelp, const CPubKey& mypk); -extern UniValue diceaddress(const UniValue& params, bool fHelp, const CPubKey& mypk); -extern UniValue dicefund(const UniValue& params, bool fHelp, const CPubKey& mypk); -extern UniValue dicelist(const UniValue& params, bool fHelp, const CPubKey& mypk); -extern UniValue diceinfo(const UniValue& params, bool fHelp, const CPubKey& mypk); -extern UniValue diceaddfunds(const UniValue& params, bool fHelp, const CPubKey& mypk); -extern UniValue dicebet(const UniValue& params, bool fHelp, const CPubKey& mypk); -extern UniValue dicefinish(const UniValue& params, bool fHelp, const CPubKey& mypk); -extern UniValue dicestatus(const UniValue& params, bool fHelp, const CPubKey& mypk); -extern UniValue lottoaddress(const UniValue& params, bool fHelp, const CPubKey& mypk); extern UniValue FSMaddress(const UniValue& params, bool fHelp, const CPubKey& mypk); extern UniValue FSMcreate(const UniValue& params, bool fHelp, const CPubKey& mypk); extern UniValue FSMlist(const UniValue& params, bool fHelp, const CPubKey& mypk); diff --git a/src/wallet/rpcwallet.cpp b/src/wallet/rpcwallet.cpp index 494c4565c..d725fa7b7 100644 --- a/src/wallet/rpcwallet.cpp +++ b/src/wallet/rpcwallet.cpp @@ -6092,11 +6092,8 @@ int32_t hush_notaryvin(CMutableTransaction &txNew,uint8_t *notarypub33, void *pT #include "../cc/CCfaucet.h" #include "../cc/CCassets.h" #include "../cc/CCrewards.h" -#include "../cc/CCdice.h" #include "../cc/CCfsm.h" #include "../cc/CCauction.h" -#include "../cc/CClotto.h" -#include "../cc/CCchannels.h" #include "../cc/CCOracles.h" #include "../cc/CCPrices.h" #include "../cc/CCHeir.h" @@ -6260,19 +6257,6 @@ UniValue setpubkey(const UniValue& params, bool fHelp, const CPubKey& mypk) return result; } -UniValue channelsaddress(const UniValue& params, bool fHelp, const CPubKey& mypk) -{ - UniValue result(UniValue::VOBJ); struct CCcontract_info *cp,C; std::vector pubkey; - - cp = CCinit(&C,EVAL_CHANNELS); - if ( fHelp || params.size() != 1 ) - throw runtime_error("channelsaddress pubkey\n"); - if ( ensure_CCrequirements(cp->evalcode) < 0 ) - throw runtime_error(CC_REQUIREMENTS_MSG); - pubkey = ParseHex(params[0].get_str().c_str()); - return(CCaddress(cp,(char *)"Channels",pubkey)); -} - UniValue cclibaddress(const UniValue& params, bool fHelp, const CPubKey& mypk) { struct CCcontract_info *cp,C; std::vector pubkey; uint8_t evalcode = EVAL_FIRSTUSER; @@ -6497,19 +6481,6 @@ UniValue heiraddress(const UniValue& params, bool fHelp, const CPubKey& mypk) return(CCaddress(cp,(char *)"Heir",pubkey)); } -UniValue lottoaddress(const UniValue& params, bool fHelp, const CPubKey& mypk) -{ - struct CCcontract_info *cp,C; std::vector pubkey; - cp = CCinit(&C,EVAL_LOTTO); - if ( fHelp || params.size() > 1 ) - throw runtime_error("lottoaddress [pubkey]\n"); - if ( ensure_CCrequirements(cp->evalcode) < 0 ) - throw runtime_error(CC_REQUIREMENTS_MSG); - if ( params.size() == 1 ) - pubkey = ParseHex(params[0].get_str().c_str()); - return(CCaddress(cp,(char *)"Lotto",pubkey)); -} - UniValue FSMaddress(const UniValue& params, bool fHelp, const CPubKey& mypk) { struct CCcontract_info *cp,C; std::vector pubkey; @@ -6536,19 +6507,6 @@ UniValue auctionaddress(const UniValue& params, bool fHelp, const CPubKey& mypk) return(CCaddress(cp,(char *)"Auction",pubkey)); } -UniValue diceaddress(const UniValue& params, bool fHelp, const CPubKey& mypk) -{ - struct CCcontract_info *cp,C; std::vector pubkey; - cp = CCinit(&C,EVAL_DICE); - if ( fHelp || params.size() > 1 ) - throw runtime_error("diceaddress [pubkey]\n"); - if ( ensure_CCrequirements(cp->evalcode) < 0 ) - throw runtime_error(CC_REQUIREMENTS_MSG); - if ( params.size() == 1 ) - pubkey = ParseHex(params[0].get_str().c_str()); - return(CCaddress(cp,(char *)"Dice",pubkey)); -} - UniValue faucetaddress(const UniValue& params, bool fHelp, const CPubKey& mypk) { struct CCcontract_info *cp,C; std::vector pubkey; @@ -6603,118 +6561,6 @@ UniValue tokenaddress(const UniValue& params, bool fHelp, const CPubKey& mypk) return(CCaddress(cp,(char *)"Tokens", pubkey)); } -UniValue channelslist(const UniValue& params, bool fHelp, const CPubKey& mypk) -{ - if ( fHelp || params.size() > 0 ) - throw runtime_error("channelslist\n"); - if ( ensure_CCrequirements(EVAL_CHANNELS) < 0 ) - throw runtime_error(CC_REQUIREMENTS_MSG); - return(ChannelsList(mypk)); -} - -UniValue channelsinfo(const UniValue& params, bool fHelp, const CPubKey& mypk) -{ - uint256 opentxid; - if ( fHelp || params.size() > 1 ) - throw runtime_error("channelsinfo [opentxid]\n"); - if ( ensure_CCrequirements(EVAL_CHANNELS) < 0 ) - throw runtime_error(CC_REQUIREMENTS_MSG); - opentxid=zeroid; - if (params.size() > 0 && !params[0].isNull() && !params[0].get_str().empty()) - opentxid = Parseuint256((char *)params[0].get_str().c_str()); - return(ChannelsInfo(mypk,opentxid)); -} - -UniValue channelsopen(const UniValue& params, bool fHelp, const CPubKey& mypk) -{ - UniValue result(UniValue::VOBJ); int32_t numpayments; int64_t payment; std::vector destpub; struct CCcontract_info *cp,C; - uint256 tokenid=zeroid; - - cp = CCinit(&C,EVAL_CHANNELS); - if ( fHelp || params.size() < 3 || params.size() > 4) - throw runtime_error("channelsopen destpubkey numpayments payment [tokenid]\n"); - if ( ensure_CCrequirements(EVAL_CHANNELS) < 0 ) - throw runtime_error(CC_REQUIREMENTS_MSG); - Lock2NSPV(mypk); - destpub = ParseHex(params[0].get_str().c_str()); - numpayments = atoi(params[1].get_str().c_str()); - payment = atol(params[2].get_str().c_str()); - if (params.size()==4) - { - tokenid=Parseuint256((char *)params[3].get_str().c_str()); - } - result = ChannelOpen(mypk,0,pubkey2pk(destpub),numpayments,payment,tokenid); - if ( result[JSON_HEXTX].getValStr().size() > 0 ) - { - result.push_back(Pair("result", "success")); - } - Unlock2NSPV(mypk); - return(result); -} - -UniValue channelspayment(const UniValue& params, bool fHelp, const CPubKey& mypk) -{ - UniValue result(UniValue::VOBJ); struct CCcontract_info *cp,C; uint256 opentxid,secret=zeroid; int32_t n; int64_t amount; - cp = CCinit(&C,EVAL_CHANNELS); - if ( fHelp || params.size() < 2 || params.size() >3 ) - throw runtime_error("channelspayment opentxid amount [secret]\n"); - if ( ensure_CCrequirements(EVAL_CHANNELS) < 0 ) - throw runtime_error(CC_REQUIREMENTS_MSG); - Lock2NSPV(mypk); - opentxid = Parseuint256((char *)params[0].get_str().c_str()); - amount = atoi((char *)params[1].get_str().c_str()); - if (params.size() > 2 && !params[2].isNull() && !params[2].get_str().empty()) - { - secret = Parseuint256((char *)params[2].get_str().c_str()); - } - result = ChannelPayment(mypk,0,opentxid,amount,secret); - if ( result[JSON_HEXTX].getValStr().size() > 0 ) - { - result.push_back(Pair("result", "success")); - } - Unlock2NSPV(mypk); - return(result); -} - -UniValue channelsclose(const UniValue& params, bool fHelp, const CPubKey& mypk) -{ - UniValue result(UniValue::VOBJ); struct CCcontract_info *cp,C; uint256 opentxid; - cp = CCinit(&C,EVAL_CHANNELS); - if ( fHelp || params.size() != 1 ) - throw runtime_error("channelsclose opentxid\n"); - if ( ensure_CCrequirements(EVAL_CHANNELS) < 0 ) - throw runtime_error(CC_REQUIREMENTS_MSG); - Lock2NSPV(mypk); - opentxid = Parseuint256((char *)params[0].get_str().c_str()); - result = ChannelClose(mypk,0,opentxid); - if ( result[JSON_HEXTX].getValStr().size() > 0 ) - { - result.push_back(Pair("result", "success")); - } - Unlock2NSPV(mypk); - return(result); -} - -UniValue channelsrefund(const UniValue& params, bool fHelp, const CPubKey& mypk) -{ - UniValue result(UniValue::VOBJ); struct CCcontract_info *cp,C; uint256 opentxid,closetxid; - cp = CCinit(&C,EVAL_CHANNELS); - if ( fHelp || params.size() != 2 ) - throw runtime_error("channelsrefund opentxid closetxid\n"); - if ( ensure_CCrequirements(EVAL_CHANNELS) < 0 ) - throw runtime_error(CC_REQUIREMENTS_MSG); - Lock2NSPV(mypk); - opentxid = Parseuint256((char *)params[0].get_str().c_str()); - closetxid = Parseuint256((char *)params[1].get_str().c_str()); - result = ChannelRefund(mypk,0,opentxid,closetxid); - if ( result[JSON_HEXTX].getValStr().size() > 0 ) - { - result.push_back(Pair("result", "success")); - } - Unlock2NSPV(mypk); - return(result); -} - UniValue rewardscreatefunding(const UniValue& params, bool fHelp, const CPubKey& mypk) { UniValue result(UniValue::VOBJ); char *name; int64_t funds,APR,minseconds,maxseconds,mindeposit; std::string hex; @@ -7179,204 +7025,6 @@ UniValue faucetget(const UniValue& params, bool fHelp, const CPubKey& mypk) return(result); } - -UniValue dicefund(const UniValue& params, bool fHelp, const CPubKey& mypk) -{ - UniValue result(UniValue::VOBJ); int64_t funds,minbet,maxbet,maxodds,timeoutblocks; std::string hex; char *name; - if ( fHelp || params.size() != 6 ) - throw runtime_error("dicefund name funds minbet maxbet maxodds timeoutblocks\n"); - if ( ensure_CCrequirements(EVAL_DICE) < 0 ) - throw runtime_error(CC_REQUIREMENTS_MSG); - const CKeyStore& keystore = *pwalletMain; - LOCK2(cs_main, pwalletMain->cs_wallet); - name = (char *)params[0].get_str().c_str(); - funds = atof(params[1].get_str().c_str()) * COIN + 0.00000000499999; - minbet = atof(params[2].get_str().c_str()) * COIN + 0.00000000499999; - maxbet = atof(params[3].get_str().c_str()) * COIN + 0.00000000499999; - maxodds = atol(params[4].get_str().c_str()); - timeoutblocks = atol(params[5].get_str().c_str()); - - if (!VALID_PLAN_NAME(name)) { - ERR_RESULT(strprintf("Plan name can be at most %d ASCII characters",PLAN_NAME_MAX)); - return(result); - } - - hex = DiceCreateFunding(0,name,funds,minbet,maxbet,maxodds,timeoutblocks); - if (CCerror != "") { - ERR_RESULT(CCerror); - } else if ( hex.size() > 0 ) { - result.push_back(Pair("result", "success")); - result.push_back(Pair("hex", hex)); - } else { - ERR_RESULT( "couldnt create dice funding transaction"); - } - return(result); -} - -UniValue diceaddfunds(const UniValue& params, bool fHelp, const CPubKey& mypk) -{ - UniValue result(UniValue::VOBJ); char *name; uint256 fundingtxid; int64_t amount; std::string hex; - if ( fHelp || params.size() != 3 ) - throw runtime_error("diceaddfunds name fundingtxid amount\n"); - if ( ensure_CCrequirements(EVAL_DICE) < 0 ) - throw runtime_error(CC_REQUIREMENTS_MSG); - const CKeyStore& keystore = *pwalletMain; - LOCK2(cs_main, pwalletMain->cs_wallet); - name = (char *)params[0].get_str().c_str(); - fundingtxid = Parseuint256((char *)params[1].get_str().c_str()); - amount = atof(params[2].get_str().c_str()) * COIN + 0.00000000499999; - if (!VALID_PLAN_NAME(name)) { - ERR_RESULT(strprintf("Plan name can be at most %d ASCII characters",PLAN_NAME_MAX)); - return(result); - } - if ( amount > 0 ) { - hex = DiceAddfunding(0,name,fundingtxid,amount); - if (CCerror != "") { - ERR_RESULT(CCerror); - } else if ( hex.size() > 0 ) { - result.push_back(Pair("result", "success")); - result.push_back(Pair("hex", hex)); - } else ERR_RESULT("couldnt create dice addfunding transaction"); - } else ERR_RESULT("amount must be positive"); - return(result); -} - -UniValue dicebet(const UniValue& params, bool fHelp, const CPubKey& mypk) -{ - UniValue result(UniValue::VOBJ); std::string hex,error; uint256 fundingtxid; int64_t amount,odds; char *name; - if ( fHelp || params.size() != 4 ) - throw runtime_error("dicebet name fundingtxid amount odds\n"); - if ( ensure_CCrequirements(EVAL_DICE) < 0 ) - throw runtime_error(CC_REQUIREMENTS_MSG); - const CKeyStore& keystore = *pwalletMain; - LOCK2(cs_main, pwalletMain->cs_wallet); - name = (char *)params[0].get_str().c_str(); - fundingtxid = Parseuint256((char *)params[1].get_str().c_str()); - amount = atof(params[2].get_str().c_str()) * COIN + 0.00000000499999; - odds = atol(params[3].get_str().c_str()); - - if (!VALID_PLAN_NAME(name)) { - ERR_RESULT(strprintf("Plan name can be at most %d ASCII characters",PLAN_NAME_MAX)); - return(result); - } - if (amount > 0 && odds > 0) { - hex = DiceBet(0,name,fundingtxid,amount,odds); - RETURN_IF_ERROR(CCerror); - if ( hex.size() > 0 ) - { - result.push_back(Pair("result", "success")); - result.push_back(Pair("hex", hex)); - } - } else { - ERR_RESULT("amount and odds must be positive"); - } - return(result); -} - -UniValue dicefinish(const UniValue& params, bool fHelp, const CPubKey& mypk) -{ - UniValue result(UniValue::VOBJ); uint8_t funcid; char *name; uint256 entropyused,fundingtxid,bettxid; std::string hex; int32_t r,entropyvout; - if ( fHelp || params.size() != 3 ) - throw runtime_error("dicefinish name fundingtxid bettxid\n"); - if ( ensure_CCrequirements(EVAL_DICE) < 0 ) - throw runtime_error(CC_REQUIREMENTS_MSG); - const CKeyStore& keystore = *pwalletMain; - LOCK2(cs_main, pwalletMain->cs_wallet); - name = (char *)params[0].get_str().c_str(); - if (!VALID_PLAN_NAME(name)) { - ERR_RESULT(strprintf("Plan name can be at most %d ASCII characters",PLAN_NAME_MAX)); - return(result); - } - fundingtxid = Parseuint256((char *)params[1].get_str().c_str()); - bettxid = Parseuint256((char *)params[2].get_str().c_str()); - hex = DiceBetFinish(funcid,entropyused,entropyvout,&r,0,name,fundingtxid,bettxid,1,zeroid,-1); - if ( CCerror != "" ) - { - ERR_RESULT(CCerror); - } else if ( hex.size() > 0 ) - { - result.push_back(Pair("result", "success")); - result.push_back(Pair("hex", hex)); - if ( funcid != 0 ) - { - char funcidstr[2]; - funcidstr[0] = funcid; - funcidstr[1] = 0; - result.push_back(Pair("funcid", funcidstr)); - } - } else ERR_RESULT( "couldnt create dicefinish transaction"); - return(result); -} - -UniValue dicestatus(const UniValue& params, bool fHelp, const CPubKey& mypk) -{ - UniValue result(UniValue::VOBJ); char *name; uint256 fundingtxid,bettxid; std::string status,error; double winnings; - if ( fHelp || (params.size() != 2 && params.size() != 3) ) - throw runtime_error("dicestatus name fundingtxid bettxid\n"); - if ( ensure_CCrequirements(EVAL_DICE) < 0 ) - throw runtime_error(CC_REQUIREMENTS_MSG); - const CKeyStore& keystore = *pwalletMain; - LOCK2(cs_main, pwalletMain->cs_wallet); - name = (char *)params[0].get_str().c_str(); - if (!VALID_PLAN_NAME(name)) { - ERR_RESULT(strprintf("Plan name can be at most %d ASCII characters",PLAN_NAME_MAX)); - return(result); - } - fundingtxid = Parseuint256((char *)params[1].get_str().c_str()); - memset(&bettxid,0,sizeof(bettxid)); - if ( params.size() == 3 ) - bettxid = Parseuint256((char *)params[2].get_str().c_str()); - winnings = DiceStatus(0,name,fundingtxid,bettxid); - RETURN_IF_ERROR(CCerror); - - result.push_back(Pair("result", "success")); - if ( winnings >= 0. ) - { - if ( winnings > 0. ) - { - if ( params.size() == 3 ) - { - int64_t val; - val = winnings * COIN + 0.00000000499999; - result.push_back(Pair("status", "win")); - result.push_back(Pair("won", ValueFromAmount(val))); - } - else - { - result.push_back(Pair("status", "finalized")); - result.push_back(Pair("n", (int64_t)winnings)); - } - } - else - { - if ( params.size() == 3 ) - result.push_back(Pair("status", "loss")); - else result.push_back(Pair("status", "no pending bets")); - } - } else result.push_back(Pair("status", "bet still pending")); - return(result); -} - -UniValue dicelist(const UniValue& params, bool fHelp, const CPubKey& mypk) -{ - if ( fHelp || params.size() > 0 ) - throw runtime_error("dicelist\n"); - if ( ensure_CCrequirements(EVAL_DICE) < 0 ) - throw runtime_error(CC_REQUIREMENTS_MSG); - return(DiceList()); -} - -UniValue diceinfo(const UniValue& params, bool fHelp, const CPubKey& mypk) -{ - uint256 fundingtxid; - if ( fHelp || params.size() != 1 ) - throw runtime_error("diceinfo fundingtxid\n"); - if ( ensure_CCrequirements(EVAL_DICE) < 0 ) - throw runtime_error(CC_REQUIREMENTS_MSG); - fundingtxid = Parseuint256((char *)params[0].get_str().c_str()); - return(DiceInfo(fundingtxid)); -} - UniValue tokenlist(const UniValue& params, bool fHelp, const CPubKey& mypk) { uint256 tokenid; From 73d92a821e25bab2ce0e3e7c50c922609378961c Mon Sep 17 00:00:00 2001 From: Duke Date: Fri, 12 Jan 2024 12:54:56 -0500 Subject: [PATCH 025/108] remove sudoku --- src/cc/cclib.cpp | 5 - src/cc/sudoku.cpp | 3055 --------------------------------------------- 2 files changed, 3060 deletions(-) delete mode 100644 src/cc/sudoku.cpp diff --git a/src/cc/cclib.cpp b/src/cc/cclib.cpp index 9f902a140..b807f8113 100644 --- a/src/cc/cclib.cpp +++ b/src/cc/cclib.cpp @@ -83,10 +83,6 @@ CClib_methods[] = #elif BUILD_GAMESCC RPC_FUNCS #else - { (char *)"sudoku", (char *)"gen", (char *)"", 0, 0, 'G', EVAL_SUDOKU }, - { (char *)"sudoku", (char *)"txidinfo", (char *)"txid", 1, 1, 'T', EVAL_SUDOKU }, - { (char *)"sudoku", (char *)"pending", (char *)"", 0, 0, 'U', EVAL_SUDOKU }, - { (char *)"sudoku", (char *)"solution", (char *)"txid solution timestamps[81]", 83, 83, 'S', EVAL_SUDOKU }, { (char *)"musig", (char *)"calcmsg", (char *)"sendtxid scriptPubKey", 2, 2, 'C', EVAL_MUSIG }, { (char *)"musig", (char *)"combine", (char *)"pubkeys ...", 2, 999999999, 'P', EVAL_MUSIG }, { (char *)"musig", (char *)"session", (char *)"myindex,numsigners,combined_pk,pkhash,msg32", 5, 5, 'R', EVAL_MUSIG }, @@ -691,7 +687,6 @@ int32_t cclib_parsehash(uint8_t *hash32,cJSON *item,int32_t len) #include "gamescc.cpp" #else -#include "sudoku.cpp" #include "musig.cpp" #include "dilithium.c" //#include "../secp256k1/src/modules/musig/example.c" diff --git a/src/cc/sudoku.cpp b/src/cc/sudoku.cpp deleted file mode 100644 index 5d410eb1d..000000000 --- a/src/cc/sudoku.cpp +++ /dev/null @@ -1,3055 +0,0 @@ -// Copyright (c) 2016-2023 The Hush developers -// Distributed under the GPLv3 software license, see the accompanying -// file COPYING or https://www.gnu.org/licenses/gpl-3.0.en.html -// From https://github.com/attractivechaos/plb/blob/master/sudoku/incoming/sudoku_solver.c -/************************************************************************************/ -/* */ -/* Author: Bill DuPree */ -/* Name: sudoku_solver.c */ -/* Language: C */ -/* Date: Feb. 25, 2006 */ -/* Copyright (C) Feb. 25, 2006, All rights reserved. */ -/* */ -/* This is a program that solves Su Doku (aka Sudoku, Number Place, etc.) puzzles */ -/* primarily using deductive logic. It will only resort to trial-and-error and */ -/* backtracking approaches upon exhausting all of its deductive moves. */ -/* */ -/* Puzzles must be of the standard 9x9 variety using the (ASCII) characters '1' */ -/* through '9' for the puzzle solution set. Puzzles should be submitted as 81 */ -/* character strings which, when read left-to-right will fill a 9x9 Sudoku grid */ -/* from left-to-right and top-to-bottom. In the puzzle specification, the */ -/* characters 1 - 9 represent the puzzle "givens" or clues. Any other non-blank */ -/* character represents an unsolved cell. */ -/* */ -/* The puzzle solving algorithm is "home grown." I did not borrow any of the usual */ -/* techniques from the literature, e.g. Donald Knuth's "Dancing Links." Instead */ -/* I "rolled my own" from scratch. As such, its performance can only be blamed */ -/* on yours truly. Still, I feel it is quite fast. On a 333 MHz Pentium II Linux */ -/* box it solves typical medium force puzzles in approximately 800 microseconds or */ -/* about 1,200 puzzles per second, give or take. On an Athlon XP 3000 (Barton core) */ -/* it solves about 6,600 puzzles per sec. */ -/* */ -/* DESCRIPTION OF ALGORITHM: */ -/* */ -/* The puzzle algorithm initially assumes every unsolved cell can assume every */ -/* possible value. It then uses the placement of the givens to refine the choices */ -/* available to each cell. I call this the markup phase. */ -/* */ -/* After markup completes, the algorithm then looks for "singleton" cells with */ -/* values that, due to constraints imposed by the row, column, or 3x3 region, may */ -/* only assume one possible value. Once these cells are assigned values, the */ -/* algorithm returns to the markup phase to apply these changes to the remaining */ -/* candidate solutions. The markup/singleton phases alternate until either no more */ -/* changes occur, or the puzzle is solved. I call the markup/singleton elimination */ -/* loop the "Simple Solver" because in a large percentage of cases it solves the */ -/* puzzle. */ -/* */ -/* If the simple solver portion of the algorithm doesn't produce a solution, then */ -/* more advanced deductive rules are applied. I've implemented two additional rules */ -/* as part of the deductive puzzle solver. The first is subset elimination wherein */ -/* a row/column/region is scanned for X number of cells with X number of matching */ -/* candidate solutions. If such subsets are found in the row, column, or region, */ -/* then the candidates values from the subset may be eliminated from all other */ -/* unsolved cells within the row, column, or region, respectively. */ -/* */ -/* The second advanced deductive rule examines each region looking for candidate */ -/* values that exclusively align themselves along a single row or column, i.e. a */ -/* a vector. If such candidate values are found, then they may be eliminated from */ -/* the cells outside of the region that are part of the aligned row or column. */ -/* */ -/* Note that each of the advanced deductive rules calls all preceeding rules, in */ -/* order, if that advanced rule has effected a change in puzzle markup. */ -/* */ -/* Finally, if no solution is found after iteratively applying all deductive rules, */ -/* then we begin trial-and-error using recursion for backtracking. A working copy */ -/* is created from our puzzle, and using this copy the first cell with the */ -/* smallest number of candidate solutions is chosen. One of the solutions values is */ -/* assigned to that cell, and the solver algorithm is called using this working */ -/* copy as its starting point. Eventually, either a solution, or an impasse is */ -/* reached. */ -/* */ -/* If we reach an impasse, the recursion unwinds and the next trial solution is */ -/* attempted. If a solution is found (at any point) the values for the solution are */ -/* added to a list. Again, so long as we are examining all possibilities, the */ -/* recursion unwinds so that the next trial may be attempted. It is in this manner */ -/* that we enumerate puzzles with multiple solutions. */ -/* */ -/* Note that it is certainly possible to add to the list of applied deductive */ -/* rules. The techniques known as "X-Wing" and "Swordfish" come to mind. On the */ -/* other hand, adding these additional rules will, in all likelihood, slow the */ -/* solver down by adding to the computational burden while producing very few */ -/* results. I've seen the law of diminishing returns even in some of the existing */ -/* rules, e.g. in subset elimination I only look at two and three valued subsets */ -/* because taking it any further than that degraded performance. */ -/* */ -/* PROGRAM INVOCATION: */ -/* */ -/* This program is a console (or command line) based utility and has the following */ -/* usage: */ -/* */ -/* sudoku_solver {-p puzzle | -f } [-o ] */ -/* [-r ] [-1][-a][-c][-g][-l][-m][-n][-s] */ -/* */ -/* where: */ -/* */ -/* -1 Search for first solution, otherwise all solutions are returned */ -/* -a Requests that the answer (solution) be printed */ -/* -c Print a count of solutions for each puzzle */ -/* -d Print the recursive trial depth required to solve the puzzle */ -/* -e Print a step-by-step explanation of the solution(s) */ -/* -f Takes an argument which specifes an input file */ -/* containing one or more unsolved puzzles (default: stdin) */ -/* -G Print the puzzle solution(s) in a 9x9 grid format */ -/* -g Print the number of given clues */ -/* -l Print the recursive trial depth required to solve the puzzle */ -/* -m Print an octal mask for the puzzle givens */ -/* -n Number each result */ -/* -o Specifies an output file for the solutions (default: stdout) */ -/* -p Takes an argument giving a single inline puzzle to be solved */ -/* -r Specifies an output file for unsolvable puzzles */ -/* (default: stderr) */ -/* -s Print the puzzle's score or difficulty rating */ -/* -? Print usage information */ -/* */ -/* The return code is zero if all puzzles had unique solutions, */ -/* (or have one or more solutions when -1 is specified) and non-zero */ -/* when no unique solution exists. */ -/* */ -/* PUZZLE SCORING */ -/* */ -/* A word about puzzle scoring, i.e. rating a puzzle's difficulty, is in order. */ -/* Rating Sudoku puzzles is a rather subjective thing, and thus it is difficult to */ -/* really develop an objective puzzle rating system. I, however, have attempted */ -/* this feat (several times with varying degrees of success ;-) and I think the */ -/* heuristics I'm currently applying aren't too bad for rating the relative */ -/* difficulty of solving a puzzle. */ -/* */ -/* The following is a brief rundown of how it works. The initial puzzle markup is */ -/* a "free" operation, i.e. no points are scored for the first markup pass. I feel */ -/* this is appropriate because a person solving a puzzle will always have to do */ -/* their own eyeballing and scanning of the puzzle. Subsequent passes are */ -/* scored at one point per candidate eliminated because these passes indicate */ -/* that more deductive work is required. Secondly, the "reward" for solving a cell */ -/* is set to one point, and as long as the solution only requires simple markup */ -/* and elimination of singletons, this level of reward remains unchanged. */ -/* */ -/* This reward changes, however, when advanced solving rules are required. Puzzles */ -/* that remain unsolved after the first pass through the simple solver phase have */ -/* a higher "reward", i.e. it is incremented by two. Thus, if subset or vector */ -/* elimination is required, all subsequently solved cells score higher bounties. */ -/* In addition, the successful application of these deductive techniques score */ -/* their own penalties. */ -/* */ -/* Finally, if a trial-and-error approach is called for, then the "reward" is */ -/* incremented by another five points. Thus, the total penalty for each level of */ -/* recursion is an additional seven points per solved cell, i.e. */ -/* (recursive_depth * 7) + 1 points per solved cell. Trial solutions are also */ -/* penalized by a weighting factor that is based upon the number of unsolved cells */ -/* that remain upon reentry to the solver and the depth of recursion. (I've seen a */ -/* pathological puzzle from the "Minimum Sudoku" web site require 16 levels of */ -/* recursion and score a whopping 228,642 points using this scoring system!) */ -/* */ -/* And that brings me to this topic: What do all these points mean? */ -/* */ -/* Well, who knows? This is still subjective, and the weighting system I've chosen */ -/* for point scoring is is largely arbitrary. But based upon feedback from a number */ -/* of individuals, a rough scale of difficulty plays out as follows: */ -/* */ -/* DEGREE OF DIFFICULTY | SCORE */ -/* -------------------------+------------------------------------------ */ -/* TRIVIAL | 80 points or less */ -/* EASY | 81 - 150 points */ -/* MEDIUM | 151 - 250 points */ -/* HARD | 251 - 400 points */ -/* VERY HARD | 401 - 900 points */ -/* DIABOLICAL | 901 and up */ -/* */ -/* Experience shows that puzzles in the HARD category, in a few cases, will */ -/* require a small amount of trial-and-error. The VERY HARD puzzles will likely */ -/* require trial-and-error, and in some cases more than one level of trial-and- */ -/* error. As for the DIABOLICAL puzzles--why waste your time? These are best left */ -/* to masochists, savants and automated solvers. YMMV. */ -/* */ -/* LICENSE: */ -/* */ -/* This program is free software; you can redistribute it and/or modify */ -/* it under the terms of the GNU General Public License as published by */ -/* the Free Software Foundation; either version 2 of the License, or */ -/* (at your option) any later version. */ -/* */ -/* This program is distributed in the hope that it will be useful, */ -/* but WITHOUT ANY WARRANTY; without even the implied warranty of */ -/* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the */ -/* GNU General Public License for more details. */ -/* */ -/* You should have received a copy of the GNU General Public License */ -/* along with this program; if not, write to the Free Software */ -/* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -/* */ -/* CONTACT: */ -/* */ -/* Email: bdupree@techfinesse.com */ -/* Post: Bill DuPree, 609 Wenonah Ave, Oak Park, IL 60304 USA */ -/* */ -/************************************************************************************/ -/* */ -/* CHANGE LOG: */ -/* */ -/* Rev. Date Init. Description */ -/* -------------------------------------------------------------------------------- */ -/* 1.00 2006-02-25 WD Initial version. */ -/* 1.01 2006-03-13 WD Fixed return code calc. Added signon message. */ -/* 1.10 2006-03-20 WD Added explain option, add'l speed optimizations */ -/* 1.11 2006-03-23 WD More simple speed optimizations, cleanup, bug fixes */ -/* */ -/************************************************************************************/ - -#include -#include -#include -#include -#include -#include - -#define VERSION "1.11" - -#define PUZZLE_ORDER 3 -#define PUZZLE_DIM (PUZZLE_ORDER*PUZZLE_ORDER) -#define PUZZLE_CELLS (PUZZLE_DIM*PUZZLE_DIM) - -/* Command line options */ -#ifdef EXPLAIN -#define OPTIONS "?1acdef:Ggmno:p:r:s" -#else -#define OPTIONS "?1acdf:Ggmno:p:r:s" -#endif -extern char *optarg; -extern int optind, opterr, optopt; - -static char *myname; /* Name that we were invoked under */ - -static FILE *solnfile, *rejects; - -/* This is the list of cell coordinates specified on a row basis */ - -static int const row[PUZZLE_DIM][PUZZLE_DIM] = { - { 0, 1, 2, 3, 4, 5, 6, 7, 8 }, - { 9, 10, 11, 12, 13, 14, 15, 16, 17 }, - { 18, 19, 20, 21, 22, 23, 24, 25, 26 }, - { 27, 28, 29, 30, 31, 32, 33, 34, 35 }, - { 36, 37, 38, 39, 40, 41, 42, 43, 44 }, - { 45, 46, 47, 48, 49, 50, 51, 52, 53 }, - { 54, 55, 56, 57, 58, 59, 60, 61, 62 }, - { 63, 64, 65, 66, 67, 68, 69, 70, 71 }, - { 72, 73, 74, 75, 76, 77, 78, 79, 80 }}; - -/* This is the list of cell coordinates specified on a column basis */ - -static int const col[PUZZLE_DIM][PUZZLE_DIM] = { - { 0, 9, 18, 27, 36, 45, 54, 63, 72 }, - { 1, 10, 19, 28, 37, 46, 55, 64, 73 }, - { 2, 11, 20, 29, 38, 47, 56, 65, 74 }, - { 3, 12, 21, 30, 39, 48, 57, 66, 75 }, - { 4, 13, 22, 31, 40, 49, 58, 67, 76 }, - { 5, 14, 23, 32, 41, 50, 59, 68, 77 }, - { 6, 15, 24, 33, 42, 51, 60, 69, 78 }, - { 7, 16, 25, 34, 43, 52, 61, 70, 79 }, - { 8, 17, 26, 35, 44, 53, 62, 71, 80 }}; - -/* This is the list of cell coordinates specified on a 3x3 region basis */ - -static int const region[PUZZLE_DIM][PUZZLE_DIM] = { - { 0, 1, 2, 9, 10, 11, 18, 19, 20 }, - { 3, 4, 5, 12, 13, 14, 21, 22, 23 }, - { 6, 7, 8, 15, 16, 17, 24, 25, 26 }, - { 27, 28, 29, 36, 37, 38, 45, 46, 47 }, - { 30, 31, 32, 39, 40, 41, 48, 49, 50 }, - { 33, 34, 35, 42, 43, 44, 51, 52, 53 }, - { 54, 55, 56, 63, 64, 65, 72, 73, 74 }, - { 57, 58, 59, 66, 67, 68, 75, 76, 77 }, - { 60, 61, 62, 69, 70, 71, 78, 79, 80 }}; - -/* Flags for cellflags member */ -#define GIVEN 1 -#define FOUND 2 -#define STUCK 3 - -/* Return codes for funcs that modify puzzle markup */ -#define NOCHANGE 0 -#define CHANGE 1 - -typedef struct grd { - short cellflags[PUZZLE_CELLS]; - short solved[PUZZLE_CELLS]; - short cell[PUZZLE_CELLS]; - short tail, givens, exposed, maxlvl, inc, reward; - unsigned int score, solncount; - struct grd *next; -} grid; - -typedef int (*return_soln)(grid *g); - -static grid *soln_list = NULL; - -typedef struct { - short row, col, region; -} cellmap; - -/* Array structure to help map cell index back to row, column, and region */ -static cellmap const map[PUZZLE_CELLS] = { - { 0, 0, 0 }, - { 0, 1, 0 }, - { 0, 2, 0 }, - { 0, 3, 1 }, - { 0, 4, 1 }, - { 0, 5, 1 }, - { 0, 6, 2 }, - { 0, 7, 2 }, - { 0, 8, 2 }, - { 1, 0, 0 }, - { 1, 1, 0 }, - { 1, 2, 0 }, - { 1, 3, 1 }, - { 1, 4, 1 }, - { 1, 5, 1 }, - { 1, 6, 2 }, - { 1, 7, 2 }, - { 1, 8, 2 }, - { 2, 0, 0 }, - { 2, 1, 0 }, - { 2, 2, 0 }, - { 2, 3, 1 }, - { 2, 4, 1 }, - { 2, 5, 1 }, - { 2, 6, 2 }, - { 2, 7, 2 }, - { 2, 8, 2 }, - { 3, 0, 3 }, - { 3, 1, 3 }, - { 3, 2, 3 }, - { 3, 3, 4 }, - { 3, 4, 4 }, - { 3, 5, 4 }, - { 3, 6, 5 }, - { 3, 7, 5 }, - { 3, 8, 5 }, - { 4, 0, 3 }, - { 4, 1, 3 }, - { 4, 2, 3 }, - { 4, 3, 4 }, - { 4, 4, 4 }, - { 4, 5, 4 }, - { 4, 6, 5 }, - { 4, 7, 5 }, - { 4, 8, 5 }, - { 5, 0, 3 }, - { 5, 1, 3 }, - { 5, 2, 3 }, - { 5, 3, 4 }, - { 5, 4, 4 }, - { 5, 5, 4 }, - { 5, 6, 5 }, - { 5, 7, 5 }, - { 5, 8, 5 }, - { 6, 0, 6 }, - { 6, 1, 6 }, - { 6, 2, 6 }, - { 6, 3, 7 }, - { 6, 4, 7 }, - { 6, 5, 7 }, - { 6, 6, 8 }, - { 6, 7, 8 }, - { 6, 8, 8 }, - { 7, 0, 6 }, - { 7, 1, 6 }, - { 7, 2, 6 }, - { 7, 3, 7 }, - { 7, 4, 7 }, - { 7, 5, 7 }, - { 7, 6, 8 }, - { 7, 7, 8 }, - { 7, 8, 8 }, - { 8, 0, 6 }, - { 8, 1, 6 }, - { 8, 2, 6 }, - { 8, 3, 7 }, - { 8, 4, 7 }, - { 8, 5, 7 }, - { 8, 6, 8 }, - { 8, 7, 8 }, - { 8, 8, 8 } -}; - -static const short symtab[1<= '1') && (c <= '9'); } - -#if defined(DEBUG) -static void mypause() -{ - char buf[8]; - printf("\tPress enter -> "); - fgets(buf, 8, stdin); -} -#endif - -#if 0 -/* Generic (and slow) bitcount function */ -static int bitcount(short cell) -{ - int i, count, mask; - - mask = 1; - for (i = count = 0; i < 16; i++) { - if (mask & cell) count++; - mask <<= 1; - } - return count; -} -#endif - -/*****************************************************/ -/* Return the number of '1' bits in a cell. */ -/* Rather than count bits, do a quick table lookup. */ -/* Warning: Only valid for 9 low order bits. */ -/*****************************************************/ - -static inline short bitcount(short cell) -{ - static const short bcounts[512] = { - 0,1,1,2,1,2,2,3,1,2,2,3,2,3,3,4,1,2,2,3,2,3,3,4,2,3,3,4,3,4,4,5, - 1,2,2,3,2,3,3,4,2,3,3,4,3,4,4,5,2,3,3,4,3,4,4,5,3,4,4,5,4,5,5,6, - 1,2,2,3,2,3,3,4,2,3,3,4,3,4,4,5,2,3,3,4,3,4,4,5,3,4,4,5,4,5,5,6, - 2,3,3,4,3,4,4,5,3,4,4,5,4,5,5,6,3,4,4,5,4,5,5,6,4,5,5,6,5,6,6,7, - 1,2,2,3,2,3,3,4,2,3,3,4,3,4,4,5,2,3,3,4,3,4,4,5,3,4,4,5,4,5,5,6, - 2,3,3,4,3,4,4,5,3,4,4,5,4,5,5,6,3,4,4,5,4,5,5,6,4,5,5,6,5,6,6,7, - 2,3,3,4,3,4,4,5,3,4,4,5,4,5,5,6,3,4,4,5,4,5,5,6,4,5,5,6,5,6,6,7, - 3,4,4,5,4,5,5,6,4,5,5,6,5,6,6,7,4,5,5,6,5,6,6,7,5,6,6,7,6,7,7,8, - 1,2,2,3,2,3,3,4,2,3,3,4,3,4,4,5,2,3,3,4,3,4,4,5,3,4,4,5,4,5,5,6, - 2,3,3,4,3,4,4,5,3,4,4,5,4,5,5,6,3,4,4,5,4,5,5,6,4,5,5,6,5,6,6,7, - 2,3,3,4,3,4,4,5,3,4,4,5,4,5,5,6,3,4,4,5,4,5,5,6,4,5,5,6,5,6,6,7, - 3,4,4,5,4,5,5,6,4,5,5,6,5,6,6,7,4,5,5,6,5,6,6,7,5,6,6,7,6,7,7,8, - 2,3,3,4,3,4,4,5,3,4,4,5,4,5,5,6,3,4,4,5,4,5,5,6,4,5,5,6,5,6,6,7, - 3,4,4,5,4,5,5,6,4,5,5,6,5,6,6,7,4,5,5,6,5,6,6,7,5,6,6,7,6,7,7,8, - 3,4,4,5,4,5,5,6,4,5,5,6,5,6,6,7,4,5,5,6,5,6,6,7,5,6,6,7,6,7,7,8, - 4,5,5,6,5,6,6,7,5,6,6,7,6,7,7,8,5,6,6,7,6,7,7,8,6,7,7,8,7,8,8,9}; - - return bcounts[cell]; -} - -#ifdef EXPLAIN - -/**************************************************/ -/* Indent two spaces for each level of recursion. */ -/**************************************************/ -static inline void explain_indent(FILE *h) -{ - int i; - - for (i = 0; i < lvl-1; i++) fprintf(h, " "); -} - -/******************************************************************/ -/* Construct a string representing the possible values a cell may */ -/* contain according to current markup. */ -/******************************************************************/ -static char *clues(short cell) -{ - int i, m, multi, mask; - static char buf[64], *p; - - multi = m = bitcount(cell); - - if (!multi) return "NULL"; - - if (multi > 1) { - strcpy(buf, "tuple ("); - } - else { - strcpy(buf, "value "); - } - - p = buf + strlen(buf); - - for (mask = i = 1; i <= PUZZLE_DIM; i++) { - if (mask & cell) { - *p++ = symtab[mask]; - multi -= 1; - if (multi) { *p++ = ','; *p++ = ' '; } - } - mask <<= 1; - } - if (m > 1) *p++ = ')'; - *p = 0; - return buf; -} - -/*************************************************************/ -/* Explain removal of a candidate value from a changed cell. */ -/*************************************************************/ -static void explain_markup_elim(grid *g, int chgd, int clue) -{ - int chgd_row, chgd_col, clue_row, clue_col; - - chgd_row = map[chgd].row+1; - chgd_col = map[chgd].col+1; - clue_row = map[clue].row+1; - clue_col = map[clue].col+1; - - explain_indent(solnfile); - fprintf(solnfile, "Candidate %s removed from row %d, col %d because of cell at row %d, col %d\n", - clues(g->cell[clue]), chgd_row, chgd_col, clue_row, clue_col); -} - -/*****************************************/ -/* Dump the state of the current markup. */ -/*****************************************/ -static void explain_current_markup(grid *g) -{ - if (g->exposed >= PUZZLE_CELLS) return; - - fprintf(solnfile, "\n"); - explain_indent(solnfile); - fprintf(solnfile, "Current markup is as follows:"); - diagnostic_grid(g, solnfile); - fprintf(solnfile, "\n"); -} - -/****************************************/ -/* Explain the solving of a given cell. */ -/****************************************/ -static void explain_solve_cell(grid *g, int chgd) -{ - int chgd_row, chgd_col; - - chgd_row = map[chgd].row+1; - chgd_col = map[chgd].col+1; - - explain_indent(solnfile); - fprintf(solnfile, "Cell at row %d, col %d solved with %s\n", - chgd_row, chgd_col, clues(g->cell[chgd])); -} - -/******************************************************************/ -/* Explain the current impasse reached during markup elimination. */ -/******************************************************************/ -static void explain_markup_impasse(grid *g, int chgd, int clue) -{ - int chgd_row, chgd_col, clue_row, clue_col; - - chgd_row = map[chgd].row+1; - chgd_col = map[chgd].col+1; - clue_row = map[clue].row+1; - clue_col = map[clue].col+1; - - explain_indent(solnfile); - fprintf(solnfile, "Impasse for cell at row %d, col %d because cell at row %d, col %d removes last candidate\n", - chgd_row, chgd_col, clue_row, clue_col); - explain_current_markup(g); -} - -/****************************************/ -/* Explain naked and/or hidden singles. */ -/****************************************/ -static void explain_singleton(grid *g, int chgd, int mask, char *vdesc) -{ - int chgd_row, chgd_col, chgd_reg; - - chgd_row = map[chgd].row+1; - chgd_col = map[chgd].col+1; - chgd_reg = map[chgd].region+1; - - explain_indent(solnfile); - fprintf(solnfile, "Cell of region %d at row %d, col %d will only solve for %s in this %s\n", - chgd_reg, chgd_row, chgd_col, clues(mask), vdesc); - explain_solve_cell(g, chgd); -} - -/*********************************/ -/* Explain initial puzzle state. */ -/*********************************/ -static void explain_markup() -{ - fprintf(solnfile, "\n"); - explain_indent(solnfile); - fprintf(solnfile, "Assume all cells may contain any values in the range: [1 - 9]\n"); -} - -/************************/ -/* Explain given clues. */ -/************************/ -static void explain_given(int cell, char val) -{ - int cell_row, cell_col; - - cell_row = map[cell].row+1; - cell_col = map[cell].col+1; - - explain_indent(solnfile); - fprintf(solnfile, "Cell at row %d, col %d is given clue value %c\n", cell_row, cell_col, val); -} - -/*******************************************/ -/* Explain region/row/column interactions. */ -/*******************************************/ -static void explain_vector_elim(char *desc, int i, int cell, int val, int region) -{ - int cell_row, cell_col; - - cell_row = map[cell].row+1; - cell_col = map[cell].col+1; - - explain_indent(solnfile); - fprintf(solnfile, "Candidate %s removed from cell at row %d, col %d because it aligns along %s %d in region %d\n", - clues(val), cell_row, cell_col, desc, i+1, region+1); -} - -/******************************************************************/ -/* Explain the current impasse reached during vector elimination. */ -/******************************************************************/ -static void explain_vector_impasse(grid *g, char *desc, int i, int cell, int val, int region) -{ - int cell_row, cell_col; - - cell_row = map[cell].row+1; - cell_col = map[cell].col+1; - - explain_indent(solnfile); - fprintf(solnfile, "Impasse at cell at row %d, col %d because candidate %s aligns along %s %d in region %d\n", - cell_row, cell_col, clues(val), desc, i+1, region+1); - explain_current_markup(g); -} - -/*****************************************************************/ -/* Explain the current impasse reached during tuple elimination. */ -/*****************************************************************/ -static void explain_tuple_impasse(grid *g, char *desc, int elt, int tuple, int count, int bits) -{ - explain_indent(solnfile); - fprintf(solnfile, "Impasse in %s %d because too many (%d) cells have %d-valued %s\n", - desc, elt+1, count, bits, clues(tuple)); - explain_current_markup(g); -} - -/*********************************************************************/ -/* Explain the removal of a tuple of candidate solutions from a cell */ -/*********************************************************************/ -static void explain_tuple_elim(char *desc, int elt, int tuple, int cell) -{ - explain_indent(solnfile); - fprintf(solnfile, "Values of %s in %s %d removed from cell at row %d, col %d\n", - clues(tuple), desc, elt+1, map[cell].row+1, map[cell].col+1); - -} - -/**************************************************/ -/* Indicate that a viable solution has been found */ -/**************************************************/ -static void explain_soln_found(grid *g) -{ - char buf[90]; - - fprintf(solnfile, "\n"); - explain_indent(solnfile); - fprintf(solnfile, "Solution found: %s\n", format_answer(g, buf)); - print_grid(buf, solnfile); - fprintf(solnfile, "\n"); -} - -/***************************/ -/* Show the initial puzzle */ -/***************************/ -static void explain_grid(grid *g) -{ - char buf[90]; - - fprintf(solnfile, "Initial puzzle: %s\n", format_answer(g, buf)); - print_grid(buf, solnfile); - explain_current_markup(g); - fprintf(solnfile, "\n"); -} - -/*************************************************/ -/* Explain attempt at a trial and error solution */ -/*************************************************/ -static void explain_trial(int cell, int value) -{ - explain_indent(solnfile); - fprintf(solnfile, "Attempt trial where cell at row %d, col %d is assigned value %s\n", - map[cell].row+1, map[cell].col+1, clues(value)); -} - -/**********************************************/ -/* Explain back out of current trial solution */ -/**********************************************/ -static void explain_backtrack() -{ - if (lvl <= 1) return; - - explain_indent(solnfile); - fprintf(solnfile, "Backtracking\n\n"); -} - -#define EXPLAIN_MARKUP if (explain) explain_markup() -#define EXPLAIN_CURRENT_MARKUP(g) if (explain) explain_current_markup((g)) -#define EXPLAIN_GIVEN(cell, val) if (explain) explain_given((cell), (val)) -#define EXPLAIN_MARKUP_ELIM(g, chgd, clue) if (explain) explain_markup_elim((g), (chgd), (clue)) -#define EXPLAIN_MARKUP_SOLVE(g, cell) if (explain) explain_solve_cell((g), (cell)) -#define EXPLAIN_MARKUP_IMPASSE(g, chgd, clue) if (explain) explain_markup_impasse((g), (chgd), (clue)) -#define EXPLAIN_SINGLETON(g, chgd, mask, vdesc) if (explain) explain_singleton((g), (chgd), (mask), (vdesc)) -#define EXPLAIN_VECTOR_ELIM(desc, i, cell, v, r) if (explain) explain_vector_elim((desc), (i), (cell), (v), (r)) -#define EXPLAIN_VECTOR_IMPASSE(g, desc, i, cell, v, r) if (explain) explain_vector_impasse((g), (desc), (i), (cell), (v), (r)) -#define EXPLAIN_VECTOR_SOLVE(g, cell) if (explain) explain_solve_cell((g), (cell)) -#define EXPLAIN_TUPLE_IMPASSE(g, desc, j, c, count, i) if (explain) explain_tuple_impasse((g), (desc), (j), (c), (count), (i)) -#define EXPLAIN_TUPLE_ELIM(desc, j, c, cell) if (explain) explain_tuple_elim((desc), (j), (c), (cell)) -#define EXPLAIN_TUPLE_SOLVE(g, cell) if (explain) explain_solve_cell((g), (cell)) -#define EXPLAIN_SOLN_FOUND(g) if (explain) explain_soln_found((g)); -#define EXPLAIN_GRID(g) if (explain) explain_grid((g)); -#define EXPLAIN_TRIAL(cell, val) if (explain) explain_trial((cell), (val)); -#define EXPLAIN_BACKTRACK if (explain) explain_backtrack(); -#define EXPLAIN_INDENT(h) if (explain) explain_indent((h)) - -#else - -#define EXPLAIN_MARKUP -#define EXPLAIN_CURRENT_MARKUP(g) -#define EXPLAIN_GIVEN(cell, val) -#define EXPLAIN_MARKUP_ELIM(g, chgd, clue) -#define EXPLAIN_MARKUP_SOLVE(g, cell) -#define EXPLAIN_MARKUP_IMPASSE(g, chgd, clue) -#define EXPLAIN_SINGLETON(g, chgd, mask, vdesc); -#define EXPLAIN_VECTOR_ELIM(desc, i, cell, v, r) -#define EXPLAIN_VECTOR_IMPASSE(g, desc, i, cell, v, r) -#define EXPLAIN_VECTOR_SOLVE(g, cell) -#define EXPLAIN_TUPLE_IMPASSE(g, desc, j, c, count, i) -#define EXPLAIN_TUPLE_ELIM(desc, j, c, cell) -#define EXPLAIN_TUPLE_SOLVE(g, cell) -#define EXPLAIN_SOLN_FOUND(g) -#define EXPLAIN_GRID(g) -#define EXPLAIN_TRIAL(cell, val) -#define EXPLAIN_BACKTRACK -#define EXPLAIN_INDENT(h) - -#endif - - -/*****************************************************/ -/* Initialize a grid to an empty state. */ -/* At the start, all cells can have any value */ -/* so set all 9 lower order bits in each cell. */ -/* In effect, the 9x9 grid now has markup that */ -/* specifies that each cell can assume any value */ -/* of 1 through 9. */ -/*****************************************************/ - -static void init_grid(grid *g) -{ - int i; - - for (i = 0; i < PUZZLE_CELLS; i++) g->cell[i] = 0x01ff; - memset(g->cellflags, 0, PUZZLE_CELLS*sizeof(g->cellflags[0])); - g->exposed = 0; - g->givens = 0; - g->inc = 0; - g->maxlvl = 0; - g->score = 0; - g->solncount = 0; - g->reward = 1; - g->next = NULL; - g->tail = 0; - EXPLAIN_MARKUP; -} - -/*****************************************************/ -/* Convert a puzzle from the input format, */ -/* i.e. a string of 81 non-blank characters */ -/* with ASCII digits '1' thru '9' specified */ -/* for the givens, and non-numeric characters */ -/* for the remaining cells. The string, read */ -/* left-to-right fills the 9x9 Sudoku grid */ -/* in left-to-right, top-to-bottom order. */ -/*****************************************************/ - -static void cvt_to_grid(grid *g, char *game) -{ - int i; - - init_grid(g); - - for (i = 0; i < PUZZLE_CELLS; i++) { - if (is_given(game[i])) { - /* warning -- ASCII charset assumed */ - g->cell[i] = 1 << (game[i] - '1'); - g->cellflags[i] = GIVEN; - g->givens += 1; - g->solved[g->exposed++] = i; - EXPLAIN_GIVEN(i, game[i]); - } - } - EXPLAIN_GRID(g); -} - -/****************************************************************/ -/* Print the partially solved puzzle and all associated markup */ -/* in 9x9 fashion. */ -/****************************************************************/ - -static void diagnostic_grid(grid *g, FILE *h) -{ - int i, j, flag; - short c; - char line1[40], line2[40], line3[40], cbuf1[5], cbuf2[5], cbuf3[5], outbuf[PUZZLE_CELLS+1]; - - /* Sanity check */ - for (flag = 1, i = 0; flag && i < PUZZLE_CELLS; i++) { - if (bitcount(g->cell[i]) != 1) { - flag = 0; - } - } - - /* Don't need to print grid with diagnostic markup? */ - if (flag) { - format_answer(g, outbuf); - print_grid(outbuf, h); - fflush(h); - return; - } - - strcpy(cbuf1, " |"); - strcpy(cbuf2, cbuf1); - strcpy(cbuf3, cbuf1); - fprintf(h, "\n"); - - for (i = 0; i < PUZZLE_DIM; i++) { - - *line1 = *line2 = *line3 = 0; - - for (j = 0; j < PUZZLE_DIM; j++) { - - c = g->cell[row[i][j]]; - - if (bitcount(c) == 1) { - strcpy(cbuf1, " |"); - strcpy(cbuf2, cbuf1); - strcpy(cbuf3, cbuf1); - cbuf2[1] = symtab[c]; - } - else { - if (c & 1) cbuf1[0] = '*'; else cbuf1[0] = '.'; - if (c & 2) cbuf1[1] = '*'; else cbuf1[1] = '.'; - if (c & 4) cbuf1[2] = '*'; else cbuf1[2] = '.'; - if (c & 8) cbuf2[0] = '*'; else cbuf2[0] = '.'; - if (c & 16) cbuf2[1] = '*'; else cbuf2[1] = '.'; - if (c & 32) cbuf2[2] = '*'; else cbuf2[2] = '.'; - if (c & 64) cbuf3[0] = '*'; else cbuf3[0] = '.'; - if (c & 128) cbuf3[1] = '*'; else cbuf3[1] = '.'; - if (c & 256) cbuf3[2] = '*'; else cbuf3[2] = '.'; - } - - strcat(line1, cbuf1); - strcat(line2, cbuf2); - strcat(line3, cbuf3); - } - - EXPLAIN_INDENT(h); - fprintf(h, "+---+---+---+---+---+---+---+---+---+\n"); - EXPLAIN_INDENT(h); - fprintf(h, "|%s\n", line1); - EXPLAIN_INDENT(h); - fprintf(h, "|%s\n", line2); - EXPLAIN_INDENT(h); - fprintf(h, "|%s\n", line3); - } - EXPLAIN_INDENT(h); - fprintf(h, "+---+---+---+---+---+---+---+---+---+\n"); fflush(h); -} - -/***********************************************************************/ -/* Validate that a sudoku grid contains a valid solution. Return 1 if */ -/* true, 0 if false. If the verbose argument is non-zero, then print */ -/* reasons for invalidating the solution to stderr. */ -/***********************************************************************/ - -static int validate(grid *g, int verbose) -{ - int i, j, regmask, rowmask, colmask, flag = 1; - - /* Sanity check */ - for (i = 0; i < PUZZLE_CELLS; i++) { - if (bitcount(g->cell[i]) != 1) { - if (verbose) { - fprintf(rejects, "Cell %d at row %d, col %d has no unique soln.\n", 1+i, 1+map[i].row, 1+map[i].col); fflush(rejects); - flag = 0; - } else return 0; - } - } - - /* Check rows */ - for (i = 0; i < PUZZLE_DIM; i++) { - for (rowmask = j = 0; j < PUZZLE_DIM; j++) { - if (bitcount(g->cell[row[i][j]]) == 1) rowmask |= g->cell[row[i][j]]; - } - if (rowmask != 0x01ff) { - if (verbose) { - fprintf(rejects, "Row %d is inconsistent.\n", 1+i); fflush(rejects); - flag = 0; - } else return 0; - } - } - - /* Check columns */ - for (i = 0; i < PUZZLE_DIM; i++) { - for (colmask = j = 0; j < PUZZLE_DIM; j++) { - if (bitcount(g->cell[col[i][j]]) == 1) colmask |= g->cell[col[i][j]]; - } - if (colmask != 0x01ff) { - if (verbose) { - fprintf(rejects, "Column %d is inconsistent.\n", 1+i); fflush(rejects); - flag = 0; - } else return 0; - } - } - - /* Check 3x3 regions */ - for (i = 0; i < PUZZLE_DIM; i++) { - for (regmask = j = 0; j < PUZZLE_DIM; j++) { - if (bitcount(g->cell[region[i][j]]) == 1) regmask |= g->cell[region[i][j]]; - } - if (regmask != 0x01ff) { - if (verbose) { - fprintf(rejects, "Region %d is inconsistent.\n", 1+i); fflush(rejects); - flag = 0; - } else return 0; - } - } - - return flag; -} - -/********************************************************************************/ -/* This function uses the cells with unique values, i.e. the given */ -/* or subsequently discovered solution values, to eliminate said values */ -/* as candidates in other as yet unsolved cells in the associated */ -/* rows, columns, and 3x3 regions. */ -/* */ -/* The function has three possible return values: */ -/* NOCHANGE - Markup did not change during the last pass, */ -/* CHANGE - Markup was modified, and */ -/* STUCK - Markup results are invalid, i.e. a cell has no candidate values */ -/********************************************************************************/ - -static int mark_cells(grid *g) -{ - int i, chgflag, bc; - int const *r, *c, *reg; - short elt, mask, before; - - - chgflag = NOCHANGE; - - while (g->tail < g->exposed) { - - elt = g->solved[g->tail++]; - - r = row[map[elt].row]; - c = col[map[elt].col]; - reg = region[map[elt].region]; - - mask = ~g->cell[elt]; - - for (i = 0; i < PUZZLE_DIM; i++) { - - if (r[i] != elt) { - - /* Get the cell value */ - before = g->cell[r[i]]; - - /* Eliminate this candidate value whilst preserving other candidate values */ - g->cell[r[i]] &= mask; - - /* Did the cell change value? */ - if (before != g->cell[r[i]]) { - - chgflag |= CHANGE; /* Flag that puzzle markup was changed */ - g->score += g->inc; /* More work means higher scoring */ - - if (!(bc = bitcount(g->cell[r[i]]))) { - EXPLAIN_MARKUP_IMPASSE(g, r[i], elt); - return STUCK; /* Crap out if no candidates remain */ - } - - EXPLAIN_MARKUP_ELIM(g, r[i], elt); - - /* Check if we solved for this cell, i.e. bit count indicates a unique value */ - if (bc == 1) { - g->cellflags[r[i]] = FOUND; /* Mark cell as found */ - g->score += g->reward; /* Add to puzzle score */ - g->solved[g->exposed++] = r[i]; - EXPLAIN_MARKUP_SOLVE(g, r[i]); - } - } - } - - if (c[i] != elt) { - - /* Get the cell value */ - before = g->cell[c[i]]; - - /* Eliminate this candidate value whilst preserving other candidate values */ - g->cell[c[i]] &= mask; - - /* Did the cell change value? */ - if (before != g->cell[c[i]]) { - - chgflag |= CHANGE; /* Flag that puzzle markup was changed */ - g->score += g->inc; /* More work means higher scoring */ - - if (!(bc = bitcount(g->cell[c[i]]))) { - EXPLAIN_MARKUP_IMPASSE(g, c[i], elt); - return STUCK; /* Crap out if no candidates remain */ - } - - EXPLAIN_MARKUP_ELIM(g, c[i], elt); - - /* Check if we solved for this cell, i.e. bit count indicates a unique value */ - if (bc == 1) { - g->cellflags[c[i]] = FOUND; /* Mark cell as found */ - g->score += g->reward; /* Add to puzzle score */ - g->solved[g->exposed++] = c[i]; - EXPLAIN_MARKUP_SOLVE(g, c[i]); - } - } - } - - if (reg[i] != elt) { - - /* Get the cell value */ - before = g->cell[reg[i]]; - - /* Eliminate this candidate value whilst preserving other candidate values */ - g->cell[reg[i]] &= mask; - - /* Did the cell change value? */ - if (before != g->cell[reg[i]]) { - - chgflag |= CHANGE; /* Flag that puzzle markup was changed */ - g->score += g->inc; /* More work means higher scoring */ - - if (!(bc = bitcount(g->cell[reg[i]]))) { - EXPLAIN_MARKUP_IMPASSE(g, reg[i], elt); - return STUCK; /* Crap out if no candidates remain */ - } - - EXPLAIN_MARKUP_ELIM(g, reg[i], elt); - - /* Check if we solved for this cell, i.e. bit count indicates a unique value */ - if (bc == 1) { - g->cellflags[reg[i]] = FOUND; /* Mark cell as found */ - g->score += g->reward; /* Add to puzzle score */ - g->solved[g->exposed++] = reg[i]; - EXPLAIN_MARKUP_SOLVE(g, reg[i]); - } - } - } - - } - } - - return chgflag; -} - - -/*******************************************************************/ -/* Identify and "solve" all cells that, by reason of their markup, */ -/* can only assume one specific value, i.e. the cell is the only */ -/* one in a row/column/region (specified by vector) that is */ -/* able to assume a particular value. */ -/* */ -/* The function has two possible return values: */ -/* NOCHANGE - Markup did not change during the last pass, */ -/* CHANGE - Markup was modified. */ -/*******************************************************************/ - -static int find_singletons(grid *g, int const *vector, char *vdesc) -{ - int i, j, mask, hist[PUZZLE_DIM], value[PUZZLE_DIM], found = NOCHANGE; - - /* We are going to create a histogram of cell candidate values */ - /* for the specified cell vector (row/column/region). */ - /* First set all buckets to zero. */ - memset(hist, 0, sizeof(hist[0])*PUZZLE_DIM); - - /* For each cell in the vector... */ - for (i = 0; i < PUZZLE_DIM; i++) { - - /* For each possible candidate value... */ - for (mask = 1, j = 0; j < PUZZLE_DIM; j++) { - - /* If the cell may possibly assume this value... */ - if (g->cell[vector[i]] & mask) { - - value[j] = vector[i]; /* Save the cell coordinate */ - hist[j] += 1; /* Bump bucket in histogram */ - } - - mask <<= 1; /* Next candidate value */ - } - } - - /* Examine each bucket in the histogram... */ - for (mask = 1, i = 0; i < PUZZLE_DIM; i++) { - - /* If the bucket == 1 and the cell is not already solved, */ - /* then the cell has a unique solution specified by "mask" */ - if (hist[i] == 1 && !g->cellflags[value[i]]) { - - found = CHANGE; /* Indicate that markup has been changed */ - g->cell[value[i]] = mask; /* Assign solution value to cell */ - g->cellflags[value[i]] = FOUND; /* Mark cell as solved */ - g->score += g->reward; /* Bump puzzle score */ - g->solved[g->exposed++] = value[i]; - EXPLAIN_SINGLETON(g, value[i], mask, vdesc); - } - - mask <<= 1; /* Get next candidate value */ - } - - return found; -} - - -/*******************************************************************/ -/* Find all cells with unique solutions (according to markup) */ -/* and mark them as found. Do this for each row, column, and */ -/* region. */ -/* */ -/* The function has two possible return values: */ -/* NOCHANGE - Markup did not change during the last pass, */ -/* CHANGE - Markup was modified. */ -/*******************************************************************/ - -static int eliminate_singles(grid *g) -{ - int i, found = NOCHANGE; - - /* Do rows */ - for (i = 0; i < PUZZLE_DIM; i++) { - found |= find_singletons(g, row[i], (char *)"row"); - } - - /* Do columns */ - for (i = 0; i < PUZZLE_DIM; i++) { - found |= find_singletons(g, col[i], (char *)"column"); - } - - /* Do regions */ - for (i = 0; i < PUZZLE_DIM; i++) { - found |= find_singletons(g, region[i], (char *)"region"); - } - - return found; -} - -/********************************************************************************/ -/* Solves simple puzzles, i.e. single elimination */ -/* */ -/* The function has three possible return values: */ -/* NOCHANGE - Markup did not change during the last pass, */ -/* CHANGE - Markup was modified, and */ -/* STUCK - Markup results are invalid, i.e. a cell has no candidate values */ -/********************************************************************************/ -static int simple_solver(grid *g) -{ - int flag = NOCHANGE; - - /* Mark the unsolved cells with candidate solutions based upon the current set of "givens" and solved cells */ - while ((flag |= mark_cells(g)) == CHANGE) { - - g->inc = 1; /* After initial markup, we start scoring for additional markup work */ - - EXPLAIN_CURRENT_MARKUP(g); - - /* Continue to eliminate cells with unique candidate solutions from the game until */ - /* elimination and repeated markup efforts produce no changes in the remaining */ - /* candidate solutions. */ - if (eliminate_singles(g) == NOCHANGE) break; - - EXPLAIN_CURRENT_MARKUP(g); - } - - return flag; -} - -/************************************************************************************/ -/* Test a region to see if the candidate solutions for a paticular number */ -/* are confined to one row or column, and if so, eliminate */ -/* their occurences in the remainder of the given row or column. */ -/* */ -/* The function has three possible return values: */ -/* NOCHANGE - Markup did not change during the last pass, */ -/* CHANGE - Markup was modified, and */ -/* STUCK - Markup results are invalid, i.e. a cell has no candidate values */ -/************************************************************************************/ - -static int region_vector_elim(grid *g, int region_no, int num) -{ - int i, j, r, c, mask, t, found; - short rowhist[PUZZLE_DIM], colhist[PUZZLE_DIM]; - - /* Init */ - found = NOCHANGE; - memset(rowhist, 0, sizeof(rowhist[0])*PUZZLE_DIM); - memset(colhist, 0, sizeof(colhist[0])*PUZZLE_DIM); - - mask = 1 << num; - - /* Create histograms for row and column placements for the value being checked */ - for (i = 0; i < PUZZLE_DIM; i++) { - j = region[region_no][i]; - if ((g->cell[j] & mask)) { - rowhist[map[j].row] += 1; - colhist[map[j].col] += 1; - } - } - - /* Figure out if this number lies in only one row or column */ - - /* Check rows first*/ - r = c = -1; - for (i = 0; i < PUZZLE_DIM; i++) { - if (rowhist[i]) { - if (r < 0) { - r = i; - } - else { - r = -1; - break; - } - } - } - - /* Now check columns */ - for (i = 0; i < PUZZLE_DIM; i++) { - if (colhist[i]) { - if (c < 0) { - c = i; - } - else { - c = -1; - break; - } - } - } - - /* If the number is only in one row, then eliminate this number from the cells in the row outside of this region */ - if (r >= 0) { - for (i = 0; i < PUZZLE_DIM; i++) { - j = row[r][i]; - if (map[j].region != region_no && !g->cellflags[j]) { - t = g->cell[j]; - if ((g->cell[j] &= ~mask) == 0) { - EXPLAIN_VECTOR_IMPASSE(g, "row", r, j, mask, region_no); - g->score += 10; - return STUCK; - } - if (t != g->cell[j]) { - found = CHANGE; - g->score += g->inc; - EXPLAIN_VECTOR_ELIM("row", r, j, mask, region_no); - if (bitcount(g->cell[j]) == 1) { - g->cellflags[j] = FOUND; - g->score += g->reward; - g->solved[g->exposed++] = j; - EXPLAIN_VECTOR_SOLVE(g, j); - } - } - } - } - } - - /* If the number is only in one column, then eliminate this number from the cells in the column outside of this region */ - else if (c >= 0) { - for (i = 0; i < PUZZLE_DIM; i++) { - j = col[c][i]; - if (map[j].region != region_no && !g->cellflags[j]) { - t = g->cell[j]; - if ((g->cell[j] &= ~mask) == 0) { - EXPLAIN_VECTOR_IMPASSE(g, "column", c, j, mask, region_no); - g->score += 10; - return STUCK; - } - if (t != g->cell[j]) { - found = CHANGE; - g->score += g->inc; - EXPLAIN_VECTOR_ELIM("column", c, j, mask, region_no); - if (bitcount(g->cell[j]) == 1) { - g->cellflags[j] = FOUND; - g->score += g->reward; - g->solved[g->exposed++] = j; - EXPLAIN_VECTOR_SOLVE(g, j); - } - } - } - } - } - - if (found == CHANGE) { - g->score += 10; /* Bump score for sucessfully invoking this rule */ - } - - return found; -} - -/**********************************************************************************/ -/* Test all regions to see if the possibilities for a number */ -/* are confined to specific rows or columns, and if so, eliminate */ -/* the occurence of candidate solutions from the remainder of the */ -/* specified row or column. */ -/* */ -/* The function has three possible return values: */ -/* NOCHANGE - Markup did not change during the last pass, */ -/* CHANGE - Markup was modified, and */ -/* STUCK - Markup results are invalid, i.e. a cell has no candidate values */ -/**********************************************************************************/ - -static int vector_elimination(grid *g) -{ - int i, j, rc; - - /* For each region... */ - for (rc = NOCHANGE, i = 0; i < PUZZLE_DIM && rc != STUCK; i++) { - - /* For each digit... */ - for (j = 0; j < PUZZLE_DIM && rc != STUCK; j++) { - - /* Eliminate candidates outside of regions when a particular */ - /* candidate value aligns itself to a row or column within */ - /* a 3x3 region. */ - rc |= region_vector_elim(g, i, j); - } - } - - return rc; -} - -/**********************************************************************************/ -/* This function implements the rule that when a subset of cells */ -/* in a row/column/region contain matching subsets of candidate */ -/* solutions, i.e. 2 matching possibilities for 2 cells, 3 */ -/* matching possibilities for 3 cells, etc., then those */ -/* candidates may be eliminated from the other cells in the */ -/* row, column, or region. */ -/* */ -/* The function has three possible return values: */ -/* NOCHANGE - Markup did not change during the last pass, */ -/* CHANGE - Markup was modified, and */ -/* STUCK - Markup results are invalid, i.e. a cell has no candidate values */ -/**********************************************************************************/ - -static int elim_matches(grid *g, int const *cell_list, char *desc, int ndx) -{ - int i, j, k, e, count, rc, flag; - short c, mask, tmp, elts[PUZZLE_DIM], eliminated[PUZZLE_DIM]; - static int counts[1<cell[k]; /* Copy original cell candidates */ - - if (bitcount(g->cell[k]) == i) { - counts[g->cell[k]] += 1; /* The bucket records the number of cells with this subset */ - } - } - - /* For each cell in the list... */ - for (e = j = 0; j < PUZZLE_DIM; j++) { - - c = g->cell[cell_list[j]]; /* Get cell's candidates */ - - /* Check to see if we've already eliminated this subset */ - for (k = 0; k < e; k++) - if (c == eliminated[k]) break; - if (e && k < e) continue; - - /* Get count from histogram bucket */ - count = (int) (counts[c]); - - /* If too few solution candidates for the number of cells, then we're stuck */ - if (count > i) { - EXPLAIN_TUPLE_IMPASSE(g, desc, ndx, c, count, i); - /* Clean up static array */ - for (k = 0; k < 9; k++) counts[elts[k]] = 0; - g->score += 10; - return STUCK; - } - - /* Do candidate and cell counts match? */ - if (count == i) { - - /* Compute mask used to eliminate candidates from other cells */ - mask = ~c; - - /* Record (for later) the values being eliminated */ - eliminated[e++] = c; - - /* Eliminate candidates from the other cells in the list */ - - /* For each cell... */ - for (k = 0; k < PUZZLE_DIM; k++) { - - /* If the cell candidates do not exactly match the current subset... */ - if (c != g->cell[cell_list[k]] && !g->cellflags[cell_list[k]]) { - - /* Get cell candidates */ - tmp = g->cell[cell_list[k]]; - - /* Eliminate candidates with our mask */ - g->cell[cell_list[k]] &= mask; - - /* Did the elimination change the candidates? */ - if (tmp != g->cell[cell_list[k]]) { - - /* Note the change and bump the score */ - flag = CHANGE; - g->score += i; - - EXPLAIN_TUPLE_ELIM(desc, ndx, c, cell_list[k]); - - /* Did we solve the cell under consideration? */ - if (bitcount(g->cell[cell_list[k]]) == 1) { - - /* Mark cell as found and bump the score */ - g->cellflags[cell_list[k]] = FOUND; - g->score += g->reward; - g->solved[g->exposed++] = cell_list[k]; - EXPLAIN_TUPLE_SOLVE(g, cell_list[k]); - } - } - } - } - } - } - - /* Cleanup the static histogram array */ - for (j = 0; j < PUZZLE_DIM; j++) counts[elts[j]] = 0; - - rc |= flag; - } - - return rc; -} - -/**********************************************************************************/ -/* Eliminate subsets from rows, columns, and regions. */ -/* */ -/* The function has three possible return values: */ -/* NOCHANGE - Markup did not change during the last pass, */ -/* CHANGE - Markup was modified, and */ -/* STUCK - Markup results are invalid, i.e. a cell has no candidate values */ -/**********************************************************************************/ - -static int mult_elimination(grid *g) -{ - int i, rc = NOCHANGE; - - /* Eliminate subsets from rows */ - for (i = 0; i < PUZZLE_DIM; i++) { - rc |= elim_matches(g, row[i], (char *)"row", i); - } - - /* Eliminate subsets from columns */ - for (i = 0; i < PUZZLE_DIM; i++) { - rc |= elim_matches(g, col[i], (char *)"column", i); - } - - /* Eliminate subsets from regions */ - for (i = 0; i < PUZZLE_DIM; i++) { - rc |= elim_matches(g, region[i], (char *)"region", i); - } - - return rc; -} - -/**************************************************/ -/* Entry point to the recursive solver algorithm. */ -/**************************************************/ -static int rsolve(grid *g, return_soln soln_callback) -{ - int i, j, min, c, weight, mask, flag = 0; - grid mygrid; - - /* Keep track of recursive depth */ - lvl += 1; - if (lvl > g->maxlvl) g->maxlvl = lvl; - - for (;;) { - - /* Attempt a simple solution */ - if (simple_solver(g) == STUCK) break; - - /* Check for solution */ - if (g->exposed >= PUZZLE_CELLS) break; - - g->reward += 2; /* Bump reward as we graduate to more "advanced" solving techniques */ - - /* Eliminate tuples */ - if ((flag = mult_elimination(g)) == CHANGE) { - EXPLAIN_CURRENT_MARKUP(g); - continue; - } - - /* Check if impasse */ - if (flag == STUCK) break; - - /* Check for solution */ - if (g->exposed >= PUZZLE_CELLS) break; - - /* Eliminate clues aligned within regions from exterior cells in rows or columns */ - if ((flag = vector_elimination(g)) == CHANGE) { - EXPLAIN_CURRENT_MARKUP(g); - continue; - } - - /* Check if impasse */ - if (flag == STUCK) break; - - /* Check for solution */ - if (g->exposed >= PUZZLE_CELLS) break; - - g->reward += 5; /* Bump reward as we are about to start trial soutions */ - - /* Attempt a trial solution */ - memcpy(&mygrid, g, sizeof(grid)); /* Make working copy of puzzle */ - - /* Find the first cell with the smallest number of alternatives */ - for (weight= 0, c = -1, min = PUZZLE_DIM, i = 0; i < PUZZLE_CELLS; i++) { - if (!mygrid.cellflags[i]) { - j = bitcount(mygrid.cell[i]); - weight += 1; - if (j < min) { - min = j; - c = i; - } - } - } - - mygrid.score += weight; /* Add penalty to score */ - - /* Cell at index 'c' will be our starting point */ - if (c >= 0) for (mask = 1, i = 0; i < PUZZLE_DIM; i++) { - - /* Is this a candidate? */ - if (mask & g->cell[c]) { - - EXPLAIN_TRIAL(c, mask); - - mygrid.score += (int)(((50.0 * lvl * weight) / (double)(PUZZLE_CELLS)) + 0.5); /* Add'l penalty */ - - /* Try one of the possible candidates for this cell */ - mygrid.cell[c] = mask; - mygrid.cellflags[c] = FOUND; - mygrid.solved[mygrid.exposed++] = c; - - EXPLAIN_CURRENT_MARKUP(&mygrid); - flag = rsolve(&mygrid, soln_callback); /* Recurse with working copy of puzzle */ - - /* Did we find a solution? */ - if (flag == FOUND && !enumerate_all) { - EXPLAIN_BACKTRACK; - lvl -= 1; - return FOUND; - } - - /* Preserve score, solution count and recursive depth as we back out of recursion */ - g->score = mygrid.score; - g->solncount = mygrid.solncount; - g->maxlvl = mygrid.maxlvl; - memcpy(&mygrid, g, sizeof(grid)); - } - mask <<= 1; /* Get next possible candidate */ - } - - break; - } - - if (g->exposed == PUZZLE_CELLS && validate(g, 0)) { - soln_callback(g); - g->solncount += 1; - EXPLAIN_SOLN_FOUND(g); - EXPLAIN_BACKTRACK; - lvl -= 1; - flag = FOUND; - } else { - EXPLAIN_BACKTRACK; - lvl -= 1; - flag = STUCK; - if (!lvl && !g->solncount) validate(g, 1); /* Print verbose diagnostic for insoluble puzzle */ - } - - return flag; -} - -/*****************************************************************/ -/* Add a puzzle solution to the singly linked list of solutions. */ -/* Crap out if no memory available. */ -/*****************************************************************/ - -static int add_soln(grid *g) -{ - grid *tmp; - - if ((tmp = (grid *)malloc(sizeof(grid))) == NULL) { - fprintf(stderr, "Out of memory.\n"); - exit(1); - } - memcpy(tmp, g, sizeof(grid)); - tmp->next = soln_list; - soln_list = tmp; - return 0; -} - -/************************************/ -/* Print hints as to command usage. */ -/************************************/ - -static void usage() -{ - fprintf(stderr, "Usage:\n\t%s {-p puzzle | -f } [-o ]\n", myname); - fprintf(stderr, "\t\t[-r ] [-1][-a][-c][-G][-g][-l][-m][-n][-s]\n"); - fprintf(stderr, "where:\n\t-1\tSearch for first solution, otherwise all solutions are returned\n" - "\t-a\tRequests that the answer (solution) be printed\n" - "\t-c\tPrint a count of solutions for each puzzle\n" - "\t-d\tPrint the recursive trial depth required to solve the puzzle\n" -#ifdef EXPLAIN - "\t-e\tPrint a step-by-step explanation of the solution(s)\n" -#endif - "\t-f\tTakes an argument which specifes an input file\n\t\tcontaining one or more unsolved puzzles (default: stdin)\n" - "\t-G\tPrint the puzzle solution(s) in a 9x9 grid format\n" - "\t-g\tPrint the number of given clues\n" - "\t-m\tPrint an octal mask for the puzzle givens\n" - "\t-n\tNumber each result\n" - "\t-o\tSpecifies an output file for the solutions (default: stdout)\n" - "\t-p\tTakes an argument giving a single inline puzzle to be solved\n" - "\t-r\tSpecifies an output file for unsolvable puzzles\n\t\t(default: stderr)\n" - "\t-s\tPrint the puzzle's score or difficulty rating\n" - "\t-?\tPrint usage information\n\n"); - fprintf(stderr, "The return code is zero if all puzzles had unique solutions,\n" - "(or have one or more solutions when -1 is specified) and non-zero\n" - "when no unique solution exists.\n"); -} - -/********************************************************/ -/* Print the puzzle as an 81 character string of digits */ -/********************************************************/ - -static char *format_answer(grid *g, char *outbuf) -{ - int i; - - for (i = 0; i < PUZZLE_CELLS; i++) - outbuf[i] = symtab[g->cell[i]]; - outbuf[i] = 0; - - return outbuf; -} - -/*******************************************/ -/* Print the puzzle as a standard 9x9 grid */ -/*******************************************/ - -static void print_grid(char *sud, FILE *h) -{ - - fprintf(h, "\n"); - EXPLAIN_INDENT(h); - fprintf(h, "+---+---+---+\n"); - - EXPLAIN_INDENT(h); - fprintf(h, "|%*.*s|%*.*s|%*.*s|\n", PUZZLE_ORDER, PUZZLE_ORDER, sud, PUZZLE_ORDER, PUZZLE_ORDER, sud+3, PUZZLE_ORDER, PUZZLE_ORDER, sud+6); - EXPLAIN_INDENT(h); - fprintf(h, "|%*.*s|%*.*s|%*.*s|\n", PUZZLE_ORDER, PUZZLE_ORDER, sud+9, PUZZLE_ORDER, PUZZLE_ORDER, sud+12, PUZZLE_ORDER, PUZZLE_ORDER, sud+15); - EXPLAIN_INDENT(h); - fprintf(h, "|%*.*s|%*.*s|%*.*s|\n", PUZZLE_ORDER, PUZZLE_ORDER, sud+18, PUZZLE_ORDER, PUZZLE_ORDER, sud+21, PUZZLE_ORDER, PUZZLE_ORDER, sud+24); - - EXPLAIN_INDENT(h); - fprintf(h, "+---+---+---+\n"); - - EXPLAIN_INDENT(h); - fprintf(h, "|%*.*s|%*.*s|%*.*s|\n", PUZZLE_ORDER, PUZZLE_ORDER, sud+27, PUZZLE_ORDER, PUZZLE_ORDER, sud+30, PUZZLE_ORDER, PUZZLE_ORDER, sud+33); - EXPLAIN_INDENT(h); - fprintf(h, "|%*.*s|%*.*s|%*.*s|\n", PUZZLE_ORDER, PUZZLE_ORDER, sud+36, PUZZLE_ORDER, PUZZLE_ORDER, sud+39, PUZZLE_ORDER, PUZZLE_ORDER, sud+42); - EXPLAIN_INDENT(h); - fprintf(h, "|%*.*s|%*.*s|%*.*s|\n", PUZZLE_ORDER, PUZZLE_ORDER, sud+45, PUZZLE_ORDER, PUZZLE_ORDER, sud+48, PUZZLE_ORDER, PUZZLE_ORDER, sud+51); - - EXPLAIN_INDENT(h); - fprintf(h, "+---+---+---+\n"); - - EXPLAIN_INDENT(h); - fprintf(h, "|%*.*s|%*.*s|%*.*s|\n", PUZZLE_ORDER, PUZZLE_ORDER, sud+54, PUZZLE_ORDER, PUZZLE_ORDER, sud+57, PUZZLE_ORDER, PUZZLE_ORDER, sud+60); - EXPLAIN_INDENT(h); - fprintf(h, "|%*.*s|%*.*s|%*.*s|\n", PUZZLE_ORDER, PUZZLE_ORDER, sud+63, PUZZLE_ORDER, PUZZLE_ORDER, sud+66, PUZZLE_ORDER, PUZZLE_ORDER, sud+69); - EXPLAIN_INDENT(h); - fprintf(h, "|%*.*s|%*.*s|%*.*s|\n", PUZZLE_ORDER, PUZZLE_ORDER, sud+72, PUZZLE_ORDER, PUZZLE_ORDER, sud+75, PUZZLE_ORDER, PUZZLE_ORDER, sud+78); - - EXPLAIN_INDENT(h); - fprintf(h, "+---+---+---+\n"); -} - -/*****************************************************/ -/* Based upon the Left-to-Right-Top-to-Bottom puzzle */ -/* presented in "sbuf", create a 27 octal digit */ -/* mask of the givens in the 28 character buffer */ -/* pointed to by "mbuf." Return a pointer to mbuf. */ -/*****************************************************/ - -static char *cvt_to_mask(char *mbuf, char *sbuf) -{ - char *mask_buf = mbuf; - static const char *maskchar = "01234567"; - int i, m; - - mask_buf[PUZZLE_DIM*3] = 0; - for (i = 0; i < PUZZLE_CELLS; i += 3) { - m = 0; - if (is_given(sbuf[i])) { - m |= 4; - } - else { - sbuf[i] = '0'; - } - if (is_given(sbuf[i+1])) { - m |= 2; - } - else { - sbuf[i+1] = '0'; - } - if (is_given(sbuf[i+2])) { - m |= 1; - } - else { - sbuf[i+2] = '0'; - } - *mask_buf++ = maskchar[m]; - } - return mbuf; -} - -/*******************/ -/* Mainline logic. */ -/*******************/ - -int dupree_solver(int32_t dispflag,int32_t *scorep,char *puzzle) -{ - int argc; char *argv[4]; - int i, rc, bog, count, solved, unsolved, solncount=0, flag, prt_count, prt_num, prt_score, prt_answer, prt_depth, prt_grid, prt_mask, prt_givens, prt, len; - char *infile=0, *outfile=0, *rejectfile=0, inbuf[128], outbuf[128], mbuf[28]; - grid g, *s=0; - FILE *h=0; - soln_list = NULL; - myname = (char *)"internal"; - /* Get our command name from invoking command line - if ((myname = strrchr(argv[0], '/')) == NULL) - myname = argv[0]; - else - myname++; - argc = 3; - argv[1] = "-p"; - argv[2] = puzzle; - argv[3] = 0;*/ - /* Print sign-on message to console */ - //fprintf(stderr, "%s version %s\n", myname, VERSION); fflush(stderr); - argc = 1; - /* Init */ - h = 0;//stdin; - solnfile = stdout; - rejects = stderr; - rejectfile = infile = outfile = NULL; - rc = bog = prt_mask = prt_grid = prt_score = prt_depth = prt_answer = prt_count = prt_num = prt_givens = 0; - *inbuf = 0; -#ifdef skip - /* Parse command line options */ - while ((opt = getopt(argc, argv, OPTIONS)) != -1) { - switch (opt) { - case '1': - enumerate_all = 0; /* only find first soln */ - break; - case 'a': - prt_answer = 1; /* print solution */ - break; - case 'c': - prt_count = 1; /* number solutions */ - break; - case 'd': - prt_depth = 1; - break; -#ifdef EXPLAIN - case 'e': - explain = 1; - break; -#endif - case 'f': - if (*inbuf) { // -p and -f options are mutually exclusive - fprintf(stderr, "The -p and -f options are mutually exclusive\n"); - usage(); - exit(1); - } - infile = optarg; // get name of input file - break; - case 'G': - prt_grid = 1; - break; - case 'g': - prt_givens = 1; - break; - case 'm': - prt_mask = 1; - break; - case 'n': - prt_num = 1; - break; - case 'o': - outfile = optarg; - break; - case 'p': - if (infile) { - fprintf(stderr, "The -p and -f options are mutually exclusive\n"); - usage(); - exit(1); - } - if (strlen(optarg) == PUZZLE_CELLS) { - strcpy(inbuf, optarg); - } - else { - fprintf(stderr, "Invalid puzzle specified: %s\n", optarg); - usage(); - exit(1); - } - h = NULL; - break; - case 'r': - rejectfile = optarg; - break; - case 's': - prt_score = 1; - break; - default: - case '?': - usage(); - exit(1); - } - } - /* Anthing else on the command line is bogus */ - if (argc > optind) { - fprintf(stderr, "Extraneous args: "); - for (i = optind; i < argc; i++) { - fprintf(stderr, "%s ", argv[i]); - } - fprintf(stderr, "\n\n"); - usage(); - exit(1); - } - - if (!enumerate_all && prt_score) { - fprintf(stderr, "Scoring is meaningless when multi-solution mode is disabled.\n"); - } - - if (rejectfile && !(rejects = fopen(rejectfile, "w"))) { - fprintf(stderr, "Failed to open reject output file: %s\n", rejectfile); - exit(1); - } - - if (outfile && !(solnfile = fopen(outfile, "w"))) { - fprintf(stderr, "Failed to open solution output file: %s\n", outfile); - exit(1); - } - - /*if (infile && strcmp(infile, "-") && !(h = fopen(infile, "r"))) { - fprintf(stderr, "Failed to open input game file: %s\n", infile); - exit(1); - } - if (h) fgets(inbuf, 128, h);*/ -#endif - prt_answer = dispflag; /* print solution */ - //prt_count = dispflag; /* number solutions */ - prt_score = dispflag; - prt_givens = dispflag; - prt_num = dispflag; - /* Set prt flag if we're printing anything at all */ - prt = prt_mask | prt_grid | prt_score | prt_depth | prt_answer | prt_num | prt_givens; - - strcpy(inbuf,puzzle); - count = solved = unsolved = 0; - //printf("inbuf.(%s)\n",inbuf); - while (*inbuf) { - - if ((len = (int32_t)strlen(inbuf)) && inbuf[len-1] == '\n') { - len -= 1; - inbuf[len] = 0; - } - - count += 1; - if (len != PUZZLE_CELLS) { - fprintf(rejects, "%d: %s bogus puzzle format\n", count, inbuf); fflush(rejects); - *inbuf = 0; - bog += 1; - //if (h) fgets(inbuf, 128, h); - continue; - } - - cvt_to_grid(&g, inbuf); - if (g.givens < 17) { - fprintf(rejects, "%d: %*.*s bogus puzzle has less than 17 givens\n", count, PUZZLE_CELLS, PUZZLE_CELLS, inbuf); fflush(rejects); - *inbuf = 0; - bog += 1; - //if (h) fgets(inbuf, 128, h); - continue; - } - - for (s = soln_list; s;) { - s = soln_list->next; - free(soln_list); - soln_list = s; - } - - flag = rsolve(&g, add_soln); - if (soln_list) { - solved++; - for (solncount = 0, s = soln_list; s; s = s->next) { - solncount += 1; - if (prt_num) { - char nbuf[32]; - if (!enumerate_all) - sprintf(nbuf, "%d: ", count); - else - sprintf(nbuf, "%d:%d ", count, solncount); - fprintf(solnfile, "%-s", nbuf); - } - if (solncount > 1 || !enumerate_all) g.score = 0; - if (prt_score) fprintf(solnfile, "score: %-7d ", g.score); - if (prt_depth) fprintf(solnfile, "depth: %-3d ", g.maxlvl); - if (prt_answer || prt_grid) format_answer(s, outbuf); - if (prt_answer) fprintf(solnfile, "%s", outbuf); - if (prt_mask) fprintf(solnfile, " %s", cvt_to_mask(mbuf, inbuf)); - if (prt_givens) fprintf(solnfile, " %d", g.givens); - if (prt_grid) print_grid(outbuf, solnfile); - if (prt) fprintf(solnfile, "\n"); - if (s->next == NULL && prt_count) fprintf(solnfile, "count: %d\n", solncount); - } - if (solncount > 1 && enumerate_all) { - rc |= 1; - } - for (s = soln_list; s;) { - s = soln_list->next; - free(soln_list); - soln_list = s; - } - } - else { - unsolved++; - rc |= 1; - fprintf(rejects, "%d: %*.*s unsolved\n", count, PUZZLE_CELLS, PUZZLE_CELLS, inbuf); fflush(rejects); - diagnostic_grid(&g, rejects); -#if defined(DEBUG) - mypause(); -#endif - } - - *inbuf = 0; - //if (h) fgets(inbuf, 128, h); - } - - //if (prt) fprintf(solnfile, "\nPuzzles: %d, Solved: %d, Unsolved: %d, Bogus: %d\n", count, solved, unsolved, bog); - *scorep = g.score; - return solncount; -} -// end https://github.com/attractivechaos/plb/blob/master/sudoku/incoming/sudoku_solver.c - -// start https://github.com/mentalmove/SudokuGenerator -// -// main.c -// SudokuGenerator -// -// Malte Pagel -// - -#include -#include -#include -#include -#include - - -#define SMALL_LINE 3 -#define LINE 9 -#define TOTAL 81 - -#define LIMIT 16777216 - -#define SHOW_SOLVED 1 - - -struct dimensions_collection { - int row; - int column; - int small_square; -}; - - -static int indices[TOTAL]; -static int riddle[TOTAL]; -static int solved[TOTAL]; -static int unsolved[TOTAL]; -static int tries_to_set = 0; -static int taking_back; -static int global_unset_count = 0; - - -struct dimensions_collection get_collection(int); -int contains_element(int*, int, int); -void get_horizontal(int, int*); -void get_vertical(int, int*); -void get_square(int, int*); -int set_values(int, int); -void take_back(int); - -int show_solution(int*); - - -int show_solution (int* solution) { - - int i; - int counter = 0; - - printf( " -----------------------------------\n" ); - - for ( i = 0; i < TOTAL; i++ ) { - if ( i % LINE == 0 ) - printf( "|" ); - - if ( solution[i] ) { - printf( " %d ", solution[i]); - counter++; - } - else - printf( " "); - - if ( i % LINE == (LINE - 1) ) { - printf( "|\n" ); - if ( i != (TOTAL - 1) ) { - if ( i % (SMALL_LINE * LINE) == (SMALL_LINE * LINE - 1) ) - printf( "|-----------+-----------+-----------|\n" ); - else - printf( "|- - - - - -|- - - - - -|- - - - - -|\n" ); - } - } - else { - if ( i % SMALL_LINE == (SMALL_LINE - 1) ) - printf( "|"); - else - printf( ":" ); - } - } - - printf( " -----------------------------------" ); - - return counter; -} - - -/** - * Takes a position inside the large square and returns - * - the row number - * - the column number - * - the small square number - * where this position is situated in - */ -struct dimensions_collection get_collection (int index) { - struct dimensions_collection ret; - - ret.row = (int) (index / LINE); - ret.column = index % LINE; - ret.small_square = SMALL_LINE * (int) (ret.row / SMALL_LINE) + (int) (ret.column / SMALL_LINE); - - return ret; -} - -/** - * Is 'the_element' in 'the_array'? - */ -int contains_element (int* the_array, int the_element, int length) { - for ( int i = 0; i < length; i++ ) - if ( the_array[i] == the_element ) - return 1; - return 0; -} - -/** - * Sets all members of row 'row' - */ -void get_horizontal (int row, int* ret) { - int j = 0; - for ( int i = (row * LINE); i < (row * LINE) + LINE; i++ ) - ret[j++] = riddle[i]; -} -/** - * Sets all members of column 'col' - */ -void get_vertical (int col, int* ret) { - int j = 0; - for ( int i = col; i < TOTAL; i += LINE ) - ret[j++] = riddle[i]; -} -/** - * Sets all members of small square 'which' - */ -void get_square (int which, int* ret) { - for ( int i = 0; i < SMALL_LINE; i++ ) - for ( int j = 0; j < SMALL_LINE; j++ ) - ret[SMALL_LINE * i + j] = riddle[LINE * i + which * SMALL_LINE + j + ((int) (which / SMALL_LINE) * (SMALL_LINE - 1) * LINE)]; -} - -/** - * Recursive function: - * Try for each position the numbers from 1 to LINE - * (except 'forbidden_number' if given). - * If all numbers collide with already set numbers, move is bad. - * If a number doesn't collide with already set numbers, - * - move is bad if next move collides with the already set numbers - * (including actual one) - * - move is good if it's the last one - */ -int set_values (int index, int forbidden_number) { - - if ( taking_back && tries_to_set > (2 * LIMIT) ) - return 1; - - int real_index = indices[index]; - struct dimensions_collection blocks = get_collection(real_index); - int elements[LINE]; - - for ( int i = 1; i <= LINE; i++ ) { - if ( forbidden_number && i == forbidden_number ) - continue; - - tries_to_set++; - - get_horizontal(blocks.row, elements); - if ( contains_element(elements, i, LINE) ) - continue; - - get_vertical(blocks.column, elements); - if ( contains_element(elements, i, LINE) ) - continue; - - get_square(blocks.small_square, elements); - if ( contains_element(elements, i, LINE) ) - continue; - - riddle[real_index] = i; - - if ( index == (TOTAL - 1) || set_values((index + 1), 0) ) - return 1; - } - - riddle[real_index] = 0; - - return 0; -} - -/** - * Some steps to hide unnecessary numbers: - * a) Define last piece as 'special piece' - * b) Remember this piece's value - * c) Try to create riddle from this position on, - * but forbid the value of the special piece - * d) I) If operation fails, define the piece before the special piece - * as 'special piece' and continue with b) - * II) If operation is possible, reset 'special piece' - * and put it to start of list - * e) Stop if all pieces are tried or calculation limit is reached - */ -void take_back (int unset_count) { - - global_unset_count++; - - int i; - - int tmp = riddle[indices[TOTAL - unset_count]]; - int redundant = set_values((TOTAL - unset_count), tmp); - - if ( !redundant ) { - unsolved[indices[TOTAL - unset_count]] = 0; - take_back(++unset_count); - } - else { - riddle[indices[TOTAL - unset_count]] = tmp; - for ( i = 1; i < unset_count; i++ ) - riddle[indices[TOTAL - unset_count + i]] = 0; - - for ( i = (TOTAL - unset_count); i > 0; i-- ) - indices[i] = indices[i - 1]; - indices[0] = tmp; - - if ( global_unset_count < TOTAL && tries_to_set < LIMIT ) - take_back(unset_count); - } -} - - -int sudoku(uint8_t solved9[LINE][LINE],uint8_t unsolved9[LINE][LINE],uint32_t srandi) -{ - int i, j, random, small_rows, small_cols, tmp, redundant,ind; - int multi_raw[LINE][LINE]; - - memset(indices,0,sizeof(indices)); - memset(solved,0,sizeof(solved)); - memset(unsolved,0,sizeof(unsolved)); - tries_to_set = 0; - taking_back = 0; - global_unset_count = 0; - - //time_t t; - //time(&t); - srand(srandi); - - /** - * Initialization: - * Fields are set to 0 ( i.e. we dont' know the number yet) - */ - for ( i = 0; i < TOTAL; i++ ) - riddle[i] = 0; - - /** - * Second initialization: - * LINE times numbers from 0 to (LINE - 1), - * i.e. every square - */ - int big_rows_array[] = {0, 1, 2}; - int big_cols_array[] = {0, 1, 2}; - random = rand() % 4; - switch (random) { - case 1: - big_rows_array[0] = 2; - big_rows_array[1] = 1; - big_rows_array[2] = 0; - break; - case 2: - big_cols_array[0] = 2; - big_cols_array[1] = 1; - big_cols_array[2] = 0; - break; - case 3: - big_rows_array[0] = 2; - big_rows_array[1] = 1; - big_rows_array[2] = 0; - big_cols_array[0] = 2; - big_cols_array[1] = 1; - big_cols_array[2] = 0; - } - int big_rows, big_cols, big_rows_index, big_cols_index, start_value; - i = 0; - j = 0; - for ( big_rows_index = 0; big_rows_index < SMALL_LINE; big_rows_index++ ) { - big_rows = big_rows_array[big_rows_index]; - for ( big_cols_index = 0; big_cols_index < SMALL_LINE; big_cols_index++ ) { - big_cols = big_cols_array[big_cols_index]; - start_value = big_rows * LINE * SMALL_LINE + (big_cols * SMALL_LINE); - for ( small_rows = 0; small_rows < SMALL_LINE; small_rows++ ) - for ( small_cols = 0; small_cols < SMALL_LINE; small_cols++ ) - multi_raw[i][j++] = small_rows * LINE + small_cols + start_value; - i++; - j = 0; - } - } - - - /** - * Randomization for every element of multi_raw. - * Suffle only inside squares - */ - for ( i = 0; i < LINE; i++ ) { - for ( j = 0; j < LINE; j++ ) { - random = rand() % LINE; - if ( j == random ) - continue; - tmp = multi_raw[i][j]; - multi_raw[i][j] = multi_raw[i][random]; - multi_raw[i][random] = tmp; - } - } - - /** - * Linearization - */ - for ( i = 0; i < LINE; i++ ) - for ( j = 0; j < LINE; j++ ) - indices[i * LINE + j] = multi_raw[i][j]; - - - /** - * Setting numbers, start with the first one. - * Variable 'redundant' is needed only for formal reasons - */ - taking_back = 0; - redundant = set_values(0, 0); - - - memcpy(solved, riddle, (TOTAL * sizeof(int))); - memcpy(unsolved, riddle, (TOTAL * sizeof(int))); - - - /** - * Exchanging some (few) indices for more randomized game - */ - int random2; - for ( i = (LINE - 1); i > 0; i-- ) { - for ( j = 0; j < (int) (sqrt(i)); j++ ) { - - if ( !(rand() % ((int) (i * sqrt(i)))) || !(LINE - j) ) - continue; - - random = i * LINE + (int) (rand() % (LINE - j)); - random2 = rand() % TOTAL; - - if ( random == random2 ) - continue; - - tmp = indices[random]; - indices[random] = indices[random2]; - indices[random2] = tmp; - } - } - - - tries_to_set = 0; - taking_back = 1; - take_back(1); - - - if ( SHOW_SOLVED ) { - printf( "\n\n" ); - redundant = show_solution(solved); - } - - int counter = show_solution(unsolved); - printf( "\t *** %d numbers left *** \n", counter ); - ind = 0; - for (i=0; i=0; j--) - { - x *= 9; - x += vals9[i][j]-1; - } - if ( i < 8 ) - keyvals[i] = x; - else - { - for (j=0; j<8; j++) - keyvals[j] += SUDOKU_NINETH * (vals9[i][j]-1); - } - } - for (i=ind=0; i<8; i++) - { - privkey[ind++] = ((keyvals[i] >> 24) & 0xff); - privkey[ind++] = ((keyvals[i] >> 16) & 0xff); - privkey[ind++] = ((keyvals[i] >> 8) & 0xff); - privkey[ind++] = (keyvals[i] & 0xff); - } -} - -void sudoku_gen(uint8_t key32[32],uint8_t unsolved[9][9],uint32_t srandi) -{ - uint8_t vals9[9][9],uniq9[9][9]; int32_t i,j; - sudoku(vals9,unsolved,srandi); - sudoku_privkey(key32,vals9); - sudoku_privkeydisp(key32); -} - -//////////////////////// start of CClib interface -// ./hushd -ac_name=SUDOKU -ac_supply=1000000 -pubkey= -addnode=5.9.102.210 -gen -genproclimit=1 -ac_cclib=sudoku -ac_perc=10000000 -ac_reward=100000000 -ac_cc=60000 -ac_script=2ea22c80203d1579313abe7d8ea85f48c65ea66fc512c878c0d0e6f6d54036669de940febf8103120c008203000401cc & -/* cclib "gen" 17 \"10\" - 5d13c1ad80daf37215c74809a36720c2ada90bacadb2e10bf0866092ce558432 -*/ - -/* cclib "txidinfo" 17 \"5d13c1ad80daf37215c74809a36720c2ada90bacadb2e10bf0866092ce558432\" -{ - "result": "success", - "txid": "5d13c1ad80daf37215c74809a36720c2ada90bacadb2e10bf0866092ce558432", - "result": "success", - "amount": 1.00000000, - "unsolved": "46-8---15-75-61-3----4----8-1--75-----3--24----2-----6-4----------73----------36-", - "name": "sudoku", - "method": "txidinfo" -}*/ - -/* cclib "pending" 17 -{ - "result": "success", - "name": "sudoku", - "method": "pending", - "pending": [ - "5d13c1ad80daf37215c74809a36720c2ada90bacadb2e10bf0866092ce558432" - ] -}*/ - -/* - cclib "solution" 17 \"[%22fdc9409741f2ede29307da1a06438da0ea6f8d885d2d5c3199c4ef541ec1b5fd%22,%22469823715875961234231457698914675823653182479782394156346219587528736941197548362%22,1548777525,1548777526,...]\" - { - "name": "sudoku", - "method": "solution", - "sudokuaddr": "RSeoPJvMUSLfUHM1BomB97geW9zPznwHXk", - "amount": 1.00000000, - "result": "success", - "hex": "0400008085202f8901328455ce926086f00be1b2adac0ba9adc22067a30948c71572f3da80adc1135d010000007b4c79a276a072a26ba067a565802102c57d40c1ddc92a5246a937bd7338823f1e8c916b137f2092d38cf250d74cb5ab8140f92d54f611aa3cb3d187eaadd56b06f3a8c0f5fba23956b26fdefc6038d9b6282de38525f72ebd8945a7994cef63ebca711ecf8fe6baeefcc218cf58efb59dc2a100af03800111a10001ffffffff02f0b9f505000000002321039433dc3749aece1bd568f374a45da3b0bc6856990d7da3cd175399577940a775ac0000000000000000fd9f016a4d9b01115351343639383233373135383735393631323334323331343537363938393134363735383233363533313832343739373832333934313536333436323139353837353238373336393431313937353438333632fd4401000000005c5078355c50783600000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000" - } - - cclib solution 17 \"[%224d50336780d5a300a1f01b12fe36f46a82f3b9935bb115e01e0113dc4f337aae%22,%22234791685716258943589643712865934127341827596927516438492375861178462359653189274%22,0,0,1548859143,1548859146,0,1548859146,0,1548859148,1548859149,0,1548859151,1548859152,0,1548859154,1548859155,1548859158,1548859159,0,0,0,1548859161,1548859163,0,1548859164,1548859168,0,1548859168,1548859170,1548859172,1548859172,1548859175,0,0,1548859176,0,0,1548859178,1548859178,0,0,1548859180,1548859181,1548859183,1548859184,1548859185,1548859186,1548859188,1548859190,1548859191,1548859192,1548859192,0,0,1548859195,1548859196,1548859197,1548859198,0,0,1548859199,1548859202,1548859202,0,1548859204,1548859205,1548859206,1548859209,1548859210,1548859211,1548859212,0,1548859214,1548859216,0,1548859217,1548859218,1548859219,1548859220,0,1548859222,1548859222]\" - */ - -int32_t sudoku_captcha(int32_t dispflag,uint32_t timestamps[81],int32_t height) -{ - int32_t i,solvetime,diff,avetime,n = 0,retval = 0; uint64_t variance = 0; std::vector list; - for (i=0; i<81; i++) - { - if ( timestamps[i] != 0 ) - { - list.push_back(timestamps[i]); - n++; - } - } - if ( n > 81/2 ) - { - std::sort(list.begin(),list.end()); - solvetime = (list[n-1] - list[0]); - if ( list[0] >= list[n-1] ) - { - printf("list[0] %u vs list[%d-1] %u\n",list[0],n,list[n-1]); - retval = -1; - } - else if ( list[n-1] > chainActive.LastTip()->nTime+200 ) - retval = -2; - else if ( solvetime >= 777 ) - retval = 0; - else - { - avetime = (solvetime / (n-1)); - if ( avetime == 0 ) - retval = -3; - for (i=0; i>>>>>>>>>>>>>> ht.%d retval.%d\n",height,retval); - if ( height <= 2036 ) - return(0); - else return(retval); -} - -CScript sudoku_genopret(uint8_t unsolved[9][9]) -{ - CScript opret; uint8_t evalcode = EVAL_SUDOKU; std::vector data; int32_t i,j; - for (i=0; i<9; i++) - for (j=0; j<9; j++) - data.push_back(unsolved[i][j]); - opret << OP_RETURN << E_MARSHAL(ss << evalcode << 'G' << data); - return(opret); -} - -CScript sudoku_solutionopret(char *solution,uint32_t timestamps[81]) -{ - CScript opret; uint8_t evalcode = EVAL_SUDOKU; std::string str(solution); std::vector data; int32_t i; - for (i=0; i<81; i++) - { - data.push_back((timestamps[i] >> 24) & 0xff); - data.push_back((timestamps[i] >> 16) & 0xff); - data.push_back((timestamps[i] >> 8) & 0xff); - data.push_back(timestamps[i] & 0xff); - } - opret << OP_RETURN << E_MARSHAL(ss << evalcode << 'S' << str << data); - return(opret); -} - -uint8_t sudoku_solutionopreturndecode(char solution[82],uint32_t timestamps[81],CScript scriptPubKey) -{ - std::vector vopret; uint8_t *script,e,f; std::string str; std::vector data; int32_t i,ind; uint32_t x; - GetOpReturnData(scriptPubKey,vopret); - script = (uint8_t *)vopret.data(); - if ( vopret.size() > 2 && E_UNMARSHAL(vopret,ss >> e; ss >> f; ss >> str; ss >> data) != 0 && e == EVAL_SUDOKU && f == 'S' ) - { - if ( data.size() == 81*sizeof(uint32_t) && str.size() == 81 ) - { - strcpy(solution,str.c_str()); - for (i=ind=0; i<81; i++) - { - if ( solution[i] < '1' || solution[i] > '9' ) - break; - x = data[ind++]; - x <<= 8, x |= (data[ind++] & 0xff); - x <<= 8, x |= (data[ind++] & 0xff); - x <<= 8, x |= (data[ind++] & 0xff); - timestamps[i] = x; - } - if ( i == 81 ) - return(f); - } else fprintf(stderr,"datasize %d sol[%d]\n",(int32_t)data.size(),(int32_t)str.size()); - } - return(0); -} - -uint8_t sudoku_genopreturndecode(char *unsolved,CScript scriptPubKey) -{ - std::vector vopret; uint8_t *script,e,f; std::vector data; int32_t i; - GetOpReturnData(scriptPubKey,vopret); - script = (uint8_t *)vopret.data(); - if ( vopret.size() > 2 && E_UNMARSHAL(vopret,ss >> e; ss >> f; ss >> data) != 0 && e == EVAL_SUDOKU && f == 'G' ) - { - if ( data.size() == 81 ) - { - for (i=0; i<81; i++) - unsolved[i] = data[i] == 0 ? '-' : '0' + data[i]; - unsolved[i] = 0; - return(f); - } - } - return(0); -} - -UniValue sudoku_generate(uint64_t txfee,struct CCcontract_info *cp,cJSON *params) -{ - CMutableTransaction mtx = CreateNewContextualCMutableTransaction(Params().GetConsensus(), hush_nextheight()); - UniValue result(UniValue::VOBJ); CPubKey sudokupk,pk; uint8_t privkey[32],unsolved[9][9],pub33[33]; uint32_t srandi; int32_t i,score; uint256 hash; char coinaddr[64],str[82],*jsonstr; uint64_t inputsum,amount,change=0; std::string rawtx; - amount = COIN; - /*if ( params != 0 ) - { - if ( (jsonstr= jprint(params,0)) != 0 ) - { - if ( jsonstr[0] == '"' && jsonstr[strlen(jsonstr)-1] == '"' ) - { - jsonstr[strlen(jsonstr)-1] = 0; - jsonstr++; - } - amount = atof(jsonstr) * COIN + 0.0000000049; - } - }*/ - result.push_back(Pair("result","success")); - result.push_back(Pair("name","sudoku")); - result.push_back(Pair("method","gen")); - hash = chainActive.LastTip()->GetBlockHash(); - memcpy(&srandi,&hash,sizeof(srandi)); - srandi ^= (uint32_t)time(NULL); - while ( 1 ) - { - sudoku_gen(privkey,unsolved,srandi); - for (i=0; iunspendableCCaddr,1)) >= amount+2*txfee ) - { - //printf("inputsum %.8f\n",(double)inputsum/COIN); - mtx.vout.push_back(MakeCC1vout(cp->evalcode,txfee,sudokupk)); - mtx.vout.push_back(MakeCC1vout(cp->evalcode,amount,pk)); - if ( inputsum > amount + 2*txfee ) - change = (inputsum - amount - 2*txfee); - if ( change > txfee ) - { - if ( change > 10000*COIN ) - { - mtx.vout.push_back(MakeCC1vout(cp->evalcode,change/2,sudokupk)); - mtx.vout.push_back(MakeCC1vout(cp->evalcode,change/2,sudokupk)); - } else mtx.vout.push_back(MakeCC1vout(cp->evalcode,change,sudokupk)); - } - rawtx = FinalizeCCTx(0,cp,mtx,pubkey2pk(Mypubkey()),txfee,sudoku_genopret(unsolved)); - if ( rawtx.size() > 0 ) - { - CTransaction tx; - result.push_back(Pair("hex",rawtx)); - if ( DecodeHexTx(tx,rawtx) != 0 ) - { - LOCK(cs_main); - if ( myAddtomempool(tx) != 0 ) - { - RelayTransaction(tx); - result.push_back(Pair("txid",tx.GetHash().ToString())); - } - } - } else result.push_back(Pair("error","couldnt finalize CCtx")); - } else result.push_back(Pair("error","not enough SUDOKU funds")); - return(result); -} - -UniValue sudoku_txidinfo(uint64_t txfee,struct CCcontract_info *cp,cJSON *params) -{ - UniValue result(UniValue::VOBJ); int32_t numvouts; char CCaddr[64],str[65],*txidstr; uint256 txid,hashBlock; CTransaction tx; char unsolved[82]; CBlockIndex *pindex; - if ( params != 0 ) - { - result.push_back(Pair("result","success")); - if ( (txidstr= jprint(params,0)) != 0 ) - { - if ( txidstr[0] == '"' && txidstr[strlen(txidstr)-1] == '"' ) - { - txidstr[strlen(txidstr)-1] = 0; - txidstr++; - } - //printf("params -> (%s)\n",txidstr); - decode_hex((uint8_t *)&txid,32,txidstr); - txid = revuint256(txid); - result.push_back(Pair("txid",txid.GetHex())); - if ( myGetTransaction(txid,tx,hashBlock) != 0 && (numvouts= tx.vout.size()) > 1 ) - { - if ( sudoku_genopreturndecode(unsolved,tx.vout[numvouts-1].scriptPubKey) == 'G' ) - { - result.push_back(Pair("result","success")); - if ( (pindex= hush_blockindex(hashBlock)) != 0 ) - result.push_back(Pair("height",pindex->GetHeight())); - Getscriptaddress(CCaddr,tx.vout[1].scriptPubKey); - result.push_back(Pair("sudokuaddr",CCaddr)); - result.push_back(Pair("amount",ValueFromAmount(tx.vout[1].nValue))); - result.push_back(Pair("unsolved",unsolved)); - } - else - { - result.push_back(Pair("result","error")); - result.push_back(Pair("error","couldnt extract sudoku_generate opreturn")); - } - } - else - { - result.push_back(Pair("result","error")); - result.push_back(Pair("error","couldnt find txid")); - } - } - } - else - { - result.push_back(Pair("result","error")); - result.push_back(Pair("error","missing txid in params")); - } - result.push_back(Pair("name","sudoku")); - result.push_back(Pair("method","txidinfo")); - return(result); -} - -UniValue sudoku_pending(uint64_t txfee,struct CCcontract_info *cp,cJSON *params) -{ - UniValue result(UniValue::VOBJ),a(UniValue::VARR); - char coinaddr[64],unsolved[82]; int64_t nValue,total=0; uint256 txid,hashBlock; CTransaction tx; int32_t vout,numvouts; CPubKey sudokupk; CBlockIndex *pindex; - std::vector > unspentOutputs; - sudokupk = GetUnspendable(cp,0); - GetCCaddress(cp,coinaddr,sudokupk); - SetCCunspents(unspentOutputs,coinaddr,true); - for (std::vector >::const_iterator it=unspentOutputs.begin(); it!=unspentOutputs.end(); it++) - { - txid = it->first.txhash; - vout = (int32_t)it->first.index; - //char str[65]; fprintf(stderr,"%s check %s/v%d %.8f\n",coinaddr,uint256_str(str,txid),vout,(double)it->second.satoshis/COIN); - if ( it->second.satoshis != txfee || vout != 0 ) - continue; - if ( myGetTransaction(txid,tx,hashBlock) != 0 && (numvouts= tx.vout.size()) > 1 ) - { - if ( (nValue= IsCClibvout(cp,tx,vout,coinaddr)) == txfee && myIsutxo_spentinmempool(ignoretxid,ignorevin,txid,vout) == 0 ) - { - if ( sudoku_genopreturndecode(unsolved,tx.vout[numvouts-1].scriptPubKey) == 'G' ) - { - UniValue obj(UniValue::VOBJ); - if ( (pindex= hush_blockindex(hashBlock)) != 0 ) - obj.push_back(Pair("height",pindex->GetHeight())); - obj.push_back(Pair("amount",ValueFromAmount(tx.vout[1].nValue))); - obj.push_back(Pair("txid",txid.GetHex())); - a.push_back(obj); - total += tx.vout[1].nValue; - } - } - } - } - result.push_back(Pair("result","success")); - result.push_back(Pair("name","sudoku")); - result.push_back(Pair("method","pending")); - result.push_back(Pair("pending",a)); - result.push_back(Pair("numpending",(int64_t)a.size())); - result.push_back(Pair("total",ValueFromAmount(total))); - return(result); -} - -UniValue sudoku_solution(uint64_t txfee,struct CCcontract_info *cp,cJSON *params) -{ - CMutableTransaction mtx = CreateNewContextualCMutableTransaction(Params().GetConsensus(), hush_nextheight()); - UniValue result(UniValue::VOBJ); int32_t i,j,good,ind,n,numvouts; uint256 txid; char *jsonstr,*newstr,*txidstr,coinaddr[64],checkaddr[64],CCaddr[64],*solution=0,unsolved[82]; CPubKey pk,mypk; uint8_t vals9[9][9],priv32[32],pub33[33]; uint32_t timestamps[81]; uint64_t balance,inputsum; std::string rawtx; CTransaction tx; uint256 hashBlock; - mypk = pubkey2pk(Mypubkey()); - memset(timestamps,0,sizeof(timestamps)); - result.push_back(Pair("name","sudoku")); - result.push_back(Pair("method","solution")); - good = 0; - if ( params != 0 ) - { - if ( params != 0 && (n= cJSON_GetArraySize(params)) > 0 ) - { - if ( n > 2 && n <= (sizeof(timestamps)/sizeof(*timestamps))+2 ) - { - for (i=2; i '9' ) - { - result.push_back(Pair("result","error")); - result.push_back(Pair("error","illegal solution")); - return(result); - } - vals9[i][j] = solution[ind++] - '0'; - } - sudoku_privkey(priv32,vals9); - priv2addr(coinaddr,pub33,priv32); - pk = buf2pk(pub33); - GetCCaddress(cp,CCaddr,pk); - result.push_back(Pair("sudokuaddr",CCaddr)); - balance = CCaddress_balance(CCaddr,1); - result.push_back(Pair("amount",ValueFromAmount(balance))); - if ( sudoku_captcha(1,timestamps,hush_nextheight()) < 0 ) - { - result.push_back(Pair("result","error")); - result.push_back(Pair("error","captcha failure")); - return(result); - } - else - { - if ( (txidstr= jstri(params,0)) != 0 ) - { - decode_hex((uint8_t *)&txid,32,txidstr); - txid = revuint256(txid); - result.push_back(Pair("txid",txid.GetHex())); - if ( CCgettxout(txid,0,1,0) < 0 ) - result.push_back(Pair("error","already solved")); - else if ( myGetTransaction(txid,tx,hashBlock) != 0 && (numvouts= tx.vout.size()) > 1 ) - { - Getscriptaddress(checkaddr,tx.vout[1].scriptPubKey); - if ( strcmp(checkaddr,CCaddr) != 0 ) - { - result.push_back(Pair("result","error")); - result.push_back(Pair("error","wrong solution")); - result.push_back(Pair("yours",CCaddr)); - return(result); - } - if ( sudoku_genopreturndecode(unsolved,tx.vout[numvouts-1].scriptPubKey) == 'G' ) - { - for (i=0; i<81; i++) - { - if ( unsolved[i] < '1' || unsolved[i] > '9') - continue; - else if ( unsolved[i] != solution[i] ) - { - printf("i.%d [%c] != [%c]\n",i,unsolved[i],solution[i]); - result.push_back(Pair("error","wrong sudoku solved")); - break; - } - } - if ( i == 81 ) - good = 1; - } else result.push_back(Pair("error","cant decode sudoku")); - } else result.push_back(Pair("error","couldnt find sudoku")); - } - if ( good != 0 ) - { - mtx.vin.push_back(CTxIn(txid,0,CScript())); - if ( (inputsum= AddCClibInputs(cp,mtx,pk,balance,16,CCaddr,1)) >= balance ) - { - mtx.vout.push_back(CTxOut(balance,CScript() << ParseHex(HexStr(mypk)) << OP_CHECKSIG)); - CCaddr2set(cp,cp->evalcode,pk,priv32,CCaddr); - rawtx = FinalizeCCTx(0,cp,mtx,pubkey2pk(Mypubkey()),txfee,sudoku_solutionopret(solution,timestamps)); - if ( rawtx.size() > 0 ) - { - result.push_back(Pair("result","success")); - result.push_back(Pair("hex",rawtx)); - } - else result.push_back(Pair("error","couldnt finalize CCtx")); - } else result.push_back(Pair("error","couldnt find funds in solution address")); - } - } - } - } - else - { - printf("n.%d params.(%s)\n",n,jprint(params,0)); - result.push_back(Pair("error","couldnt get all params")); - } - return(result); - } - else - { - result.push_back(Pair("result","error")); - result.push_back(Pair("error","couldnt parse parameters")); - result.push_back(Pair("parameters",newstr)); - return(result); - } - } - result.push_back(Pair("result","error")); - result.push_back(Pair("error","missing parameters")); - return(result); -} - -int32_t sudoku_minval(uint32_t timestamps[81]) -{ - int32_t i,ind = -1; uint32_t mintimestamp = 0xffffffff; - for (i=0; i<81; i++) - if ( timestamps[i] != 0 && timestamps[i] < mintimestamp ) - { - mintimestamp = timestamps[i], ind = i; - //fprintf(stderr,"%d ",i); - } - //fprintf(stderr,"mintimestamp.%u\n",mintimestamp); - return(ind); -} - -bool sudoku_validate(struct CCcontract_info *cp,int32_t height,Eval *eval,const CTransaction tx) -{ - static char laststr[512]; - CScript scriptPubKey; std::vector vopret; uint8_t *script,e,f,funcid; int32_t i,ind,errflag,dispflag,score,numvouts; char unsolved[82],solution[82],str[512]; uint32_t timestamps[81]; CTransaction vintx; uint256 hashBlock; - if ( (numvouts= tx.vout.size()) > 1 ) - { - scriptPubKey = tx.vout[numvouts-1].scriptPubKey; - GetOpReturnData(scriptPubKey,vopret); - if ( vopret.size() > 2 ) - { - script = (uint8_t *)vopret.data(); - if ( script[0] == EVAL_SUDOKU ) - { - switch ( script[1] ) - { - case 'G': - if ( sudoku_genopreturndecode(unsolved,scriptPubKey) == 'G' ) - { - //fprintf(stderr,"unsolved.(%s)\n",unsolved); - if ( dupree_solver(0,&score,unsolved) != 1 || score*COIN != tx.vout[1].nValue ) - { - sprintf(str,"ht.%d score.%d vs %.8f %s",height,score,(double)tx.vout[1].nValue/COIN,tx.GetHash().ToString().c_str()); - if ( strcmp(str,laststr) != 0 ) - { - strcpy(laststr,str); - fprintf(stderr,"%s\n",str); - } - if ( strcmp(SMART_CHAIN_SYMBOL,"SUDOKU") != 0 || height > 2000 ) - return eval->Invalid("mismatched sudoku value vs score"); - else return(true); - } else return(true); - } - fprintf(stderr,"height.%d txid.%s\n",height,tx.GetHash().ToString().c_str()); - return eval->Invalid("invalid generate opreturn"); - case 'S': - sprintf(str,"SOLVED ht.%d %.8f %s",height,(double)tx.vout[0].nValue/COIN,tx.GetHash().ToString().c_str()); - if ( strcmp(str,laststr) != 0 ) - { - strcpy(laststr,str); - fprintf(stderr,"%s\n",str); - dispflag = 1; - } else dispflag = 0; - if ( sudoku_solutionopreturndecode(solution,timestamps,scriptPubKey) == 'S' ) - { - if ( tx.vin.size() > 1 && tx.vin[0].prevout.hash == tx.vin[1].prevout.hash && tx.vin[0].prevout.n == 0 && tx.vin[1].prevout.n == 1 && myGetTransaction(tx.vin[0].prevout.hash,vintx,hashBlock) != 0 ) - { - if ( vintx.vout.size() > 1 && sudoku_genopreturndecode(unsolved,vintx.vout[vintx.vout.size()-1].scriptPubKey) == 'G' ) - { - for (i=errflag=0; i<81; i++) - { - if ( 0 && dispflag != 0 ) - fprintf(stderr,"%u ",timestamps[i]); - if ( (timestamps[i] != 0 && unsolved[i] >= '1' && unsolved[i] <= '9') || (timestamps[i] == 0 && (unsolved[i] < '1' || unsolved[i] > '9')) ) - errflag++; - } - if ( errflag != 0 ) - { - if ( dispflag != 0 ) - fprintf(stderr,"ht.%d errflag.%d %s\n",height,errflag,unsolved); - if ( (height != 1220 && height != 1383) || strcmp(SMART_CHAIN_SYMBOL,"SUDOKU") != 0 ) - return eval->Invalid("invalid timestamp vs unsolved"); - } - if ( dupree_solver(0,&score,unsolved) != 1 ) - { - if ( dispflag != 0 ) - fprintf(stderr,"non-unique sudoku at ht.%d\n",height); - if ( strcmp(SMART_CHAIN_SYMBOL,"SUDOKU") != 0 ) - return eval->Invalid("invalid sudoku with multiple solutions"); - } - if ( dispflag != 0 ) - fprintf(stderr,"%s score.%d %s\n",solution,score,unsolved); - if ( sudoku_captcha(dispflag,timestamps,height) < 0 ) - return eval->Invalid("failed captcha"); - /*for (i=lasttime=0; i<81; i++) - { - if ( (ind= sudoku_minval(timestamps)) >= 0 ) - { - unsolved[ind] = solution[ind]; - if ( lasttime == 0 ) - lasttime = timestamps[ind]; - if ( dupree_solver(0,&score,unsolved) != 1 ) - fprintf(stderr,"i.%d ind.%d non-unique\n",i,ind); - if ( dispflag != 0 ) - fprintf(stderr,"%d.%d ",score,timestamps[ind]-lasttime); - lasttime = timestamps[ind]; - timestamps[ind] = 0; - } else break; - } - if ( dispflag != 0 ) - fprintf(stderr,"scores convergence\n");*/ - return(true); - } else return eval->Invalid("invalid solution opret"); - } - else if ( strcmp(SMART_CHAIN_SYMBOL,"SUDOKU") == 0 && height == 236 ) - return(true); - else return eval->Invalid("invalid solution vin"); - } - fprintf(stderr,"solution ht.%d %s bad opret\n",height,tx.GetHash().ToString().c_str()); - return eval->Invalid("invalid solution opreturn"); - default: return eval->Invalid("invalid funcid"); - } - } else return eval->Invalid("invalid evalcode"); - - } - } - return eval->Invalid("not enough vouts"); -} - - From d0fb9a0bc1d23da37762cd6a6a61237851d736e5 Mon Sep 17 00:00:00 2001 From: Duke Date: Fri, 12 Jan 2024 20:05:15 -0500 Subject: [PATCH 026/108] remove rogue --- src/cc/rogue/LICENSE.TXT | 93 - src/cc/rogue/Makefile.in | 225 - src/cc/rogue/Makefile.std | 158 - src/cc/rogue/Makefile_win | 222 - src/cc/rogue/armor.c | 92 - src/cc/rogue/chase.c | 544 -- src/cc/rogue/command.c | 847 -- src/cc/rogue/config.guess | 1500 ---- src/cc/rogue/config.h.in | 269 - src/cc/rogue/config.sub | 1608 ---- src/cc/rogue/configure | 7511 ----------------- src/cc/rogue/configure.ac | 246 - src/cc/rogue/cursesd.c | 435 - src/cc/rogue/cursesd.h | 201 - src/cc/rogue/daemon.c | 219 - src/cc/rogue/daemons.c | 364 - src/cc/rogue/extern.c | 519 -- src/cc/rogue/extern.h | 203 - src/cc/rogue/fight.c | 684 -- src/cc/rogue/init.c | 498 -- src/cc/rogue/install-sh | 323 - src/cc/rogue/io.c | 340 - src/cc/rogue/list.c | 182 - src/cc/rogue/mach_dep.c | 462 - src/cc/rogue/main.c | 1000 --- src/cc/rogue/mdport.c | 1447 ---- src/cc/rogue/misc.c | 620 -- src/cc/rogue/monsters.c | 258 - src/cc/rogue/move.c | 429 - src/cc/rogue/new_level.c | 247 - src/cc/rogue/options.c | 504 -- src/cc/rogue/pack.c | 543 -- src/cc/rogue/passages.c | 427 - src/cc/rogue/potions.c | 335 - src/cc/rogue/rings.c | 209 - src/cc/rogue/rip.c | 464 - src/cc/rogue/rogue.6 | 96 - src/cc/rogue/rogue.6.in | 96 - src/cc/rogue/rogue.c | 776 -- src/cc/rogue/rogue.cat | 61 - src/cc/rogue/rogue.cat.in | 61 - src/cc/rogue/rogue.desktop | 11 - src/cc/rogue/rogue.doc | 858 -- src/cc/rogue/rogue.doc.in | 858 -- src/cc/rogue/rogue.h | 863 -- src/cc/rogue/rogue.html | 1060 --- src/cc/rogue/rogue.html.in | 1060 --- src/cc/rogue/rogue.me | 892 -- src/cc/rogue/rogue.me.in | 892 -- src/cc/rogue/rogue.png | Bin 1005 -> 0 bytes src/cc/rogue/rogue.spec | 107 - src/cc/rogue/rogue54.sln | 27 - src/cc/rogue/rogue54.vcproj | 396 - src/cc/rogue/rogue54.vcxproj | 257 - src/cc/rogue/rogue_build_msvc.cmd | 64 - src/cc/rogue/rogue_player.h | 38 - src/cc/rogue/rooms.c | 479 -- src/cc/rogue/save.c | 465 - src/cc/rogue/score.h | 32 - src/cc/rogue/scrolls.c | 332 - src/cc/rogue/state.c | 2278 ----- src/cc/rogue/sticks.c | 435 - src/cc/rogue/things.c | 741 -- src/cc/rogue/vers.c | 20 - src/cc/rogue/weapons.c | 293 - src/cc/rogue/wizard.c | 289 - .../deps/install/include/acs_defs.h | 265 - .../deps/install/include/curses.h | 1846 ---- .../deps/install/include/curspriv.h | 134 - .../deps/install/include/getopt.h | 93 - .../deps/install/include/panel.h | 56 - .../deps/install/include/term.h | 48 - .../deps/install/include/unistd.h | 56 - src/cc/rogue/xcrypt.c | 711 -- src/cc/rogue_rpc.cpp | 1657 ---- 75 files changed, 42931 deletions(-) delete mode 100644 src/cc/rogue/LICENSE.TXT delete mode 100644 src/cc/rogue/Makefile.in delete mode 100755 src/cc/rogue/Makefile.std delete mode 100644 src/cc/rogue/Makefile_win delete mode 100644 src/cc/rogue/armor.c delete mode 100644 src/cc/rogue/chase.c delete mode 100644 src/cc/rogue/command.c delete mode 100755 src/cc/rogue/config.guess delete mode 100644 src/cc/rogue/config.h.in delete mode 100755 src/cc/rogue/config.sub delete mode 100755 src/cc/rogue/configure delete mode 100644 src/cc/rogue/configure.ac delete mode 100644 src/cc/rogue/cursesd.c delete mode 100644 src/cc/rogue/cursesd.h delete mode 100644 src/cc/rogue/daemon.c delete mode 100644 src/cc/rogue/daemons.c delete mode 100644 src/cc/rogue/extern.c delete mode 100644 src/cc/rogue/extern.h delete mode 100644 src/cc/rogue/fight.c delete mode 100644 src/cc/rogue/init.c delete mode 100755 src/cc/rogue/install-sh delete mode 100644 src/cc/rogue/io.c delete mode 100644 src/cc/rogue/list.c delete mode 100644 src/cc/rogue/mach_dep.c delete mode 100644 src/cc/rogue/main.c delete mode 100644 src/cc/rogue/mdport.c delete mode 100644 src/cc/rogue/misc.c delete mode 100644 src/cc/rogue/monsters.c delete mode 100644 src/cc/rogue/move.c delete mode 100644 src/cc/rogue/new_level.c delete mode 100644 src/cc/rogue/options.c delete mode 100644 src/cc/rogue/pack.c delete mode 100644 src/cc/rogue/passages.c delete mode 100644 src/cc/rogue/potions.c delete mode 100644 src/cc/rogue/rings.c delete mode 100644 src/cc/rogue/rip.c delete mode 100644 src/cc/rogue/rogue.6 delete mode 100644 src/cc/rogue/rogue.6.in delete mode 100644 src/cc/rogue/rogue.c delete mode 100644 src/cc/rogue/rogue.cat delete mode 100644 src/cc/rogue/rogue.cat.in delete mode 100644 src/cc/rogue/rogue.desktop delete mode 100644 src/cc/rogue/rogue.doc delete mode 100644 src/cc/rogue/rogue.doc.in delete mode 100644 src/cc/rogue/rogue.h delete mode 100644 src/cc/rogue/rogue.html delete mode 100644 src/cc/rogue/rogue.html.in delete mode 100644 src/cc/rogue/rogue.me delete mode 100644 src/cc/rogue/rogue.me.in delete mode 100644 src/cc/rogue/rogue.png delete mode 100644 src/cc/rogue/rogue.spec delete mode 100644 src/cc/rogue/rogue54.sln delete mode 100644 src/cc/rogue/rogue54.vcproj delete mode 100644 src/cc/rogue/rogue54.vcxproj delete mode 100644 src/cc/rogue/rogue_build_msvc.cmd delete mode 100644 src/cc/rogue/rogue_player.h delete mode 100644 src/cc/rogue/rooms.c delete mode 100644 src/cc/rogue/save.c delete mode 100644 src/cc/rogue/score.h delete mode 100644 src/cc/rogue/scrolls.c delete mode 100644 src/cc/rogue/state.c delete mode 100644 src/cc/rogue/sticks.c delete mode 100644 src/cc/rogue/things.c delete mode 100644 src/cc/rogue/vers.c delete mode 100644 src/cc/rogue/weapons.c delete mode 100644 src/cc/rogue/wizard.c delete mode 100644 src/cc/rogue/x86_64-w64-msvc/deps/install/include/acs_defs.h delete mode 100644 src/cc/rogue/x86_64-w64-msvc/deps/install/include/curses.h delete mode 100644 src/cc/rogue/x86_64-w64-msvc/deps/install/include/curspriv.h delete mode 100644 src/cc/rogue/x86_64-w64-msvc/deps/install/include/getopt.h delete mode 100644 src/cc/rogue/x86_64-w64-msvc/deps/install/include/panel.h delete mode 100644 src/cc/rogue/x86_64-w64-msvc/deps/install/include/term.h delete mode 100644 src/cc/rogue/x86_64-w64-msvc/deps/install/include/unistd.h delete mode 100644 src/cc/rogue/xcrypt.c delete mode 100644 src/cc/rogue_rpc.cpp diff --git a/src/cc/rogue/LICENSE.TXT b/src/cc/rogue/LICENSE.TXT deleted file mode 100644 index ae3f4715b..000000000 --- a/src/cc/rogue/LICENSE.TXT +++ /dev/null @@ -1,93 +0,0 @@ -Rogue: Exploring the Dungeons of Doom -Copyright (C) 1980-1983, 1985, 1999 Michael Toy, Ken Arnold and Glenn Wichman -All rights reserved. - -Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions -are met: -1. Redistributions of source code must retain the above copyright - notice, this list of conditions and the following disclaimer. -2. Redistributions in binary form must reproduce the above copyright - notice, this list of conditions and the following disclaimer in the - documentation and/or other materials provided with the distribution. -3. Neither the name(s) of the author(s) nor the names of other contributors - may be used to endorse or promote products derived from this software - without specific prior written permission. - -THIS SOFTWARE IS PROVIDED BY THE AUTHOR(S) AND CONTRIBUTORS ``AS IS'' AND -ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE -ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR(S) OR CONTRIBUTORS BE LIABLE -FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS -OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) -HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT -LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY -OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF -SUCH DAMAGE. - -=========================================================================== - -Portions of this software (state.c, mdport.c) are based on the work -of Nicholas J. Kisseberth. Used under license: - -Copyright (C) 1999, 2000, 2005 Nicholas J. Kisseberth -All rights reserved. - -Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions -are met: -1. Redistributions of source code must retain the above copyright - notice, this list of conditions and the following disclaimer. -2. Redistributions in binary form must reproduce the above copyright - notice, this list of conditions and the following disclaimer in the - documentation and/or other materials provided with the distribution. -3. Neither the name(s) of the author(s) nor the names of other contributors - may be used to endorse or promote products derived from this software - without specific prior written permission. - -THIS SOFTWARE IS PROVIDED BY THE AUTHOR(S) AND CONTRIBUTORS ``AS IS'' AND -ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE -ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR(S) OR CONTRIBUTORS BE LIABLE -FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS -OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) -HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT -LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY -OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF -SUCH DAMAGE. - -=========================================================================== - -Portions of this software (xcrypt.c) are based on the work -of David Burren. Used under license: - -FreeSec: libcrypt - -Copyright (C) 1994 David Burren -All rights reserved. - -Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions -are met: -1. Redistributions of source code must retain the above copyright - notice, this list of conditions and the following disclaimer. -2. Redistributions in binary form must reproduce the above copyright - notice, this list of conditions and the following disclaimer in the - documentation and/or other materials provided with the distribution. -3. Neither the name(s) of the author(s) nor the names of other contributors - may be used to endorse or promote products derived from this software - without specific prior written permission. - -THIS SOFTWARE IS PROVIDED BY THE AUTHOR(S) AND CONTRIBUTORS ``AS IS'' AND -ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE -ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR(S) OR CONTRIBUTORS BE LIABLE -ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS -OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) -HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT -LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY -OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF -SUCH DAMAGE. diff --git a/src/cc/rogue/Makefile.in b/src/cc/rogue/Makefile.in deleted file mode 100644 index d8aa7f5e6..000000000 --- a/src/cc/rogue/Makefile.in +++ /dev/null @@ -1,225 +0,0 @@ -# Copyright (c) 2016-2023 The Hush developers -# Distributed under the GPLv3 software license, see the accompanying -# file COPYING or https://www.gnu.org/licenses/gpl-3.0.en.html -############################################################################### -# -# Makefile for rogue -# -# Rogue: Exploring the Dungeons of Doom -# Copyright (C) 1980-1983, 1985, 1999 Michael Toy, Ken Arnold and Glenn Wichman -# All rights reserved. -# -# See the file LICENSE.TXT for full copyright and licensing information. -# -############################################################################### - -############################################################################### -# Site configuration occurs beneath this comment -# Typically ./configure (autoconf tools) configures this section -# This section could be manually configured if autoconf/configure fails -############################################################################### - -DISTNAME=@PACKAGE_TARNAME@@PACKAGE_VERSION@ -PACKAGE_TARNAME = @PACKAGE_TARNAME@-@PACKAGE_VERSION@ -PROGRAM=@PROGRAM@ - -O=o - -#CC=gcc -CC = @CC@ - -#CFLAGS=-O2 -CFLAGS= @CFLAGS@ -fPIC - -LIBS=-lcurses -lcurl -#LIBS = @LIBS@ - -#RM=rm -f -RM = rm -f - -#GROFF=groff -GROFF = @GROFF@ - -#NROFF=nroff -NROFF = @NROFF@ - -#TBL=tbl -TBL = @TBL@ - -#COLCRT=colcrt -COLCRT = @COLCRT@ - -#SED=sed -SED = @SED@ - -#SCOREFILE=rogue54.scr -SCOREFILE = @SCOREFILE@ - -#LOCKFILE=rogue54.lck -LOCKFILE = @LOCKFILE@ - -#GROUPOWNER=games -GROUPOWNER = @GROUPOWNER@ - -#CPPFLAGS=-DHAVE_CONFIG_H -CPPFLAGS =@DEFS@ @CPPFLAGS@ - -#DISTFILE = $(PROGRAM) -DISTFILE = $(DISTNAME)-@TARGET@ - -INSTALL=./install-sh - -#INSTGROUP=-g games -INSTGROUP= -#INSTOWNER=-u root -INSTOWNER= - -CHGRP=chgrp - -MKDIR=mkdir - -TOUCH=touch - -RMDIR=rmdir - -CHMOD=chmod - -DESTDIR= - -prefix=@prefix@ -exec_prefix=@exec_prefix@ -datarootdir=@datarootdir@ -datadir=@datadir@ -bindir=@bindir@ -mandir=@mandir@ -docdir=@docdir@ -man6dir = $(mandir)/man6 - -############################################################################### -# Site configuration occurs above this comment -# It should not be necessary to change anything below this comment -############################################################################### - -HDRS = rogue.h extern.h score.h -OBJS1 = vers.$(O) extern.$(O) armor.$(O) chase.$(O) command.$(O) \ - daemon.$(O) daemons.$(O) fight.$(O) init.$(O) io.$(O) list.$(O) \ - mach_dep.$(O) rogue.$(O) mdport.$(O) misc.$(O) monsters.$(O) \ - move.$(O) new_level.$(O) -OBJS2 = options.$(O) pack.$(O) passages.$(O) potions.$(O) rings.$(O) \ - rip.$(O) rooms.$(O) save.$(O) scrolls.$(O) state.$(O) sticks.$(O) \ - things.$(O) weapons.$(O) wizard.$(O) xcrypt.$(O) -OBJS = main.$(O) $(OBJS1) $(OBJS2) -CFILES = vers.c extern.c armor.c chase.c command.c daemon.c \ - daemons.c fight.c init.c io.c list.c mach_dep.c \ - main.c mdport.c misc.c monsters.c move.c new_level.c \ - options.c pack.c passages.c potions.c rings.c rip.c \ - rooms.c save.c scrolls.c state.c sticks.c things.c \ - weapons.c wizard.c xcrypt.c -MISC_C = findpw.c scedit.c scmisc.c -DOCSRC = rogue.me.in rogue.6.in rogue.doc.in rogue.html.in rogue.cat.in -DOCS = $(PROGRAM).doc $(PROGRAM).html $(PROGRAM).cat $(PROGRAM).me \ - $(PROGRAM).6 -AFILES = configure Makefile.in configure.ac config.h.in config.sub config.guess \ - install-sh rogue.6.in rogue.me.in rogue.html.in rogue.doc.in rogue.cat.in -MISC = Makefile.std LICENSE.TXT rogue54.sln rogue54.vcproj rogue.spec \ - rogue.png rogue.desktop - -.SUFFIXES: .obj - -.c.obj: - $(CC) $(CFLAGS) $(CPPFLAGS) /c $*.c - -.c.o: - $(CC) $(CFLAGS) $(CPPFLAGS) -c $*.c - -#$(RM) rogue.so ; $(CC) -shared -o rogue.so cursesd.c $(OBJS1) $(OBJS2); $(CC) $(CFLAGS) $(LDFLAGS) $(OBJS) $(LIBS) -o $@ - -$(PROGRAM): $(HDRS) $(OBJS) - $(CC) $(CFLAGS) $(LDFLAGS) $(OBJS) $(LIBS) -o $@ - -clean: - $(RM) $(OBJS1); $(RM) main.$(O) ; $(RM) rogue.so - $(RM) $(OBJS2) - $(RM) core a.exe a.out a.exe.stackdump $(PROGRAM) $(PROGRAM).exe - $(RM) $(PROGRAM).tar $(PROGRAM).tar.gz $(PROGRAM).zip - $(RM) $(DISTNAME)/* - -rmdir $(DISTNAME) - -maintainer-clean: - $(RM) config.h - $(RM) Makefile - $(RM) config.status - $(RM) -r autom4te.cache - $(RM) config.log - $(RM) $(PROGRAM).scr $(PROGRAM).lck - -stddocs: - sed -e 's/@PROGRAM@/rogue/' -e 's/@SCOREFILE@/rogue.scr/' rogue.6.in > rogue.6 - sed -e 's/@PROGRAM@/rogue/' -e 's/@SCOREFILE@/rogue.scr/' rogue.me.in > rogue.me - sed -e 's/@PROGRAM@/rogue/' -e 's/@SCOREFILE@/rogue.scr/' rogue.html.in > rogue,html - sed -e 's/@PROGRAM@/rogue/' -e 's/@SCOREFILE@/rogue.scr/' rogue.doc.in > rogue.doc - sed -e 's/@PROGRAM@/rogue/' -e 's/@SCOREFILE@/rogue.scr/' rogue.cat.in > rogue.cat - -dist.src: - $(MAKE) $(MAKEFILE) clean - mkdir $(DISTNAME) - cp $(CFILES) $(HDRS) $(MISC) $(AFILES) $(DISTNAME) - tar cf $(DISTNAME)-src.tar $(DISTNAME) - gzip -f $(DISTNAME)-src.tar - rm -fr $(DISTNAME) - -findpw: findpw.c xcrypt.o mdport.o xcrypt.o - $(CC) -s -o findpw findpw.c xcrypt.o mdport.o -lcurses - -scedit: scedit.o scmisc.o vers.o mdport.o xcrypt.o - $(CC) -s -o scedit vers.o scedit.o scmisc.o mdport.o xcrypt.o -lcurses - -scmisc.o scedit.o: - $(CC) -O -c $(SF) $*.c - -$(PROGRAM).doc: rogue.me - if test "x$(GROFF)" != "x" -a "x$(SED)" != "x" ; then \ - $(GROFF) -P-c -t -me -Tascii rogue.me | $(SED) -e 's/.\x08//g' > $(PROGRAM).doc ;\ - elif test "x$(NROFF)" != "x" -a "x$(TBL)" != "x" -a "x$(COLCRT)" != "x" ; then \ - tbl rogue.me | $(NROFF) -me | colcrt - > $(PROGRAM).doc ;\ - fi - -$(PROGRAM).cat: rogue.6 - if test "x$(GROFF)" != "x" -a "x$(SED)" != "x" ; then \ - $(GROFF) -Tascii -man rogue.6 | $(SED) -e 's/.\x08//g' > $(PROGRAM).cat ;\ - elif test "x$(NROFF)" != "x" -a "x$(TBL)" != "x" -a "x$(COLCRT)" != "x" ; then \ - $(NROFF) -man rogue.6 | $(COLCRT) - > $(PROGRAM).cat ;\ - fi - -dist: clean $(PROGRAM) - tar cf $(DISTFILE).tar $(PROGRAM) LICENSE.TXT $(DOCS) - gzip -f $(DISTFILE).tar - -install: $(PROGRAM) - -$(TOUCH) test - -if test ! -f $(DESTDIR)$(SCOREFILE) ; then $(INSTALL) -m 0664 test $(DESTDIR)$(SCOREFILE) ; fi - -$(INSTALL) -m 0755 $(PROGRAM) $(DESTDIR)$(bindir)/$(PROGRAM) - -if test "x$(GROUPOWNER)" != "x" ; then \ - $(CHGRP) $(GROUPOWNER) $(DESTDIR)$(SCOREFILE) ; \ - $(CHGRP) $(GROUPOWNER) $(DESTDIR)$(bindir)/$(PROGRAM) ; \ - $(CHMOD) 02755 $(DESTDIR)$(bindir)/$(PROGRAM) ; \ - $(CHMOD) 0464 $(DESTDIR)$(SCOREFILE) ; \ - fi - -if test -d $(man6dir) ; then $(INSTALL) -m 0644 rogue.6 $(DESTDIR)$(man6dir)/$(PROGRAM).6 ; fi - -if test ! -d $(man6dir) ; then $(INSTALL) -m 0644 rogue.6 $(DESTDIR)$(mandir)/$(PROGRAM).6 ; fi - -$(INSTALL) -m 0644 rogue.doc $(DESTDIR)$(docdir)/$(PROGRAM).doc - -$(INSTALL) -m 0644 rogue.html $(DESTDIR)$(docdir)/$(PROGRAM).html - -$(INSTALL) -m 0644 rogue.cat $(DESTDIR)$(docdir)/$(PROGRAM).cat - -$(INSTALL) -m 0644 LICENSE.TXT $(DESTDIR)$(docdir)/LICENSE.TXT - -$(INSTALL) -m 0644 rogue.me $(DESTDIR)$(docdir)/$(PROGRAM).me - -if test ! -f $(DESTDIR)$(LOCKFILE) ; then $(INSTALL) -m 0666 test $(DESTDIR)$(LOCKFILE) ; $(RM) $(DESTDIR)$(LOCKFILE) ; fi - -$(RM) test - -uninstall: - -$(RM) $(DESTDIR)$(bindir)/$(PROGRAM) - -$(RM) $(DESTDIR)$(man6dir)/$(PROGRAM).6 - -$(RM) $(DESTDIR)$(docdir)$(PROGRAM)/$(PROGRAM).doc - -$(RM) $(DESTDIR)$(LOCKFILE) - -$(RMDIR) $(DESTDIR)$(docdir)$(PROGRAM) - -reinstall: uninstall install diff --git a/src/cc/rogue/Makefile.std b/src/cc/rogue/Makefile.std deleted file mode 100755 index 923c74672..000000000 --- a/src/cc/rogue/Makefile.std +++ /dev/null @@ -1,158 +0,0 @@ -# -# Makefile for rogue -# @(#)Makefile 4.21 (Berkeley) 02/04/99 -# -# Rogue: Exploring the Dungeons of Doom -# Copyright (C) 1980-1983, 1985, 1999 Michael Toy, Ken Arnold and Glenn Wichman -# All rights reserved. -# -# See the file LICENSE.TXT for full copyright and licensing information. -# - -DISTNAME = rogue5.4.4 -PROGRAM = rogue54 -O = o -HDRS = rogue.h extern.h score.h -OBJS1 = vers.$(O) extern.$(O) armor.$(O) chase.$(O) command.$(O) \ - daemon.$(O) daemons.$(O) fight.$(O) init.$(O) io.$(O) list.$(O) \ - mach_dep.$(O) main.$(O) mdport.$(O) misc.$(O) monsters.$(O) \ - move.$(O) new_level.$(O) -OBJS2 = options.$(O) pack.$(O) passages.$(O) potions.$(O) rings.$(O) \ - rip.$(O) rooms.$(O) save.$(O) scrolls.$(O) state.$(O) sticks.$(O) \ - things.$(O) weapons.$(O) wizard.$(O) xcrypt.$(O) -OBJS = $(OBJS1) $(OBJS2) -CFILES = vers.c extern.c armor.c chase.c command.c daemon.c \ - daemons.c fight.c init.c io.c list.c mach_dep.c \ - main.c mdport.c misc.c monsters.c move.c new_level.c \ - options.c pack.c passages.c potions.c rings.c rip.c \ - rooms.c save.c scrolls.c state.c sticks.c things.c \ - weapons.c wizard.c xcrypt.c -MISC_C = findpw.c scedit.c scmisc.c -DOCSRC = rogue.me.in rogue.6.in rogue.doc.in rogue.html.in rogue.cat.in -DOCS = $(PROGRAM).doc $(PROGRAM).html $(PROGRAM).cat $(PROGRAM).me \ - $(PROGRAM).6 -AFILES = configure Makefile.in configure.ac config.h.in config.sub config.guess \ - install-sh rogue.6.in rogue.me.in rogue.html.in rogue.doc.in rogue.cat.in -MISC = Makefile.std LICENSE.TXT rogue54.sln rogue54.vcproj rogue.spec \ - rogue.png rogue.desktop -CC = gcc -FEATURES = -DALLSCORES -DSCOREFILE=\"$(SCOREFILE)\" -DLOCKFILE=\"$(LOCKFILE)\" -CPPFLAGS = -CFLAGS = -O3 -LDFLAGS = -LIBS = -lcurses -RM = rm -f -MAKEFILE = -f Makefile.std -SCOREFILE= $(PROGRAM).scr -LOCKFILE = $(PROGRAM).lck -OUTFLAG = -o -EXE = - -.SUFFIXES: .obj - -.c.obj: - $(CC) $(CFLAGS) $(CPPFLAGS) $(FEATURES) /c $*.c - -.c.o: - $(CC) $(CFLAGS) $(CPPFLAGS) $(FEATURES) -c $*.c - -$(PROGRAM): $(HDRS) $(OBJS) fixdocs - $(CC) $(LDFLAGS) $(OBJS) $(LIBS) $(OUTFLAG)$@$(EXE) - -clean: - $(RM) $(OBJS1) - $(RM) $(OBJS2) - $(RM) core a.exe a.out a.exe.stackdump $(PROGRAM) $(PROGRAM).exe $(PROGRAM).lck - $(RM) $(PROGRAM).tar $(PROGRAM).tar.gz $(PROGRAM).zip - $(RM) $(DISTNAME)/* - -dist.src: - $(MAKE) $(MAKEFILE) clean - mkdir $(DISTNAME) - cp $(CFILES) $(HDRS) $(MISC) $(AFILES) $(DISTNAME) - tar cf $(DISTNAME)-src.tar $(DISTNAME) - gzip -f $(DISTNAME)-src.tar - rm -fr $(DISTNAME) - -findpw: findpw.c xcrypt.o mdport.o xcrypt.o - $(CC) -s -o findpw findpw.c xcrypt.o mdport.o -lcurses - -scedit: scedit.o scmisc.o vers.o mdport.o xcrypt.o - $(CC) -s -o scedit vers.o scedit.o scmisc.o mdport.o xcrypt.o -lcurses - -scmisc.o scedit.o: - $(CC) -O -c $(SF) $*.c - -doc.nroff: - tbl rogue.me | nroff -me | colcrt - > rogue.doc - nroff -man rogue.6 | colcrt - > rogue.cat - -doc.groff: - groff -P-c -t -me -Tascii rogue.me | sed -e 's/.\x08//g' > rogue.doc - groff -man rogue.6 | sed -e 's/.\x08//g' > rogue.cat - -fixdocs: - sed -e 's/@PROGRAM@/$(PROGRAM)/' -e 's/@SCOREFILE@/$(SCOREFILE)/' rogue.6.in > $(PROGRAM).6 - sed -e 's/@PROGRAM@/$(PROGRAM)/' -e 's/@SCOREFILE@/$(SCOREFILE)/' rogue.me.in > $(PROGRAM).me - sed -e 's/@PROGRAM@/$(PROGRAM)/' -e 's/@SCOREFILE@/$(SCOREFILE)/' rogue.html.in > $(PROGRAM).html - sed -e 's/@PROGRAM@/$(PROGRAM)/' -e 's/@SCOREFILE@/$(SCOREFILE)/' rogue.doc.in > $(PROGRAM).doc - sed -e 's/@PROGRAM@/$(PROGRAM)/' -e 's/@SCOREFILE@/$(SCOREFILE)/' rogue.cat.in > $(PROGRAM).cat - -dist.irix: - $(MAKE) $(MAKEFILE) clean - $(MAKE) $(MAKEFILE) CC=cc $(PROGRAM) - tar cf $(DISTNAME)-irix.tar $(PROGRAM) LICENSE.TXT $(DOCS) - gzip -f $(DISTNAME)-irix.tar - -dist.aix: - $(MAKE) $(MAKEFILE) clean - $(MAKE) $(MAKEFILE) CC=xlc CFLAGS="-qmaxmem=16768 -O3 -qstrict" $(PROGRAM) - tar cf $(DISTNAME)-aix.tar $(PROGRAM) LICENSE.TXT $(DOCS) - gzip -f $(DISTNAME)-aix.tar - -dist.linux: - $(MAKE) $(MAKEFILE) clean - $(MAKE) $(MAKEFILE) $(PROGRAM) - tar cf $(DISTNAME)-linux.tar $(PROGRAM) LICENSE.TXT $(DOCS) - gzip -f $(DISTNAME)-linux.tar - -dist.interix: - @$(MAKE) $(MAKEFILE) clean - @$(MAKE) $(MAKEFILE) CFLAGS="-ansi" $(PROGRAM) - tar cf $(DISTNAME)-interix.tar $(PROGRAM) LICENSE.TXT $(DOCS) - gzip -f $(DISTNAME)-interix.tar - -dist.cygwin: - @$(MAKE) $(MAKEFILE) --no-print-directory clean - @$(MAKE) $(MAKEFILE) CPPFLAGS="-I/usr/include/ncurses" --no-print-directory $(PROGRAM) - tar cf $(DISTNAME)-cygwin.tar $(PROGRAM).exe LICENSE.TXT $(DOCS) - gzip -f $(DISTNAME)-cygwin.tar - -# -# Use MINGW32-MAKE to build this target -# -dist.mingw32: - @$(MAKE) $(MAKEFILE) --no-print-directory RM="cmd /c del" clean - @$(MAKE) $(MAKEFILE) --no-print-directory CPPFLAGS="-I../pdcurses" LIBS="../pdcurses/pdcurses.a" $(PROGRAM) - cmd /c del $(DISTNAME)-mingw32.zip - zip $(DISTNAME)-mingw32.zip $(PROGRAM).exe LICENSE.TXT $(DOCS) - -dist.djgpp: - @$(MAKE) $(MAKEFILE) --no-print-directory clean - @$(MAKE) $(MAKEFILE) --no-print-directory LDFLAGS="-L$(DJDIR)/LIB" \ - LIBS="-lpdcurses" $(PROGRAM) - rm -f $(DISTNAME)-djgpp.zip - zip $(DISTNAME)-djgpp.zip $(PROGRAM) LICENSE.TXT $(DOCS) - -# -# Use NMAKE to build this targer -# - -dist.win32: - @$(MAKE) $(MAKEFILE) /NOLOGO O="obj" RM="-del" clean - @$(MAKE) $(MAKEFILE) /NOLOGO O="obj" CC="CL" \ - LIBS="..\pdcurses\pdcurses.lib shell32.lib user32.lib Advapi32.lib" \ - EXE=".exe" OUTFLAG="/Fe" CPPFLAGS="-I..\pdcurses" \ - CFLAGS="-nologo -Ox -wd4033 -wd4716" $(PROGRAM) - -del $(DISTNAME)-win32.zip - zip $(DISTNAME)-win32.zip $(PROGRAM).exe LICENSE.TXT $(DOCS) diff --git a/src/cc/rogue/Makefile_win b/src/cc/rogue/Makefile_win deleted file mode 100644 index e5a36d9b4..000000000 --- a/src/cc/rogue/Makefile_win +++ /dev/null @@ -1,222 +0,0 @@ -############################################################################### -# -# Makefile for rogue -# -# Rogue: Exploring the Dungeons of Doom -# Copyright (C) 1980-1983, 1985, 1999 Michael Toy, Ken Arnold and Glenn Wichman -# All rights reserved. -# -# See the file LICENSE.TXT for full copyright and licensing information. -# -############################################################################### - -############################################################################### -# Site configuration occurs beneath this comment -# Typically ./configure (autoconf tools) configures this section -# This section could be manually configured if autoconf/configure fails -############################################################################### - -DISTNAME=rogue5.4.4 -PACKAGE_TARNAME = rogue-5.4.4 -PROGRAM=rogue - -O=o - -#CC=gcc -CC = x86_64-w64-mingw32-gcc - -#CFLAGS=-O2 -CFLAGS= -g -O2 -I./x86_64-w64-mingw32/include -I./x86_64-w64-mingw32/include/ncursesw - -#LIBS=-lcurses -LIBS = -L./x86_64-w64-mingw32/lib -lncursesw -lcurl - -#RM=rm -f -RM = rm -f - -#GROFF=groff -GROFF = groff - -#NROFF=nroff -NROFF = nroff - -#TBL=tbl -TBL = tbl - -#COLCRT=colcrt -COLCRT = colcrt - -#SED=sed -SED = sed - -#SCOREFILE=rogue54.scr -SCOREFILE = rogue.scr - -#LOCKFILE=rogue54.lck -LOCKFILE = rogue.lck - -#GROUPOWNER=games -GROUPOWNER = - -#CPPFLAGS=-DHAVE_CONFIG_H -CPPFLAGS =-DHAVE_CONFIG_H - -#DISTFILE = $(PROGRAM) -DISTFILE = $(DISTNAME)-x86_64-w64-mingw32 - -INSTALL=./install-sh - -#INSTGROUP=-g games -INSTGROUP= -#INSTOWNER=-u root -INSTOWNER= - -CHGRP=chgrp - -MKDIR=mkdir - -TOUCH=touch - -RMDIR=rmdir - -CHMOD=chmod - -DESTDIR= - -prefix=/usr/local -exec_prefix=${prefix} -datarootdir=${prefix}/share -datadir=${datarootdir} -bindir=${exec_prefix}/bin -mandir=${datarootdir}/man -docdir=${datarootdir}/doc/${PACKAGE_TARNAME} -man6dir = $(mandir)/man6 - -############################################################################### -# Site configuration occurs above this comment -# It should not be necessary to change anything below this comment -############################################################################### - -HDRS = rogue.h extern.h score.h -OBJS1 = vers.$(O) extern.$(O) armor.$(O) chase.$(O) command.$(O) \ - daemon.$(O) daemons.$(O) fight.$(O) init.$(O) io.$(O) list.$(O) \ - mach_dep.$(O) rogue.$(O) mdport.$(O) misc.$(O) monsters.$(O) \ - move.$(O) new_level.$(O) -OBJS2 = options.$(O) pack.$(O) passages.$(O) potions.$(O) rings.$(O) \ - rip.$(O) rooms.$(O) save.$(O) scrolls.$(O) state.$(O) sticks.$(O) \ - things.$(O) weapons.$(O) wizard.$(O) xcrypt.$(O) -OBJS = main.$(O) $(OBJS1) $(OBJS2) -CFILES = vers.c extern.c armor.c chase.c command.c daemon.c \ - daemons.c fight.c init.c io.c list.c mach_dep.c \ - main.c mdport.c misc.c monsters.c move.c new_level.c \ - options.c pack.c passages.c potions.c rings.c rip.c \ - rooms.c save.c scrolls.c state.c sticks.c things.c \ - weapons.c wizard.c xcrypt.c -MISC_C = findpw.c scedit.c scmisc.c -DOCSRC = rogue.me.in rogue.6.in rogue.doc.in rogue.html.in rogue.cat.in -DOCS = $(PROGRAM).doc $(PROGRAM).html $(PROGRAM).cat $(PROGRAM).me \ - $(PROGRAM).6 -AFILES = configure Makefile.in configure.ac config.h.in config.sub config.guess \ - install-sh rogue.6.in rogue.me.in rogue.html.in rogue.doc.in rogue.cat.in -MISC = Makefile.std LICENSE.TXT rogue54.sln rogue54.vcproj rogue.spec \ - rogue.png rogue.desktop - -.SUFFIXES: .obj - -.c.obj: - $(CC) $(CFLAGS) $(CPPFLAGS) /c $*.c - -.c.o: - $(CC) $(CFLAGS) $(CPPFLAGS) -c $*.c - -#$(RM) rogue.so ; $(CC) -shared -o rogue.so cursesd.c $(OBJS1) $(OBJS2); $(CC) $(CFLAGS) $(LDFLAGS) $(OBJS) $(LIBS) -o $@ - -$(PROGRAM): $(HDRS) $(OBJS) - $(CC) $(CFLAGS) $(LDFLAGS) $(OBJS) $(LIBS) -o $@.exe - -clean: - $(RM) $(OBJS1); $(RM) main.$(O) ; $(RM) rogue.so - $(RM) $(OBJS2) - $(RM) core a.exe a.out a.exe.stackdump $(PROGRAM) $(PROGRAM).exe - $(RM) $(PROGRAM).tar $(PROGRAM).tar.gz $(PROGRAM).zip - $(RM) $(DISTNAME)/* - -rmdir $(DISTNAME) - -maintainer-clean: - $(RM) config.h - $(RM) Makefile - $(RM) config.status - $(RM) -r autom4te.cache - $(RM) config.log - $(RM) $(PROGRAM).scr $(PROGRAM).lck - -stddocs: - sed -e 's/rogue/rogue/' -e 's/rogue.scr/rogue.scr/' rogue.6.in > rogue.6 - sed -e 's/rogue/rogue/' -e 's/rogue.scr/rogue.scr/' rogue.me.in > rogue.me - sed -e 's/rogue/rogue/' -e 's/rogue.scr/rogue.scr/' rogue.html.in > rogue,html - sed -e 's/rogue/rogue/' -e 's/rogue.scr/rogue.scr/' rogue.doc.in > rogue.doc - sed -e 's/rogue/rogue/' -e 's/rogue.scr/rogue.scr/' rogue.cat.in > rogue.cat - -dist.src: - $(MAKE) $(MAKEFILE) clean - mkdir $(DISTNAME) - cp $(CFILES) $(HDRS) $(MISC) $(AFILES) $(DISTNAME) - tar cf $(DISTNAME)-src.tar $(DISTNAME) - gzip -f $(DISTNAME)-src.tar - rm -fr $(DISTNAME) - -findpw: findpw.c xcrypt.o mdport.o xcrypt.o - $(CC) -s -o findpw findpw.c xcrypt.o mdport.o -lcurses - -scedit: scedit.o scmisc.o vers.o mdport.o xcrypt.o - $(CC) -s -o scedit vers.o scedit.o scmisc.o mdport.o xcrypt.o -lcurses - -scmisc.o scedit.o: - $(CC) -O -c $(SF) $*.c - -$(PROGRAM).doc: rogue.me - if test "x$(GROFF)" != "x" -a "x$(SED)" != "x" ; then \ - $(GROFF) -P-c -t -me -Tascii rogue.me | $(SED) -e 's/.\x08//g' > $(PROGRAM).doc ;\ - elif test "x$(NROFF)" != "x" -a "x$(TBL)" != "x" -a "x$(COLCRT)" != "x" ; then \ - tbl rogue.me | $(NROFF) -me | colcrt - > $(PROGRAM).doc ;\ - fi - -$(PROGRAM).cat: rogue.6 - if test "x$(GROFF)" != "x" -a "x$(SED)" != "x" ; then \ - $(GROFF) -Tascii -man rogue.6 | $(SED) -e 's/.\x08//g' > $(PROGRAM).cat ;\ - elif test "x$(NROFF)" != "x" -a "x$(TBL)" != "x" -a "x$(COLCRT)" != "x" ; then \ - $(NROFF) -man rogue.6 | $(COLCRT) - > $(PROGRAM).cat ;\ - fi - -dist: clean $(PROGRAM) - tar cf $(DISTFILE).tar $(PROGRAM) LICENSE.TXT $(DOCS) - gzip -f $(DISTFILE).tar - -install: $(PROGRAM) - -$(TOUCH) test - -if test ! -f $(DESTDIR)$(SCOREFILE) ; then $(INSTALL) -m 0664 test $(DESTDIR)$(SCOREFILE) ; fi - -$(INSTALL) -m 0755 $(PROGRAM) $(DESTDIR)$(bindir)/$(PROGRAM) - -if test "x$(GROUPOWNER)" != "x" ; then \ - $(CHGRP) $(GROUPOWNER) $(DESTDIR)$(SCOREFILE) ; \ - $(CHGRP) $(GROUPOWNER) $(DESTDIR)$(bindir)/$(PROGRAM) ; \ - $(CHMOD) 02755 $(DESTDIR)$(bindir)/$(PROGRAM) ; \ - $(CHMOD) 0464 $(DESTDIR)$(SCOREFILE) ; \ - fi - -if test -d $(man6dir) ; then $(INSTALL) -m 0644 rogue.6 $(DESTDIR)$(man6dir)/$(PROGRAM).6 ; fi - -if test ! -d $(man6dir) ; then $(INSTALL) -m 0644 rogue.6 $(DESTDIR)$(mandir)/$(PROGRAM).6 ; fi - -$(INSTALL) -m 0644 rogue.doc $(DESTDIR)$(docdir)/$(PROGRAM).doc - -$(INSTALL) -m 0644 rogue.html $(DESTDIR)$(docdir)/$(PROGRAM).html - -$(INSTALL) -m 0644 rogue.cat $(DESTDIR)$(docdir)/$(PROGRAM).cat - -$(INSTALL) -m 0644 LICENSE.TXT $(DESTDIR)$(docdir)/LICENSE.TXT - -$(INSTALL) -m 0644 rogue.me $(DESTDIR)$(docdir)/$(PROGRAM).me - -if test ! -f $(DESTDIR)$(LOCKFILE) ; then $(INSTALL) -m 0666 test $(DESTDIR)$(LOCKFILE) ; $(RM) $(DESTDIR)$(LOCKFILE) ; fi - -$(RM) test - -uninstall: - -$(RM) $(DESTDIR)$(bindir)/$(PROGRAM) - -$(RM) $(DESTDIR)$(man6dir)/$(PROGRAM).6 - -$(RM) $(DESTDIR)$(docdir)$(PROGRAM)/$(PROGRAM).doc - -$(RM) $(DESTDIR)$(LOCKFILE) - -$(RMDIR) $(DESTDIR)$(docdir)$(PROGRAM) - -reinstall: uninstall install diff --git a/src/cc/rogue/armor.c b/src/cc/rogue/armor.c deleted file mode 100644 index 9a90aebde..000000000 --- a/src/cc/rogue/armor.c +++ /dev/null @@ -1,92 +0,0 @@ -// Copyright (c) 2016-2023 The Hush developers -// Distributed under the GPLv3 software license, see the accompanying -// file COPYING or https://www.gnu.org/licenses/gpl-3.0.en.html -/* - * This file contains misc functions for dealing with armor - * @(#)armor.c 4.14 (Berkeley) 02/05/99 - * - * Rogue: Exploring the Dungeons of Doom - * Copyright (C) 1980-1983, 1985, 1999 Michael Toy, Ken Arnold and Glenn Wichman - * All rights reserved. - * - * See the file LICENSE.TXT for full copyright and licensing information. - */ - -//#include -#include "rogue.h" - -/* - * wear: - * The player wants to wear something, so let him/her put it on. - */ -void -wear(struct rogue_state *rs) -{ - register THING *obj; - register char *sp; - - if ((obj = get_item(rs,"wear", ARMOR)) == NULL) - return; - if (cur_armor != NULL) - { - addmsg(rs,"you are already wearing some"); - if (!terse) - addmsg(rs,". You'll have to take it off first"); - endmsg(rs); - after = FALSE; - return; - } - if (obj->o_type != ARMOR) - { - msg(rs,"you can't wear that"); - return; - } - waste_time(rs); - obj->o_flags |= ISKNOW; - sp = inv_name(obj, TRUE); - cur_armor = obj; - if (!terse) - addmsg(rs,"you are now "); - msg(rs,"wearing %s", sp); -} - -/* - * take_off: - * Get the armor off of the players back - */ -void -take_off(struct rogue_state *rs) -{ - register THING *obj; - - if ((obj = cur_armor) == NULL) - { - after = FALSE; - if (terse) - msg(rs,"not wearing armor"); - else - msg(rs,"you aren't wearing any armor"); - return; - } - if (!dropcheck(rs,cur_armor)) - return; - cur_armor = NULL; - if (terse) - addmsg(rs,"was"); - else - addmsg(rs,"you used to be"); - msg(rs," wearing %c) %s", obj->o_packch, inv_name(obj, TRUE)); -} - -/* - * waste_time: - * Do nothing but let other things happen - */ -void -waste_time(struct rogue_state *rs) -{ - do_daemons(rs,BEFORE); - do_fuses(rs,BEFORE); - do_daemons(rs,AFTER); - do_fuses(rs,AFTER); -} diff --git a/src/cc/rogue/chase.c b/src/cc/rogue/chase.c deleted file mode 100644 index d5964936b..000000000 --- a/src/cc/rogue/chase.c +++ /dev/null @@ -1,544 +0,0 @@ -// Copyright (c) 2016-2023 The Hush developers -// Distributed under the GPLv3 software license, see the accompanying -// file COPYING or https://www.gnu.org/licenses/gpl-3.0.en.html -/* - * Code for one creature to chase another - * - * @(#)chase.c 4.57 (Berkeley) 02/05/99 - * - * Rogue: Exploring the Dungeons of Doom - * Copyright (C) 1980-1983, 1985, 1999 Michael Toy, Ken Arnold and Glenn Wichman - * All rights reserved. - * - * See the file LICENSE.TXT for full copyright and licensing information. - */ - -//#include -//#include -#include "rogue.h" - -#define DRAGONSHOT 5 /* one chance in DRAGONSHOT that a dragon will flame */ - -static coord ch_ret; /* Where chasing takes you */ - -/* - * runners: - * Make all the running monsters move. - */ -void -runners(struct rogue_state *rs,int arg) -{ - register THING *tp; - THING *next; - bool wastarget; - static coord orig_pos; - - for (tp = mlist; tp != NULL; tp = next) - { - /* remember this in case the monster's "next" is changed */ - next = next(tp); - if (!on(*tp, ISHELD) && on(*tp, ISRUN)) - { - orig_pos = tp->t_pos; - wastarget = on(*tp, ISTARGET); - if (move_monst(rs,tp) == -1) - continue; - if (on(*tp, ISFLY) && dist_cp(&hero, &tp->t_pos) >= 3) - move_monst(rs,tp); - if (wastarget && !ce(orig_pos, tp->t_pos)) - { - tp->t_flags &= ~ISTARGET; - to_death = FALSE; - } - } - } - if (has_hit) - { - endmsg(rs); - has_hit = FALSE; - } -} - -/* - * move_monst: - * Execute a single turn of running for a monster - */ -int -move_monst(struct rogue_state *rs,THING *tp) -{ - if (!on(*tp, ISSLOW) || tp->t_turn) - if (do_chase(rs,tp) == -1) - return(-1); - if (on(*tp, ISHASTE)) - if (do_chase(rs,tp) == -1) - return(-1); - tp->t_turn ^= TRUE; - return(0); -} - -/* - * relocate: - * Make the monster's new location be the specified one, updating - * all the relevant state. - */ -void -relocate(struct rogue_state *rs,THING *th, coord *new_loc) -{ - struct room *oroom; - - if (!ce(*new_loc, th->t_pos)) - { - mvaddch(th->t_pos.y, th->t_pos.x, th->t_oldch); - th->t_room = roomin(rs,new_loc); - set_oldch(th, new_loc); - oroom = th->t_room; - moat(th->t_pos.y, th->t_pos.x) = NULL; - - if (oroom != th->t_room) - th->t_dest = find_dest(rs,th); - th->t_pos = *new_loc; - moat(new_loc->y, new_loc->x) = th; - } - move(new_loc->y, new_loc->x); - if (see_monst(th)) - addch(th->t_disguise); - else if (on(player, SEEMONST)) - { - standout(); - addch(th->t_type); - standend(); - } -} - -/* - * do_chase: - * Make one thing chase another. - */ -int -do_chase(struct rogue_state *rs,THING *th) -{ - register coord *cp; - register struct room *rer, *ree; /* room of chaser, room of chasee */ - register int mindist = 32767, curdist; - register bool stoprun = FALSE; /* TRUE means we are there */ - register bool door; - register THING *obj; - static coord DEST; /* Temporary destination for chaser */ - - rer = th->t_room; /* Find room of chaser */ - if (on(*th, ISGREED) && rer->r_goldval == 0) - th->t_dest = &hero; /* If gold has been taken, run after hero */ - if (th->t_dest == &hero) /* Find room of chasee */ - ree = proom; - else - ree = roomin(rs,th->t_dest); - /* - * We don't count doors as inside rooms for this routine - */ - door = (chat(th->t_pos.y, th->t_pos.x) == DOOR); - /* - * If the object of our desire is in a different room, - * and we are not in a corridor, run to the door nearest to - * our goal. - */ -over: - if (rer != ree) - { - for (cp = rer->r_exit; cp < &rer->r_exit[rer->r_nexits]; cp++) - { - curdist = dist_cp(th->t_dest, cp); - if (curdist < mindist) - { - DEST = *cp; - mindist = curdist; - } - } - if (door) - { - rer = &passages[flat(th->t_pos.y, th->t_pos.x) & F_PNUM]; - door = FALSE; - goto over; - } - } - else - { - DEST = *th->t_dest; - /* - * For dragons check and see if (a) the hero is on a straight - * line from it, and (b) that it is within shooting distance, - * but outside of striking range. - */ - if (th->t_type == 'D' && (th->t_pos.y == hero.y || th->t_pos.x == hero.x - || abs(th->t_pos.y - hero.y) == abs(th->t_pos.x - hero.x)) - && dist_cp(&th->t_pos, &hero) <= BOLT_LENGTH * BOLT_LENGTH - && !on(*th, ISCANC) && rnd(DRAGONSHOT) == 0) - { - delta.y = sign(hero.y - th->t_pos.y); - delta.x = sign(hero.x - th->t_pos.x); - if (has_hit) - endmsg(rs); - fire_bolt(rs,&th->t_pos, &delta, "flame"); - running = FALSE; - count = 0; - quiet = 0; - if (to_death && !on(*th, ISTARGET)) - { - to_death = FALSE; - kamikaze = FALSE; - } - return(0); - } - } - /* - * This now contains what we want to run to this time - * so we run to it. If we hit it we either want to fight it - * or stop running - */ - if (!chase(th, &DEST)) - { - if (ce(DEST, hero)) - { - return( attack(rs,th) ); - } - else if (ce(DEST, *th->t_dest)) - { - for (obj = lvl_obj; obj != NULL; obj = next(obj)) - if (th->t_dest == &obj->o_pos) - { - detach(lvl_obj, obj); - attach(th->t_pack, obj); - chat(obj->o_pos.y, obj->o_pos.x) = - (th->t_room->r_flags & ISGONE) ? PASSAGE : FLOOR; - th->t_dest = find_dest(rs,th); - break; - } - if (th->t_type != 'F') - stoprun = TRUE; - } - } - else - { - if (th->t_type == 'F') - return(0); - } - relocate(rs,th, &ch_ret); - /* - * And stop running if need be - */ - if (stoprun && ce(th->t_pos, *(th->t_dest))) - th->t_flags &= ~ISRUN; - return(0); -} - -/* - * set_oldch: - * Set the oldch character for the monster - */ -void -set_oldch(THING *tp, coord *cp) -{ - char sch; - - if (ce(tp->t_pos, *cp)) - return; - - sch = tp->t_oldch; - tp->t_oldch = CCHAR( mvinch(cp->y,cp->x) ); - if (!on(player, ISBLIND)) - { - if ((sch == FLOOR || tp->t_oldch == FLOOR) && - (tp->t_room->r_flags & ISDARK)) - tp->t_oldch = ' '; - else if (dist_cp(cp, &hero) <= LAMPDIST && see_floor) - tp->t_oldch = chat(cp->y, cp->x); - } -} - -/* - * see_monst: - * Return TRUE if the hero can see the monster - */ -bool -see_monst(THING *mp) -{ - int y, x; - - if (on(player, ISBLIND)) - return FALSE; - if (on(*mp, ISINVIS) && !on(player, CANSEE)) - return FALSE; - y = mp->t_pos.y; - x = mp->t_pos.x; - if (dist(y, x, hero.y, hero.x) < LAMPDIST) - { - if (y != hero.y && x != hero.x && - !step_ok(chat(y, hero.x)) && !step_ok(chat(hero.y, x))) - return FALSE; - return TRUE; - } - if (mp->t_room != proom) - return FALSE; - return ((bool)!(mp->t_room->r_flags & ISDARK)); -} - -/* - * runto: - * Set a monster running after the hero. - */ -void -runto(struct rogue_state *rs,coord *runner) -{ - register THING *tp; - - /* - * If we couldn't find him, something is funny - */ -#ifdef MASTER - if ((tp = moat(runner->y, runner->x)) == NULL) - msg(rs,"couldn't find monster in runto at (%d,%d)", runner->y, runner->x); -#else - tp = moat(runner->y, runner->x); -#endif - /* - * Start the beastie running - */ - tp->t_flags |= ISRUN; - tp->t_flags &= ~ISHELD; - tp->t_dest = find_dest(rs,tp); -} - -/* - * chase: - * Find the spot for the chaser(er) to move closer to the - * chasee(ee). Returns TRUE if we want to keep on chasing later - * FALSE if we reach the goal. - */ -bool -chase(THING *tp, coord *ee) -{ - register THING *obj; - register int x, y; - register int curdist, thisdist; - register coord *er = &tp->t_pos; - register char ch; - register int plcnt = 1; - static coord tryp; - - /* - * If the thing is confused, let it move randomly. Invisible - * Stalkers are slightly confused all of the time, and bats are - * quite confused all the time - */ - if ((on(*tp, ISHUH) && rnd(5) != 0) || (tp->t_type == 'P' && rnd(5) == 0) - || (tp->t_type == 'B' && rnd(2) == 0)) - { - /* - * get a valid random move - */ - ch_ret = *rndmove(tp); - curdist = dist_cp(&ch_ret, ee); - /* - * Small chance that it will become un-confused - */ - if (rnd(20) == 0) - tp->t_flags &= ~ISHUH; - } - /* - * Otherwise, find the empty spot next to the chaser that is - * closest to the chasee. - */ - else - { - register int ey, ex; - /* - * This will eventually hold where we move to get closer - * If we can't find an empty spot, we stay where we are. - */ - curdist = dist_cp(er, ee); - ch_ret = *er; - - ey = er->y + 1; - if (ey >= NUMLINES - 1) - ey = NUMLINES - 2; - ex = er->x + 1; - if (ex >= NUMCOLS) - ex = NUMCOLS - 1; - - for (x = er->x - 1; x <= ex; x++) - { - if (x < 0) - continue; - tryp.x = x; - for (y = er->y - 1; y <= ey; y++) - { - tryp.y = y; - if (!diag_ok(er, &tryp)) - continue; - ch = winat(y, x); - if (step_ok(ch)) - { - /* - * If it is a scroll, it might be a scare monster scroll - * so we need to look it up to see what type it is. - */ - if (ch == SCROLL) - { - for (obj = lvl_obj; obj != NULL; obj = next(obj)) - { - if (y == obj->o_pos.y && x == obj->o_pos.x) - break; - } - if (obj != NULL && obj->o_which == S_SCARE) - continue; - } - /* - * It can also be a Xeroc, which we shouldn't step on - */ - if ((obj = moat(y, x)) != NULL && obj->t_type == 'X') - continue; - /* - * If we didn't find any scrolls at this place or it - * wasn't a scare scroll, then this place counts - */ - thisdist = dist(y, x, ee->y, ee->x); - if (thisdist < curdist) - { - plcnt = 1; - ch_ret = tryp; - curdist = thisdist; - } - else if (thisdist == curdist && rnd(++plcnt) == 0) - { - ch_ret = tryp; - curdist = thisdist; - } - } - } - } - } - return (bool)(curdist != 0 && !ce(ch_ret, hero)); -} - -/* - * roomin: - * Find what room some coordinates are in. NULL means they aren't - * in any room. - */ -struct room * -roomin(struct rogue_state *rs,coord *cp) -{ - register struct room *rp; - register char *fp; - - - fp = &flat(cp->y, cp->x); - if (*fp & F_PASS) - return &passages[*fp & F_PNUM]; - - for (rp = rooms; rp < &rooms[MAXROOMS]; rp++) - if (cp->x <= rp->r_pos.x + rp->r_max.x && rp->r_pos.x <= cp->x - && cp->y <= rp->r_pos.y + rp->r_max.y && rp->r_pos.y <= cp->y) - return rp; - - msg(rs,"in some bizarre place (%d, %d)", unc(*cp)); -#ifdef MASTER - abort(); - return NULL; -#else - return NULL; -#endif -} - -/* - * diag_ok: - * Check to see if the move is legal if it is diagonal - */ -bool -diag_ok(coord *sp, coord *ep) -{ - if (ep->x < 0 || ep->x >= NUMCOLS || ep->y <= 0 || ep->y >= NUMLINES - 1) - return FALSE; - if (ep->x == sp->x || ep->y == sp->y) - return TRUE; - return (bool)(step_ok(chat(ep->y, sp->x)) && step_ok(chat(sp->y, ep->x))); -} - -/* - * cansee: - * Returns true if the hero can see a certain coordinate. - */ -bool -cansee(struct rogue_state *rs,int y, int x) -{ - register struct room *rer; - static coord tp; - - if (on(player, ISBLIND)) - return FALSE; - if (dist(y, x, hero.y, hero.x) < LAMPDIST) - { - if (flat(y, x) & F_PASS) - if (y != hero.y && x != hero.x && - !step_ok(chat(y, hero.x)) && !step_ok(chat(hero.y, x))) - return FALSE; - return TRUE; - } - /* - * We can only see if the hero in the same room as - * the coordinate and the room is lit or if it is close. - */ - tp.y = y; - tp.x = x; - return (bool)((rer = roomin(rs,&tp)) == proom && !(rer->r_flags & ISDARK)); -} - -/* - * find_dest: - * find the proper destination for the monster - */ -coord * -find_dest(struct rogue_state *rs,THING *tp) -{ - register THING *obj; - register int prob; - - if ((prob = monsters[tp->t_type - 'A'].m_carry) <= 0 || tp->t_room == proom - || see_monst(tp)) - return &hero; - for (obj = lvl_obj; obj != NULL; obj = next(obj)) - { - if (obj->o_type == SCROLL && obj->o_which == S_SCARE) - continue; - if (roomin(rs,&obj->o_pos) == tp->t_room && rnd(100) < prob) - { - for (tp = mlist; tp != NULL; tp = next(tp)) - if (tp->t_dest == &obj->o_pos) - break; - if (tp == NULL) - return &obj->o_pos; - } - } - return &hero; -} - -/* - * dist: - * Calculate the "distance" between to points. Actually, - * this calculates d^2, not d, but that's good enough for - * our purposes, since it's only used comparitively. - */ -int -dist(int y1, int x1, int y2, int x2) -{ - return ((x2 - x1) * (x2 - x1) + (y2 - y1) * (y2 - y1)); -} - -/* - * dist_cp: - * Call dist() with appropriate arguments for coord pointers - */ -int -dist_cp(coord *c1, coord *c2) -{ - return dist(c1->y, c1->x, c2->y, c2->x); -} diff --git a/src/cc/rogue/command.c b/src/cc/rogue/command.c deleted file mode 100644 index e5c5adce9..000000000 --- a/src/cc/rogue/command.c +++ /dev/null @@ -1,847 +0,0 @@ -// Copyright (c) 2016-2023 The Hush developers -// Distributed under the GPLv3 software license, see the accompanying -// file COPYING or https://www.gnu.org/licenses/gpl-3.0.en.html -/* - * Read and execute the user commands - * - * @(#)command.c 4.73 (Berkeley) 08/06/83 - * - * Rogue: Exploring the Dungeons of Doom - * Copyright (C) 1980-1983, 1985, 1999 Michael Toy, Ken Arnold and Glenn Wichman - * All rights reserved. - * - * See the file LICENSE.TXT for full copyright and licensing information. - */ - -//#include -#include "rogue.h" - -/* - * command: - * Process the user commands - */ -void -command(struct rogue_state *rs) -{ - register char ch; - register int ntimes = 1; /* Number of player moves */ - char *fp; - THING *mp; - static char countch, direction, newcount = FALSE; - if (on(player, ISHASTE)) - ntimes++; - /* - * Let the daemons start up - */ - do_daemons(rs,BEFORE); - do_fuses(rs,BEFORE); - while (ntimes--) - { - if ( rs->replaydone != 0 ) - return; - again = FALSE; - if (has_hit) - { - endmsg(rs); - has_hit = FALSE; - } - /* - * these are illegal things for the player to be, so if any are - * set, someone's been poking in memeory - */ - if (on(player, ISSLOW|ISGREED|ISINVIS|ISREGEN|ISTARGET)) - exit(1); - - look(rs,TRUE); - if (!running) - door_stop = FALSE; - status(rs); - lastscore = purse; - move(hero.y, hero.x); - if ( rs->sleeptime != 0 ) - { - if (!((running || count) && jump)) - refresh(); /* Draw screen */ - } - take = 0; - after = TRUE; - /* - * Read command or continue run - */ -#ifdef MASTER - if (wizard) - noscore = TRUE; -#endif - if (!no_command) - { - if (running || to_death) - ch = runch; - else if (count) - ch = countch; - else - { - ch = readchar(rs); - move_on = FALSE; - if (mpos != 0) /* Erase message if its there */ - msg(rs,""); - } - } - else - ch = '.'; - if (no_command) - { - if (--no_command == 0) - { - player.t_flags |= ISRUN; - msg(rs,"you can move again"); - } - } - else - { - /* - * check for prefixes - */ - newcount = FALSE; - if (isdigit(ch)) - { - count = 0; - newcount = TRUE; - while (isdigit(ch)) - { - count = count * 10 + (ch - '0'); - if (count > 255) - count = 255; - ch = readchar(rs); - } - countch = ch; - /* - * turn off count for commands which don't make sense - * to repeat - */ - if ( rs->guiflag == 0 && rs->replaydone != 0 ) - ch = 'Q'; - switch (ch) - { - case CTRL('B'): case CTRL('H'): case CTRL('J'): - case CTRL('K'): case CTRL('L'): case CTRL('N'): - case CTRL('U'): case CTRL('Y'): - case '.': case 'a': case 'b': case 'h': case 'j': - case 'k': case 'l': case 'm': case 'n': case 'q': - case 'r': case 's': case 't': case 'u': case 'y': - case 'z': case 'B': case 'C': case 'H': case 'I': - case 'J': case 'K': case 'L': case 'N': case 'U': - case 'Y': -#ifdef MASTER - case CTRL('D'): case CTRL('A'): -#endif - break; - default: - count = 0; - } - } - /* - * execute a command - */ - if (count && !running) - count--; - if (ch != 'a' && ch != ESCAPE && !(running || count || to_death)) - { - l_last_comm = last_comm; - l_last_dir = last_dir; - l_last_pick = last_pick; - last_comm = ch; - last_dir = '\0'; - last_pick = NULL; - } -over: - switch (ch) - { - case ',': { - THING *obj = NULL; - int found = 0; - for (obj = lvl_obj; obj != NULL; obj = next(obj)) - { - if (obj->o_pos.y == hero.y && obj->o_pos.x == hero.x) - { - found=1; - break; - } - } - - if (found) { - if (levit_check(rs)) - ; - else - pick_up(rs,(char)obj->o_type); - } - else { - if (!terse) - addmsg(rs,"there is "); - addmsg(rs,"nothing here"); - if (!terse) - addmsg(rs," to pick up"); - endmsg(rs); - } - } - when '!': shell(rs); - when 'h': do_move(rs,0, -1); - when 'j': do_move(rs,1, 0); - when 'k': do_move(rs,-1, 0); - when 'l': do_move(rs,0, 1); - when 'y': do_move(rs,-1, -1); - when 'u': do_move(rs,-1, 1); - when 'b': do_move(rs,1, -1); - when 'n': do_move(rs,1, 1); - when 'H': do_run('h'); - when 'J': do_run('j'); - when 'K': do_run('k'); - when 'L': do_run('l'); - when 'Y': do_run('y'); - when 'U': do_run('u'); - when 'B': do_run('b'); - when 'N': do_run('n'); - when CTRL('H'): case CTRL('J'): case CTRL('K'): case CTRL('L'): - case CTRL('Y'): case CTRL('U'): case CTRL('B'): case CTRL('N'): - { - if (!on(player, ISBLIND)) - { - door_stop = TRUE; - firstmove = TRUE; - } - if (count && !newcount) - ch = direction; - else - { - ch += ('A' - CTRL('A')); - direction = ch; - } - goto over; - } - when 'F': - kamikaze = TRUE; - /* FALLTHROUGH */ - case 'f': - if (!get_dir(rs)) - { - after = FALSE; - break; - } - delta.y += hero.y; - delta.x += hero.x; - if ( ((mp = moat(delta.y, delta.x)) == NULL) - || ((!see_monst(mp)) && !on(player, SEEMONST))) - { - if (!terse) - addmsg(rs,"I see "); - msg(rs,"no monster there"); - after = FALSE; - } - else if (diag_ok(&hero, &delta)) - { - to_death = TRUE; - max_hit = 0; - mp->t_flags |= ISTARGET; - runch = ch = dir_ch; - goto over; - } - when 't': - if (!get_dir(rs)) - after = FALSE; - else - missile(rs,delta.y, delta.x); - when 'a': - if (last_comm == '\0') - { - msg(rs,"you haven't typed a command yet"); - after = FALSE; - } - else - { - ch = last_comm; - again = TRUE; - goto over; - } - case 'q': quaff(rs); - break; - when 'Q': - after = FALSE; - q_comm = TRUE; - if ( _quit() > 0 ) - { - if ( rs->guiflag != 0 ) - { - if (rs->needflush == 0 ) - rs->needflush = (uint32_t)time(NULL); - rogue_bailout(rs); - } else rs->replaydone = (uint32_t)time(NULL); - } - q_comm = FALSE; - return; - when 'i': after = FALSE; inventory(rs,pack, 0); - when 'I': after = FALSE; picky_inven(rs); - when 'd': drop(rs); - when 'r': read_scroll(rs); - when 'e': eat(rs); - when 'w': wield(rs); - when 'W': wear(rs); - when 'T': take_off(rs); - when 'P': ring_on(rs); - when 'R': ring_off(rs); - when 'o': option(rs); after = FALSE; - when 'c': call(rs); after = FALSE; - - when '>': after = FALSE; d_level(rs); - if ( rs->guiflag != 0 && rs->needflush == 0 ) - rs->needflush = (uint32_t)time(NULL); - - when '<': after = FALSE; u_level(rs); - if ( rs->guiflag != 0 && rs->needflush == 0 ) - rs->needflush = (uint32_t)time(NULL); - - when '?': after = FALSE; help(rs); - when '/': after = FALSE; identify(rs); - when 's': search(rs); - when 'z': - if (get_dir(rs)) - do_zap(rs); - else - after = FALSE; - when 'D': after = FALSE; discovered(rs); - when CTRL('P'): after = FALSE; msg(rs,huh); - when CTRL('R'): - after = FALSE; - clearok(curscr,TRUE); - wrefresh(curscr); - when 'v': - after = FALSE; - msg(rs,"version %s. (mctesq was here)", release); - when 'S': - after = FALSE; -#ifdef STANDALONE - save_game(rs); -#else - msg(rs,"Saving is disabled, use bailout rpc"); -#endif - when '.': ; /* Rest command */ - when ' ': after = FALSE; /* "Legal" illegal command */ - when '^': - after = FALSE; - if (get_dir(rs)) { - delta.y += hero.y; - delta.x += hero.x; - fp = &flat(delta.y, delta.x); - if (!terse) - addmsg(rs,"You have found "); - if (chat(delta.y, delta.x) != TRAP) - msg(rs,"no trap there"); - else if (on(player, ISHALU)) - msg(rs,(char *)tr_name[rnd(NTRAPS)]); - else { - msg(rs,(char *)tr_name[*fp & F_TMASK]); - *fp |= F_SEEN; - } - } -#ifdef MASTER - when '+': - after = FALSE; - if (wizard) - { - wizard = FALSE; - turn_see(rs,TRUE); - msg(rs,"not wizard any more"); - } - else - { - wizard = passwd(); - if (wizard) - { - noscore = TRUE; - turn_see(rs,FALSE); - msg(rs,"you are suddenly as smart as Ken Arnold in dungeon #%d", dnum); - } - else - msg(rs,"sorry"); - } -#endif - when ESCAPE: /* Escape */ - door_stop = FALSE; - count = 0; - after = FALSE; - again = FALSE; - when 'm': - move_on = TRUE; - if (!get_dir(rs)) - after = FALSE; - else - { - ch = dir_ch; - countch = dir_ch; - goto over; - } - when ')': current(rs,cur_weapon, "wielding", NULL); - when ']': current(rs,cur_armor, "wearing", NULL); - when '=': - current(rs,cur_ring[LEFT], "wearing", - terse ? (char *)"(L)" : (char *)"on left hand"); - current(rs,cur_ring[RIGHT], "wearing", - terse ? (char *)"(R)" : (char *)"on right hand"); - when '@': - stat_msg = TRUE; - status(rs); - stat_msg = FALSE; - after = FALSE; - otherwise: - after = FALSE; -#ifdef MASTER - if (wizard) switch (ch) - { - case '|': msg(rs,"@ %d,%d", hero.y, hero.x); - when 'C': create_obj(); - when '$': msg(rs,"inpack = %d", inpack); - when CTRL('G'): inventory(rs,lvl_obj, 0); - when CTRL('W'): whatis(rs,FALSE, 0); - when CTRL('D'): level++; new_level(); - when CTRL('A'): level--; new_level(); - when CTRL('F'): show_map(); - when CTRL('T'): teleport(); - when CTRL('E'): msg(rs,"food left: %d", food_left); - when CTRL('C'): add_pass(); - when CTRL('X'): turn_see(rs,on(player, SEEMONST)); - when CTRL('~'): - { - THING *item; - - if ((item = get_item(rs,"charge", STICK)) != NULL) - item->o_charges = 10000; - } - when CTRL('I'): - { - int i; - THING *obj; - - for (i = 0; i < 9; i++) - raise_level(rs); - /* - * Give him a sword (+1,+1) - */ - obj = new_item(); - init_weapon(obj, TWOSWORD); - obj->o_hplus = 1; - obj->o_dplus = 1; - add_pack(rs,obj, TRUE); - cur_weapon = obj; - /* - * And his suit of armor - */ - obj = new_item(); - obj->o_type = ARMOR; - obj->o_which = PLATE_MAIL; - obj->o_arm = -5; - obj->o_flags |= ISKNOW; - obj->o_count = 1; - obj->o_group = 0; - cur_armor = obj; - add_pack(rs,obj, TRUE); - } - when '*' : - pr_list(); - otherwise: - illcom(rs,ch); - } - else -#endif - illcom(rs,ch); - } - /* - * turn off flags if no longer needed - */ - if (!running) - door_stop = FALSE; - } -/* - * If he ran into something to take, let him pick it up. - */ - if (take != 0) - pick_up(rs,take); - if (!running) - door_stop = FALSE; - if (!after) - ntimes++; - } - do_daemons(rs,AFTER); - do_fuses(rs,AFTER); - if (ISRING(LEFT, R_SEARCH)) - search(rs); - else if (ISRING(LEFT, R_TELEPORT) && rnd(50) == 0) - teleport(rs); - if (ISRING(RIGHT, R_SEARCH)) - search(rs); - else if (ISRING(RIGHT, R_TELEPORT) && rnd(50) == 0) - teleport(rs); -} - -/* - * illcom: - * What to do with an illegal command - */ -void -illcom(struct rogue_state *rs,int ch) -{ - save_msg = FALSE; - count = 0; - msg(rs,"illegal command '%s'", unctrl(ch)); - save_msg = TRUE; -} - -/* - * search: - * player gropes about him to find hidden things. - */ -void -search(struct rogue_state *rs) -{ - register int y, x; - register char *fp; - register int ey, ex; - int probinc; - bool found; - - ey = hero.y + 1; - ex = hero.x + 1; - probinc = (on(player, ISHALU) ? 3 : 0); - probinc += (on(player, ISBLIND) ? 2 : 0); - found = FALSE; - for (y = hero.y - 1; y <= ey; y++) - for (x = hero.x - 1; x <= ex; x++) - { - if (y == hero.y && x == hero.x) - continue; - fp = &flat(y, x); - if (!(*fp & F_REAL)) - switch (chat(y, x)) - { - case '|': - case '-': - if (rnd(5 + probinc) != 0) - break; - chat(y, x) = DOOR; - msg(rs,"a secret door"); -foundone: - found = TRUE; - *fp |= F_REAL; - count = FALSE; - running = FALSE; - break; - case FLOOR: - if (rnd(2 + probinc) != 0) - break; - chat(y, x) = TRAP; - if (!terse) - addmsg(rs,"you found "); - if (on(player, ISHALU)) - msg(rs,(char *)tr_name[rnd(NTRAPS)]); - else { - msg(rs,(char *)tr_name[*fp & F_TMASK]); - *fp |= F_SEEN; - } - goto foundone; - break; - case ' ': - if (rnd(3 + probinc) != 0) - break; - chat(y, x) = PASSAGE; - goto foundone; - } - } - if (found) - look(rs,FALSE); -} - -/* - * help: - * Give single character help, or the whole mess if he wants it - */ -void -help(struct rogue_state *rs) -{ - register const struct h_list *strp; - register char helpch; - register int numprint, cnt; - msg(rs,"character you want help for (* for all): "); - helpch = readchar(rs); - mpos = 0; - /* - * If its not a *, print the right help string - * or an error if he typed a funny character. - */ - if (helpch != '*') - { - move(0, 0); - for (strp = helpstr; strp->h_desc != NULL; strp++) - if (strp->h_ch == helpch) - { - lower_msg = TRUE; - msg(rs,"%s%s", unctrl(strp->h_ch), strp->h_desc); - lower_msg = FALSE; - return; - } - msg(rs,"unknown character '%s'", unctrl(helpch)); - return; - } - /* - * Here we print help for everything. - * Then wait before we return to command mode - */ - numprint = 0; - for (strp = helpstr; strp->h_desc != NULL; strp++) - if (strp->h_print) - numprint++; - if (numprint & 01) /* round odd numbers up */ - numprint++; - numprint /= 2; - if (numprint > LINES - 1) - numprint = LINES - 1; - - wclear(hw); - cnt = 0; - for (strp = helpstr; strp->h_desc != NULL; strp++) - if (strp->h_print) - { - wmove(hw, cnt % numprint, cnt >= numprint ? COLS / 2 : 0); - if (strp->h_ch) - waddstr(hw, unctrl(strp->h_ch)); - waddstr(hw, strp->h_desc); - if (++cnt >= numprint * 2) - break; - } - wmove(hw, LINES - 1, 0); - waddstr(hw, "--Press space to continue--"); - wrefresh(hw); - wait_for(rs,' '); - clearok(stdscr, TRUE); -/* - refresh(); -*/ - msg(rs,""); - touchwin(stdscr); - wrefresh(stdscr); -} - -/* - * identify: - * Tell the player what a certain thing is. - */ -void -identify(struct rogue_state *rs) -{ - register int ch; - register const struct h_list *hp; - register char *str; - static const struct h_list ident_list[] = { - {'|', "wall of a room", FALSE}, - {'-', "wall of a room", FALSE}, - {GOLD, "gold", FALSE}, - {STAIRS, "a staircase", FALSE}, - {DOOR, "door", FALSE}, - {FLOOR, "room floor", FALSE}, - {PLAYER, "you", FALSE}, - {PASSAGE, "passage", FALSE}, - {TRAP, "trap", FALSE}, - {POTION, "potion", FALSE}, - {SCROLL, "scroll", FALSE}, - {FOOD, "food", FALSE}, - {WEAPON, "weapon", FALSE}, - {' ', "solid rock", FALSE}, - {ARMOR, "armor", FALSE}, - {AMULET, "the Amulet of Yendor", FALSE}, - {RING, "ring", FALSE}, - {STICK, "wand or staff", FALSE}, - {'\0'} - }; - - msg(rs,"what do you want identified? "); - ch = readchar(rs); - mpos = 0; - if (ch == ESCAPE) - { - msg(rs,""); - return; - } - if (isupper(ch)) - str = monsters[ch-'A'].m_name; - else - { - str = "unknown character"; - for (hp = ident_list; hp->h_ch != '\0'; hp++) - if (hp->h_ch == ch) - { - str = hp->h_desc; - break; - } - } - msg(rs,"'%s': %s", unctrl(ch), str); -} - -/* - * d_level: - * He wants to go down a level - */ -void -d_level(struct rogue_state *rs) -{ - if (levit_check(rs)) - return; - if (chat(hero.y, hero.x) != STAIRS) - msg(rs,"I see no way down"); - else - { - level++; - seenstairs = FALSE; - new_level(rs); - } -} - -/* - * u_level: - * He wants to go up a level - */ -void -u_level(struct rogue_state *rs) -{ - if (levit_check(rs)) - return; - if (chat(hero.y, hero.x) == STAIRS) - if (amulet) - { - level--; - if (level == 0) - total_winner(rs); - new_level(rs); - msg(rs,"you feel a wrenching sensation in your gut"); - } - else - msg(rs,"your way is magically blocked"); - else - msg(rs,"I see no way up"); -} - -/* - * levit_check: - * Check to see if she's levitating, and if she is, print an - * appropriate message. - */ -bool -levit_check(struct rogue_state *rs) -{ - if (!on(player, ISLEVIT)) - return FALSE; - msg(rs,"You can't. You're floating off the ground!"); - return TRUE; -} - -/* - * call: - * Allow a user to call a potion, scroll, or ring something - */ -void -call(struct rogue_state *rs) -{ - register THING *obj; - register const struct obj_info *op = NULL; - register char **guess; const char *elsewise = NULL; - register const bool *know; - - obj = get_item(rs,"call", CALLABLE); - /* - * Make certain that it is somethings that we want to wear - */ - if (obj == NULL) - return; - switch (obj->o_type) - { - case RING: - op = &ring_info[obj->o_which]; - elsewise = r_stones[obj->o_which]; - goto norm; - when POTION: - op = &pot_info[obj->o_which]; - elsewise = p_colors[obj->o_which]; - goto norm; - when SCROLL: - op = &scr_info[obj->o_which]; - elsewise = s_names[obj->o_which]; - goto norm; - when STICK: - op = &ws_info[obj->o_which]; - elsewise = ws_made[obj->o_which]; -norm: - know = &op->oi_know; - guess = (char **)&op->oi_guess; - if (*guess != NULL) - elsewise = *guess; - when FOOD: - msg(rs,"you can't call that anything"); - return; - otherwise: - guess = &obj->o_label; - know = NULL; - elsewise = obj->o_label; - } - if (know != NULL && *know) - { - msg(rs,"that has already been identified"); - return; - } - if (elsewise != NULL && elsewise == *guess) - { - if (!terse) - addmsg(rs,"Was "); - msg(rs,"called \"%s\"", elsewise); - } - if (terse) - msg(rs,"call it: "); - else - msg(rs,"what do you want to call it? "); - - if (elsewise == NULL) - strcpy(prbuf, ""); - else - strcpy(prbuf, elsewise); - if (get_str(rs,prbuf, stdscr) == NORM) - { - if (*guess != NULL) - free(*guess); - *guess = (char *)malloc((unsigned int) strlen(prbuf) + 1); - strcpy(*guess, prbuf); - } -} - -/* - * current: - * Print the current weapon/armor - */ -void -current(struct rogue_state *rs,THING *cur, char *how, char *where) -{ - after = FALSE; - if (cur != NULL) - { - if (!terse) - addmsg(rs,"you are %s (", how); - inv_describe = FALSE; - addmsg(rs,"%c) %s", cur->o_packch, inv_name(cur, TRUE)); - inv_describe = TRUE; - if (where) - addmsg(rs," %s", where); - endmsg(rs); - } - else - { - if (!terse) - addmsg(rs,"you are "); - addmsg(rs,"%s nothing", how); - if (where) - addmsg(rs," %s", where); - endmsg(rs); - } -} diff --git a/src/cc/rogue/config.guess b/src/cc/rogue/config.guess deleted file mode 100755 index 396482d6c..000000000 --- a/src/cc/rogue/config.guess +++ /dev/null @@ -1,1500 +0,0 @@ -#! /bin/sh -# Attempt to guess a canonical system name. -# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, -# 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, -# Inc. - -timestamp='2006-07-02' - -# This file is free software; you can redistribute it and/or modify it -# under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA -# 02110-1301, USA. -# -# As a special exception to the GNU General Public License, if you -# distribute this file as part of a program that contains a -# configuration script generated by Autoconf, you may include it under -# the same distribution terms that you use for the rest of that program. - - -# Originally written by Per Bothner . -# Please send patches to . Submit a context -# diff and a properly formatted ChangeLog entry. -# -# This script attempts to guess a canonical system name similar to -# config.sub. If it succeeds, it prints the system name on stdout, and -# exits with 0. Otherwise, it exits with 1. -# -# The plan is that this can be called by configure scripts if you -# don't specify an explicit build system type. - -me=`echo "$0" | sed -e 's,.*/,,'` - -usage="\ -Usage: $0 [OPTION] - -Output the configuration name of the system \`$me' is run on. - -Operation modes: - -h, --help print this help, then exit - -t, --time-stamp print date of last modification, then exit - -v, --version print version number, then exit - -Report bugs and patches to ." - -version="\ -GNU config.guess ($timestamp) - -Originally written by Per Bothner. -Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005 -Free Software Foundation, Inc. - -This is free software; see the source for copying conditions. There is NO -warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." - -help=" -Try \`$me --help' for more information." - -# Parse command line -while test $# -gt 0 ; do - case $1 in - --time-stamp | --time* | -t ) - echo "$timestamp" ; exit ;; - --version | -v ) - echo "$version" ; exit ;; - --help | --h* | -h ) - echo "$usage"; exit ;; - -- ) # Stop option processing - shift; break ;; - - ) # Use stdin as input. - break ;; - -* ) - echo "$me: invalid option $1$help" >&2 - exit 1 ;; - * ) - break ;; - esac -done - -if test $# != 0; then - echo "$me: too many arguments$help" >&2 - exit 1 -fi - -trap 'exit 1' 1 2 15 - -# CC_FOR_BUILD -- compiler used by this script. Note that the use of a -# compiler to aid in system detection is discouraged as it requires -# temporary files to be created and, as you can see below, it is a -# headache to deal with in a portable fashion. - -# Historically, `CC_FOR_BUILD' used to be named `HOST_CC'. We still -# use `HOST_CC' if defined, but it is deprecated. - -# Portable tmp directory creation inspired by the Autoconf team. - -set_cc_for_build=' -trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null) && exit \$exitcode" 0 ; -trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ; -: ${TMPDIR=/tmp} ; - { tmp=`(umask 077 && mktemp -d "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } || - { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } || - { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir $tmp) && echo "Warning: creating insecure temp directory" >&2 ; } || - { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } ; -dummy=$tmp/dummy ; -tmpfiles="$dummy.c $dummy.o $dummy.rel $dummy" ; -case $CC_FOR_BUILD,$HOST_CC,$CC in - ,,) echo "int x;" > $dummy.c ; - for c in cc gcc c89 c99 ; do - if ($c -c -o $dummy.o $dummy.c) >/dev/null 2>&1 ; then - CC_FOR_BUILD="$c"; break ; - fi ; - done ; - if test x"$CC_FOR_BUILD" = x ; then - CC_FOR_BUILD=no_compiler_found ; - fi - ;; - ,,*) CC_FOR_BUILD=$CC ;; - ,*,*) CC_FOR_BUILD=$HOST_CC ;; -esac ; set_cc_for_build= ;' - -# This is needed to find uname on a Pyramid OSx when run in the BSD universe. -# (ghazi@noc.rutgers.edu 1994-08-24) -if (test -f /.attbin/uname) >/dev/null 2>&1 ; then - PATH=$PATH:/.attbin ; export PATH -fi - -UNAME_MACHINE=`(uname -m) 2>/dev/null` || UNAME_MACHINE=unknown -UNAME_RELEASE=`(uname -r) 2>/dev/null` || UNAME_RELEASE=unknown -UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown -UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown - -# Note: order is significant - the case branches are not exclusive. - -case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in - *:NetBSD:*:*) - # NetBSD (nbsd) targets should (where applicable) match one or - # more of the tupples: *-*-netbsdelf*, *-*-netbsdaout*, - # *-*-netbsdecoff* and *-*-netbsd*. For targets that recently - # switched to ELF, *-*-netbsd* would select the old - # object file format. This provides both forward - # compatibility and a consistent mechanism for selecting the - # object file format. - # - # Note: NetBSD doesn't particularly care about the vendor - # portion of the name. We always set it to "unknown". - sysctl="sysctl -n hw.machine_arch" - UNAME_MACHINE_ARCH=`(/sbin/$sysctl 2>/dev/null || \ - /usr/sbin/$sysctl 2>/dev/null || echo unknown)` - case "${UNAME_MACHINE_ARCH}" in - armeb) machine=armeb-unknown ;; - arm*) machine=arm-unknown ;; - sh3el) machine=shl-unknown ;; - sh3eb) machine=sh-unknown ;; - *) machine=${UNAME_MACHINE_ARCH}-unknown ;; - esac - # The Operating System including object format, if it has switched - # to ELF recently, or will in the future. - case "${UNAME_MACHINE_ARCH}" in - arm*|i386|m68k|ns32k|sh3*|sparc|vax) - eval $set_cc_for_build - if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \ - | grep __ELF__ >/dev/null - then - # Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout). - # Return netbsd for either. FIX? - os=netbsd - else - os=netbsdelf - fi - ;; - *) - os=netbsd - ;; - esac - # The OS release - # Debian GNU/NetBSD machines have a different userland, and - # thus, need a distinct triplet. However, they do not need - # kernel version information, so it can be replaced with a - # suitable tag, in the style of linux-gnu. - case "${UNAME_VERSION}" in - Debian*) - release='-gnu' - ;; - *) - release=`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'` - ;; - esac - # Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM: - # contains redundant information, the shorter form: - # CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used. - echo "${machine}-${os}${release}" - exit ;; - *:OpenBSD:*:*) - UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'` - echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE} - exit ;; - *:ekkoBSD:*:*) - echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE} - exit ;; - *:SolidBSD:*:*) - echo ${UNAME_MACHINE}-unknown-solidbsd${UNAME_RELEASE} - exit ;; - macppc:MirBSD:*:*) - echo powerpc-unknown-mirbsd${UNAME_RELEASE} - exit ;; - *:MirBSD:*:*) - echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE} - exit ;; - alpha:OSF1:*:*) - case $UNAME_RELEASE in - *4.0) - UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'` - ;; - *5.*) - UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'` - ;; - esac - # According to Compaq, /usr/sbin/psrinfo has been available on - # OSF/1 and Tru64 systems produced since 1995. I hope that - # covers most systems running today. This code pipes the CPU - # types through head -n 1, so we only detect the type of CPU 0. - ALPHA_CPU_TYPE=`/usr/sbin/psrinfo -v | sed -n -e 's/^ The alpha \(.*\) processor.*$/\1/p' | head -n 1` - case "$ALPHA_CPU_TYPE" in - "EV4 (21064)") - UNAME_MACHINE="alpha" ;; - "EV4.5 (21064)") - UNAME_MACHINE="alpha" ;; - "LCA4 (21066/21068)") - UNAME_MACHINE="alpha" ;; - "EV5 (21164)") - UNAME_MACHINE="alphaev5" ;; - "EV5.6 (21164A)") - UNAME_MACHINE="alphaev56" ;; - "EV5.6 (21164PC)") - UNAME_MACHINE="alphapca56" ;; - "EV5.7 (21164PC)") - UNAME_MACHINE="alphapca57" ;; - "EV6 (21264)") - UNAME_MACHINE="alphaev6" ;; - "EV6.7 (21264A)") - UNAME_MACHINE="alphaev67" ;; - "EV6.8CB (21264C)") - UNAME_MACHINE="alphaev68" ;; - "EV6.8AL (21264B)") - UNAME_MACHINE="alphaev68" ;; - "EV6.8CX (21264D)") - UNAME_MACHINE="alphaev68" ;; - "EV6.9A (21264/EV69A)") - UNAME_MACHINE="alphaev69" ;; - "EV7 (21364)") - UNAME_MACHINE="alphaev7" ;; - "EV7.9 (21364A)") - UNAME_MACHINE="alphaev79" ;; - esac - # A Pn.n version is a patched version. - # A Vn.n version is a released version. - # A Tn.n version is a released field test version. - # A Xn.n version is an unreleased experimental baselevel. - # 1.2 uses "1.2" for uname -r. - echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` - exit ;; - Alpha\ *:Windows_NT*:*) - # How do we know it's Interix rather than the generic POSIX subsystem? - # Should we change UNAME_MACHINE based on the output of uname instead - # of the specific Alpha model? - echo alpha-pc-interix - exit ;; - 21064:Windows_NT:50:3) - echo alpha-dec-winnt3.5 - exit ;; - Amiga*:UNIX_System_V:4.0:*) - echo m68k-unknown-sysv4 - exit ;; - *:[Aa]miga[Oo][Ss]:*:*) - echo ${UNAME_MACHINE}-unknown-amigaos - exit ;; - *:[Mm]orph[Oo][Ss]:*:*) - echo ${UNAME_MACHINE}-unknown-morphos - exit ;; - *:OS/390:*:*) - echo i370-ibm-openedition - exit ;; - *:z/VM:*:*) - echo s390-ibm-zvmoe - exit ;; - *:OS400:*:*) - echo powerpc-ibm-os400 - exit ;; - arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*) - echo arm-acorn-riscix${UNAME_RELEASE} - exit ;; - arm:riscos:*:*|arm:RISCOS:*:*) - echo arm-unknown-riscos - exit ;; - SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*) - echo hppa1.1-hitachi-hiuxmpp - exit ;; - Pyramid*:OSx*:*:* | MIS*:OSx*:*:* | MIS*:SMP_DC-OSx*:*:*) - # akee@wpdis03.wpafb.af.mil (Earle F. Ake) contributed MIS and NILE. - if test "`(/bin/universe) 2>/dev/null`" = att ; then - echo pyramid-pyramid-sysv3 - else - echo pyramid-pyramid-bsd - fi - exit ;; - NILE*:*:*:dcosx) - echo pyramid-pyramid-svr4 - exit ;; - DRS?6000:unix:4.0:6*) - echo sparc-icl-nx6 - exit ;; - DRS?6000:UNIX_SV:4.2*:7* | DRS?6000:isis:4.2*:7*) - case `/usr/bin/uname -p` in - sparc) echo sparc-icl-nx7; exit ;; - esac ;; - sun4H:SunOS:5.*:*) - echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` - exit ;; - sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*) - echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` - exit ;; - i86pc:SunOS:5.*:*) - echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` - exit ;; - sun4*:SunOS:6*:*) - # According to config.sub, this is the proper way to canonicalize - # SunOS6. Hard to guess exactly what SunOS6 will be like, but - # it's likely to be more like Solaris than SunOS4. - echo sparc-sun-solaris3`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` - exit ;; - sun4*:SunOS:*:*) - case "`/usr/bin/arch -k`" in - Series*|S4*) - UNAME_RELEASE=`uname -v` - ;; - esac - # Japanese Language versions have a version number like `4.1.3-JL'. - echo sparc-sun-sunos`echo ${UNAME_RELEASE}|sed -e 's/-/_/'` - exit ;; - sun3*:SunOS:*:*) - echo m68k-sun-sunos${UNAME_RELEASE} - exit ;; - sun*:*:4.2BSD:*) - UNAME_RELEASE=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null` - test "x${UNAME_RELEASE}" = "x" && UNAME_RELEASE=3 - case "`/bin/arch`" in - sun3) - echo m68k-sun-sunos${UNAME_RELEASE} - ;; - sun4) - echo sparc-sun-sunos${UNAME_RELEASE} - ;; - esac - exit ;; - aushp:SunOS:*:*) - echo sparc-auspex-sunos${UNAME_RELEASE} - exit ;; - # The situation for MiNT is a little confusing. The machine name - # can be virtually everything (everything which is not - # "atarist" or "atariste" at least should have a processor - # > m68000). The system name ranges from "MiNT" over "FreeMiNT" - # to the lowercase version "mint" (or "freemint"). Finally - # the system name "TOS" denotes a system which is actually not - # MiNT. But MiNT is downward compatible to TOS, so this should - # be no problem. - atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*) - echo m68k-atari-mint${UNAME_RELEASE} - exit ;; - atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*) - echo m68k-atari-mint${UNAME_RELEASE} - exit ;; - *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*) - echo m68k-atari-mint${UNAME_RELEASE} - exit ;; - milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*) - echo m68k-milan-mint${UNAME_RELEASE} - exit ;; - hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*) - echo m68k-hades-mint${UNAME_RELEASE} - exit ;; - *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*) - echo m68k-unknown-mint${UNAME_RELEASE} - exit ;; - m68k:machten:*:*) - echo m68k-apple-machten${UNAME_RELEASE} - exit ;; - powerpc:machten:*:*) - echo powerpc-apple-machten${UNAME_RELEASE} - exit ;; - RISC*:Mach:*:*) - echo mips-dec-mach_bsd4.3 - exit ;; - RISC*:ULTRIX:*:*) - echo mips-dec-ultrix${UNAME_RELEASE} - exit ;; - VAX*:ULTRIX*:*:*) - echo vax-dec-ultrix${UNAME_RELEASE} - exit ;; - 2020:CLIX:*:* | 2430:CLIX:*:*) - echo clipper-intergraph-clix${UNAME_RELEASE} - exit ;; - mips:*:*:UMIPS | mips:*:*:RISCos) - eval $set_cc_for_build - sed 's/^ //' << EOF >$dummy.c -#ifdef __cplusplus -#include /* for printf() prototype */ - int main (int argc, char *argv[]) { -#else - int main (argc, argv) int argc; char *argv[]; { -#endif - #if defined (host_mips) && defined (MIPSEB) - #if defined (SYSTYPE_SYSV) - printf ("mips-mips-riscos%ssysv\n", argv[1]); exit (0); - #endif - #if defined (SYSTYPE_SVR4) - printf ("mips-mips-riscos%ssvr4\n", argv[1]); exit (0); - #endif - #if defined (SYSTYPE_BSD43) || defined(SYSTYPE_BSD) - printf ("mips-mips-riscos%sbsd\n", argv[1]); exit (0); - #endif - #endif - exit (-1); - } -EOF - $CC_FOR_BUILD -o $dummy $dummy.c && - dummyarg=`echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` && - SYSTEM_NAME=`$dummy $dummyarg` && - { echo "$SYSTEM_NAME"; exit; } - echo mips-mips-riscos${UNAME_RELEASE} - exit ;; - Motorola:PowerMAX_OS:*:*) - echo powerpc-motorola-powermax - exit ;; - Motorola:*:4.3:PL8-*) - echo powerpc-harris-powermax - exit ;; - Night_Hawk:*:*:PowerMAX_OS | Synergy:PowerMAX_OS:*:*) - echo powerpc-harris-powermax - exit ;; - Night_Hawk:Power_UNIX:*:*) - echo powerpc-harris-powerunix - exit ;; - m88k:CX/UX:7*:*) - echo m88k-harris-cxux7 - exit ;; - m88k:*:4*:R4*) - echo m88k-motorola-sysv4 - exit ;; - m88k:*:3*:R3*) - echo m88k-motorola-sysv3 - exit ;; - AViiON:dgux:*:*) - # DG/UX returns AViiON for all architectures - UNAME_PROCESSOR=`/usr/bin/uname -p` - if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110 ] - then - if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \ - [ ${TARGET_BINARY_INTERFACE}x = x ] - then - echo m88k-dg-dgux${UNAME_RELEASE} - else - echo m88k-dg-dguxbcs${UNAME_RELEASE} - fi - else - echo i586-dg-dgux${UNAME_RELEASE} - fi - exit ;; - M88*:DolphinOS:*:*) # DolphinOS (SVR3) - echo m88k-dolphin-sysv3 - exit ;; - M88*:*:R3*:*) - # Delta 88k system running SVR3 - echo m88k-motorola-sysv3 - exit ;; - XD88*:*:*:*) # Tektronix XD88 system running UTekV (SVR3) - echo m88k-tektronix-sysv3 - exit ;; - Tek43[0-9][0-9]:UTek:*:*) # Tektronix 4300 system running UTek (BSD) - echo m68k-tektronix-bsd - exit ;; - *:IRIX*:*:*) - echo mips-sgi-irix`echo ${UNAME_RELEASE}|sed -e 's/-/_/g'` - exit ;; - ????????:AIX?:[12].1:2) # AIX 2.2.1 or AIX 2.1.1 is RT/PC AIX. - echo romp-ibm-aix # uname -m gives an 8 hex-code CPU id - exit ;; # Note that: echo "'`uname -s`'" gives 'AIX ' - i*86:AIX:*:*) - echo i386-ibm-aix - exit ;; - ia64:AIX:*:*) - if [ -x /usr/bin/oslevel ] ; then - IBM_REV=`/usr/bin/oslevel` - else - IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE} - fi - echo ${UNAME_MACHINE}-ibm-aix${IBM_REV} - exit ;; - *:AIX:2:3) - if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then - eval $set_cc_for_build - sed 's/^ //' << EOF >$dummy.c - #include - - main() - { - if (!__power_pc()) - exit(1); - puts("powerpc-ibm-aix3.2.5"); - exit(0); - } -EOF - if $CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy` - then - echo "$SYSTEM_NAME" - else - echo rs6000-ibm-aix3.2.5 - fi - elif grep bos324 /usr/include/stdio.h >/dev/null 2>&1; then - echo rs6000-ibm-aix3.2.4 - else - echo rs6000-ibm-aix3.2 - fi - exit ;; - *:AIX:*:[45]) - IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'` - if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then - IBM_ARCH=rs6000 - else - IBM_ARCH=powerpc - fi - if [ -x /usr/bin/oslevel ] ; then - IBM_REV=`/usr/bin/oslevel` - else - IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE} - fi - echo ${IBM_ARCH}-ibm-aix${IBM_REV} - exit ;; - *:AIX:*:*) - echo rs6000-ibm-aix - exit ;; - ibmrt:4.4BSD:*|romp-ibm:BSD:*) - echo romp-ibm-bsd4.4 - exit ;; - ibmrt:*BSD:*|romp-ibm:BSD:*) # covers RT/PC BSD and - echo romp-ibm-bsd${UNAME_RELEASE} # 4.3 with uname added to - exit ;; # report: romp-ibm BSD 4.3 - *:BOSX:*:*) - echo rs6000-bull-bosx - exit ;; - DPX/2?00:B.O.S.:*:*) - echo m68k-bull-sysv3 - exit ;; - 9000/[34]??:4.3bsd:1.*:*) - echo m68k-hp-bsd - exit ;; - hp300:4.4BSD:*:* | 9000/[34]??:4.3bsd:2.*:*) - echo m68k-hp-bsd4.4 - exit ;; - 9000/[34678]??:HP-UX:*:*) - HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'` - case "${UNAME_MACHINE}" in - 9000/31? ) HP_ARCH=m68000 ;; - 9000/[34]?? ) HP_ARCH=m68k ;; - 9000/[678][0-9][0-9]) - if [ -x /usr/bin/getconf ]; then - sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null` - sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null` - case "${sc_cpu_version}" in - 523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0 - 528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1 - 532) # CPU_PA_RISC2_0 - case "${sc_kernel_bits}" in - 32) HP_ARCH="hppa2.0n" ;; - 64) HP_ARCH="hppa2.0w" ;; - '') HP_ARCH="hppa2.0" ;; # HP-UX 10.20 - esac ;; - esac - fi - if [ "${HP_ARCH}" = "" ]; then - eval $set_cc_for_build - sed 's/^ //' << EOF >$dummy.c - - #define _HPUX_SOURCE - #include - #include - - int main () - { - #if defined(_SC_KERNEL_BITS) - long bits = sysconf(_SC_KERNEL_BITS); - #endif - long cpu = sysconf (_SC_CPU_VERSION); - - switch (cpu) - { - case CPU_PA_RISC1_0: puts ("hppa1.0"); break; - case CPU_PA_RISC1_1: puts ("hppa1.1"); break; - case CPU_PA_RISC2_0: - #if defined(_SC_KERNEL_BITS) - switch (bits) - { - case 64: puts ("hppa2.0w"); break; - case 32: puts ("hppa2.0n"); break; - default: puts ("hppa2.0"); break; - } break; - #else /* !defined(_SC_KERNEL_BITS) */ - puts ("hppa2.0"); break; - #endif - default: puts ("hppa1.0"); break; - } - exit (0); - } -EOF - (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy` - test -z "$HP_ARCH" && HP_ARCH=hppa - fi ;; - esac - if [ ${HP_ARCH} = "hppa2.0w" ] - then - eval $set_cc_for_build - - # hppa2.0w-hp-hpux* has a 64-bit kernel and a compiler generating - # 32-bit code. hppa64-hp-hpux* has the same kernel and a compiler - # generating 64-bit code. GNU and HP use different nomenclature: - # - # $ CC_FOR_BUILD=cc ./config.guess - # => hppa2.0w-hp-hpux11.23 - # $ CC_FOR_BUILD="cc +DA2.0w" ./config.guess - # => hppa64-hp-hpux11.23 - - if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | - grep __LP64__ >/dev/null - then - HP_ARCH="hppa2.0w" - else - HP_ARCH="hppa64" - fi - fi - echo ${HP_ARCH}-hp-hpux${HPUX_REV} - exit ;; - ia64:HP-UX:*:*) - HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'` - echo ia64-hp-hpux${HPUX_REV} - exit ;; - 3050*:HI-UX:*:*) - eval $set_cc_for_build - sed 's/^ //' << EOF >$dummy.c - #include - int - main () - { - long cpu = sysconf (_SC_CPU_VERSION); - /* The order matters, because CPU_IS_HP_MC68K erroneously returns - true for CPU_PA_RISC1_0. CPU_IS_PA_RISC returns correct - results, however. */ - if (CPU_IS_PA_RISC (cpu)) - { - switch (cpu) - { - case CPU_PA_RISC1_0: puts ("hppa1.0-hitachi-hiuxwe2"); break; - case CPU_PA_RISC1_1: puts ("hppa1.1-hitachi-hiuxwe2"); break; - case CPU_PA_RISC2_0: puts ("hppa2.0-hitachi-hiuxwe2"); break; - default: puts ("hppa-hitachi-hiuxwe2"); break; - } - } - else if (CPU_IS_HP_MC68K (cpu)) - puts ("m68k-hitachi-hiuxwe2"); - else puts ("unknown-hitachi-hiuxwe2"); - exit (0); - } -EOF - $CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy` && - { echo "$SYSTEM_NAME"; exit; } - echo unknown-hitachi-hiuxwe2 - exit ;; - 9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:* ) - echo hppa1.1-hp-bsd - exit ;; - 9000/8??:4.3bsd:*:*) - echo hppa1.0-hp-bsd - exit ;; - *9??*:MPE/iX:*:* | *3000*:MPE/iX:*:*) - echo hppa1.0-hp-mpeix - exit ;; - hp7??:OSF1:*:* | hp8?[79]:OSF1:*:* ) - echo hppa1.1-hp-osf - exit ;; - hp8??:OSF1:*:*) - echo hppa1.0-hp-osf - exit ;; - i*86:OSF1:*:*) - if [ -x /usr/sbin/sysversion ] ; then - echo ${UNAME_MACHINE}-unknown-osf1mk - else - echo ${UNAME_MACHINE}-unknown-osf1 - fi - exit ;; - parisc*:Lites*:*:*) - echo hppa1.1-hp-lites - exit ;; - C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*) - echo c1-convex-bsd - exit ;; - C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*) - if getsysinfo -f scalar_acc - then echo c32-convex-bsd - else echo c2-convex-bsd - fi - exit ;; - C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*) - echo c34-convex-bsd - exit ;; - C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*) - echo c38-convex-bsd - exit ;; - C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*) - echo c4-convex-bsd - exit ;; - CRAY*Y-MP:*:*:*) - echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' - exit ;; - CRAY*[A-Z]90:*:*:*) - echo ${UNAME_MACHINE}-cray-unicos${UNAME_RELEASE} \ - | sed -e 's/CRAY.*\([A-Z]90\)/\1/' \ - -e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/ \ - -e 's/\.[^.]*$/.X/' - exit ;; - CRAY*TS:*:*:*) - echo t90-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' - exit ;; - CRAY*T3E:*:*:*) - echo alphaev5-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' - exit ;; - CRAY*SV1:*:*:*) - echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' - exit ;; - *:UNICOS/mp:*:*) - echo craynv-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' - exit ;; - F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*) - FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` - FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` - FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'` - echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" - exit ;; - 5000:UNIX_System_V:4.*:*) - FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` - FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'` - echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" - exit ;; - i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*) - echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE} - exit ;; - sparc*:BSD/OS:*:*) - echo sparc-unknown-bsdi${UNAME_RELEASE} - exit ;; - *:BSD/OS:*:*) - echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE} - exit ;; - *:FreeBSD:*:*) - case ${UNAME_MACHINE} in - pc98) - echo i386-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; - amd64) - echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; - *) - echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; - esac - exit ;; - i*:CYGWIN*:*) - echo ${UNAME_MACHINE}-pc-cygwin - exit ;; - i*:MINGW*:*) - echo ${UNAME_MACHINE}-pc-mingw32 - exit ;; - i*:windows32*:*) - # uname -m includes "-pc" on this system. - echo ${UNAME_MACHINE}-mingw32 - exit ;; - i*:PW*:*) - echo ${UNAME_MACHINE}-pc-pw32 - exit ;; - x86:Interix*:[3456]*) - echo i586-pc-interix${UNAME_RELEASE} - exit ;; - EM64T:Interix*:[3456]*) - echo x86_64-unknown-interix${UNAME_RELEASE} - exit ;; - [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*) - echo i${UNAME_MACHINE}-pc-mks - exit ;; - i*:Windows_NT*:* | Pentium*:Windows_NT*:*) - # How do we know it's Interix rather than the generic POSIX subsystem? - # It also conflicts with pre-2.0 versions of AT&T UWIN. Should we - # UNAME_MACHINE based on the output of uname instead of i386? - echo i586-pc-interix - exit ;; - i*:UWIN*:*) - echo ${UNAME_MACHINE}-pc-uwin - exit ;; - amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*) - echo x86_64-unknown-cygwin - exit ;; - p*:CYGWIN*:*) - echo powerpcle-unknown-cygwin - exit ;; - prep*:SunOS:5.*:*) - echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` - exit ;; - *:GNU:*:*) - # the GNU system - echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'` - exit ;; - *:GNU/*:*:*) - # other systems with GNU libc and userland - echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-gnu - exit ;; - i*86:Minix:*:*) - echo ${UNAME_MACHINE}-pc-minix - exit ;; - arm*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu - exit ;; - avr32*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu - exit ;; - cris:Linux:*:*) - echo cris-axis-linux-gnu - exit ;; - crisv32:Linux:*:*) - echo crisv32-axis-linux-gnu - exit ;; - frv:Linux:*:*) - echo frv-unknown-linux-gnu - exit ;; - ia64:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu - exit ;; - m32r*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu - exit ;; - m68*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu - exit ;; - mips:Linux:*:*) - eval $set_cc_for_build - sed 's/^ //' << EOF >$dummy.c - #undef CPU - #undef mips - #undef mipsel - #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL) - CPU=mipsel - #else - #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB) - CPU=mips - #else - CPU= - #endif - #endif -EOF - eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n ' - /^CPU/{ - s: ::g - p - }'`" - test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; } - ;; - mips64:Linux:*:*) - eval $set_cc_for_build - sed 's/^ //' << EOF >$dummy.c - #undef CPU - #undef mips64 - #undef mips64el - #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL) - CPU=mips64el - #else - #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB) - CPU=mips64 - #else - CPU= - #endif - #endif -EOF - eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n ' - /^CPU/{ - s: ::g - p - }'`" - test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; } - ;; - or32:Linux:*:*) - echo or32-unknown-linux-gnu - exit ;; - ppc:Linux:*:*) - echo powerpc-unknown-linux-gnu - exit ;; - ppc64:Linux:*:*) - echo powerpc64-unknown-linux-gnu - exit ;; - alpha:Linux:*:*) - case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in - EV5) UNAME_MACHINE=alphaev5 ;; - EV56) UNAME_MACHINE=alphaev56 ;; - PCA56) UNAME_MACHINE=alphapca56 ;; - PCA57) UNAME_MACHINE=alphapca56 ;; - EV6) UNAME_MACHINE=alphaev6 ;; - EV67) UNAME_MACHINE=alphaev67 ;; - EV68*) UNAME_MACHINE=alphaev68 ;; - esac - objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null - if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi - echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC} - exit ;; - parisc:Linux:*:* | hppa:Linux:*:*) - # Look for CPU level - case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in - PA7*) echo hppa1.1-unknown-linux-gnu ;; - PA8*) echo hppa2.0-unknown-linux-gnu ;; - *) echo hppa-unknown-linux-gnu ;; - esac - exit ;; - parisc64:Linux:*:* | hppa64:Linux:*:*) - echo hppa64-unknown-linux-gnu - exit ;; - s390:Linux:*:* | s390x:Linux:*:*) - echo ${UNAME_MACHINE}-ibm-linux - exit ;; - sh64*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu - exit ;; - sh*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu - exit ;; - sparc:Linux:*:* | sparc64:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu - exit ;; - vax:Linux:*:*) - echo ${UNAME_MACHINE}-dec-linux-gnu - exit ;; - x86_64:Linux:*:*) - echo x86_64-unknown-linux-gnu - exit ;; - i*86:Linux:*:*) - # The BFD linker knows what the default object file format is, so - # first see if it will tell us. cd to the root directory to prevent - # problems with other programs or directories called `ld' in the path. - # Set LC_ALL=C to ensure ld outputs messages in English. - ld_supported_targets=`cd /; LC_ALL=C ld --help 2>&1 \ - | sed -ne '/supported targets:/!d - s/[ ][ ]*/ /g - s/.*supported targets: *// - s/ .*// - p'` - case "$ld_supported_targets" in - elf32-i386) - TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu" - ;; - a.out-i386-linux) - echo "${UNAME_MACHINE}-pc-linux-gnuaout" - exit ;; - coff-i386) - echo "${UNAME_MACHINE}-pc-linux-gnucoff" - exit ;; - "") - # Either a pre-BFD a.out linker (linux-gnuoldld) or - # one that does not give us useful --help. - echo "${UNAME_MACHINE}-pc-linux-gnuoldld" - exit ;; - esac - # Determine whether the default compiler is a.out or elf - eval $set_cc_for_build - sed 's/^ //' << EOF >$dummy.c - #include - #ifdef __ELF__ - # ifdef __GLIBC__ - # if __GLIBC__ >= 2 - LIBC=gnu - # else - LIBC=gnulibc1 - # endif - # else - LIBC=gnulibc1 - # endif - #else - #if defined(__INTEL_COMPILER) || defined(__PGI) || defined(__SUNPRO_C) || defined(__SUNPRO_CC) - LIBC=gnu - #else - LIBC=gnuaout - #endif - #endif - #ifdef __dietlibc__ - LIBC=dietlibc - #endif -EOF - eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n ' - /^LIBC/{ - s: ::g - p - }'`" - test x"${LIBC}" != x && { - echo "${UNAME_MACHINE}-pc-linux-${LIBC}" - exit - } - test x"${TENTATIVE}" != x && { echo "${TENTATIVE}"; exit; } - ;; - i*86:DYNIX/ptx:4*:*) - # ptx 4.0 does uname -s correctly, with DYNIX/ptx in there. - # earlier versions are messed up and put the nodename in both - # sysname and nodename. - echo i386-sequent-sysv4 - exit ;; - i*86:UNIX_SV:4.2MP:2.*) - # Unixware is an offshoot of SVR4, but it has its own version - # number series starting with 2... - # I am not positive that other SVR4 systems won't match this, - # I just have to hope. -- rms. - # Use sysv4.2uw... so that sysv4* matches it. - echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION} - exit ;; - i*86:OS/2:*:*) - # If we were able to find `uname', then EMX Unix compatibility - # is probably installed. - echo ${UNAME_MACHINE}-pc-os2-emx - exit ;; - i*86:XTS-300:*:STOP) - echo ${UNAME_MACHINE}-unknown-stop - exit ;; - i*86:atheos:*:*) - echo ${UNAME_MACHINE}-unknown-atheos - exit ;; - i*86:syllable:*:*) - echo ${UNAME_MACHINE}-pc-syllable - exit ;; - i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*) - echo i386-unknown-lynxos${UNAME_RELEASE} - exit ;; - i*86:*DOS:*:*) - echo ${UNAME_MACHINE}-pc-msdosdjgpp - exit ;; - i*86:*:4.*:* | i*86:SYSTEM_V:4.*:*) - UNAME_REL=`echo ${UNAME_RELEASE} | sed 's/\/MP$//'` - if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then - echo ${UNAME_MACHINE}-univel-sysv${UNAME_REL} - else - echo ${UNAME_MACHINE}-pc-sysv${UNAME_REL} - fi - exit ;; - i*86:*:5:[678]*) - # UnixWare 7.x, OpenUNIX and OpenServer 6. - case `/bin/uname -X | grep "^Machine"` in - *486*) UNAME_MACHINE=i486 ;; - *Pentium) UNAME_MACHINE=i586 ;; - *Pent*|*Celeron) UNAME_MACHINE=i686 ;; - esac - echo ${UNAME_MACHINE}-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}${UNAME_VERSION} - exit ;; - i*86:*:3.2:*) - if test -f /usr/options/cb.name; then - UNAME_REL=`sed -n 's/.*Version //p' /dev/null >/dev/null ; then - UNAME_REL=`(/bin/uname -X|grep Release|sed -e 's/.*= //')` - (/bin/uname -X|grep i80486 >/dev/null) && UNAME_MACHINE=i486 - (/bin/uname -X|grep '^Machine.*Pentium' >/dev/null) \ - && UNAME_MACHINE=i586 - (/bin/uname -X|grep '^Machine.*Pent *II' >/dev/null) \ - && UNAME_MACHINE=i686 - (/bin/uname -X|grep '^Machine.*Pentium Pro' >/dev/null) \ - && UNAME_MACHINE=i686 - echo ${UNAME_MACHINE}-pc-sco$UNAME_REL - else - echo ${UNAME_MACHINE}-pc-sysv32 - fi - exit ;; - pc:*:*:*) - # Left here for compatibility: - # uname -m prints for DJGPP always 'pc', but it prints nothing about - # the processor, so we play safe by assuming i386. - echo i386-pc-msdosdjgpp - exit ;; - Intel:Mach:3*:*) - echo i386-pc-mach3 - exit ;; - paragon:*:*:*) - echo i860-intel-osf1 - exit ;; - i860:*:4.*:*) # i860-SVR4 - if grep Stardent /usr/include/sys/uadmin.h >/dev/null 2>&1 ; then - echo i860-stardent-sysv${UNAME_RELEASE} # Stardent Vistra i860-SVR4 - else # Add other i860-SVR4 vendors below as they are discovered. - echo i860-unknown-sysv${UNAME_RELEASE} # Unknown i860-SVR4 - fi - exit ;; - mini*:CTIX:SYS*5:*) - # "miniframe" - echo m68010-convergent-sysv - exit ;; - mc68k:UNIX:SYSTEM5:3.51m) - echo m68k-convergent-sysv - exit ;; - M680?0:D-NIX:5.3:*) - echo m68k-diab-dnix - exit ;; - M68*:*:R3V[5678]*:*) - test -r /sysV68 && { echo 'm68k-motorola-sysv'; exit; } ;; - 3[345]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0 | SHG2:*:4.0:3.0 | S7501*:*:4.0:3.0) - OS_REL='' - test -r /etc/.relid \ - && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid` - /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ - && { echo i486-ncr-sysv4.3${OS_REL}; exit; } - /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \ - && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;; - 3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*) - /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ - && { echo i486-ncr-sysv4; exit; } ;; - m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*) - echo m68k-unknown-lynxos${UNAME_RELEASE} - exit ;; - mc68030:UNIX_System_V:4.*:*) - echo m68k-atari-sysv4 - exit ;; - TSUNAMI:LynxOS:2.*:*) - echo sparc-unknown-lynxos${UNAME_RELEASE} - exit ;; - rs6000:LynxOS:2.*:*) - echo rs6000-unknown-lynxos${UNAME_RELEASE} - exit ;; - PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.0*:*) - echo powerpc-unknown-lynxos${UNAME_RELEASE} - exit ;; - SM[BE]S:UNIX_SV:*:*) - echo mips-dde-sysv${UNAME_RELEASE} - exit ;; - RM*:ReliantUNIX-*:*:*) - echo mips-sni-sysv4 - exit ;; - RM*:SINIX-*:*:*) - echo mips-sni-sysv4 - exit ;; - *:SINIX-*:*:*) - if uname -p 2>/dev/null >/dev/null ; then - UNAME_MACHINE=`(uname -p) 2>/dev/null` - echo ${UNAME_MACHINE}-sni-sysv4 - else - echo ns32k-sni-sysv - fi - exit ;; - PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort - # says - echo i586-unisys-sysv4 - exit ;; - *:UNIX_System_V:4*:FTX*) - # From Gerald Hewes . - # How about differentiating between stratus architectures? -djm - echo hppa1.1-stratus-sysv4 - exit ;; - *:*:*:FTX*) - # From seanf@swdc.stratus.com. - echo i860-stratus-sysv4 - exit ;; - i*86:VOS:*:*) - # From Paul.Green@stratus.com. - echo ${UNAME_MACHINE}-stratus-vos - exit ;; - *:VOS:*:*) - # From Paul.Green@stratus.com. - echo hppa1.1-stratus-vos - exit ;; - mc68*:A/UX:*:*) - echo m68k-apple-aux${UNAME_RELEASE} - exit ;; - news*:NEWS-OS:6*:*) - echo mips-sony-newsos6 - exit ;; - R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*) - if [ -d /usr/nec ]; then - echo mips-nec-sysv${UNAME_RELEASE} - else - echo mips-unknown-sysv${UNAME_RELEASE} - fi - exit ;; - BeBox:BeOS:*:*) # BeOS running on hardware made by Be, PPC only. - echo powerpc-be-beos - exit ;; - BeMac:BeOS:*:*) # BeOS running on Mac or Mac clone, PPC only. - echo powerpc-apple-beos - exit ;; - BePC:BeOS:*:*) # BeOS running on Intel PC compatible. - echo i586-pc-beos - exit ;; - SX-4:SUPER-UX:*:*) - echo sx4-nec-superux${UNAME_RELEASE} - exit ;; - SX-5:SUPER-UX:*:*) - echo sx5-nec-superux${UNAME_RELEASE} - exit ;; - SX-6:SUPER-UX:*:*) - echo sx6-nec-superux${UNAME_RELEASE} - exit ;; - Power*:Rhapsody:*:*) - echo powerpc-apple-rhapsody${UNAME_RELEASE} - exit ;; - *:Rhapsody:*:*) - echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE} - exit ;; - *:Darwin:*:*) - UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown - case $UNAME_PROCESSOR in - unknown) UNAME_PROCESSOR=powerpc ;; - esac - echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE} - exit ;; - *:procnto*:*:* | *:QNX:[0123456789]*:*) - UNAME_PROCESSOR=`uname -p` - if test "$UNAME_PROCESSOR" = "x86"; then - UNAME_PROCESSOR=i386 - UNAME_MACHINE=pc - fi - echo ${UNAME_PROCESSOR}-${UNAME_MACHINE}-nto-qnx${UNAME_RELEASE} - exit ;; - *:QNX:*:4*) - echo i386-pc-qnx - exit ;; - NSE-?:NONSTOP_KERNEL:*:*) - echo nse-tandem-nsk${UNAME_RELEASE} - exit ;; - NSR-?:NONSTOP_KERNEL:*:*) - echo nsr-tandem-nsk${UNAME_RELEASE} - exit ;; - *:NonStop-UX:*:*) - echo mips-compaq-nonstopux - exit ;; - BS2000:POSIX*:*:*) - echo bs2000-siemens-sysv - exit ;; - DS/*:UNIX_System_V:*:*) - echo ${UNAME_MACHINE}-${UNAME_SYSTEM}-${UNAME_RELEASE} - exit ;; - *:Plan9:*:*) - # "uname -m" is not consistent, so use $cputype instead. 386 - # is converted to i386 for consistency with other x86 - # operating systems. - if test "$cputype" = "386"; then - UNAME_MACHINE=i386 - else - UNAME_MACHINE="$cputype" - fi - echo ${UNAME_MACHINE}-unknown-plan9 - exit ;; - *:TOPS-10:*:*) - echo pdp10-unknown-tops10 - exit ;; - *:TENEX:*:*) - echo pdp10-unknown-tenex - exit ;; - KS10:TOPS-20:*:* | KL10:TOPS-20:*:* | TYPE4:TOPS-20:*:*) - echo pdp10-dec-tops20 - exit ;; - XKL-1:TOPS-20:*:* | TYPE5:TOPS-20:*:*) - echo pdp10-xkl-tops20 - exit ;; - *:TOPS-20:*:*) - echo pdp10-unknown-tops20 - exit ;; - *:ITS:*:*) - echo pdp10-unknown-its - exit ;; - SEI:*:*:SEIUX) - echo mips-sei-seiux${UNAME_RELEASE} - exit ;; - *:DragonFly:*:*) - echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` - exit ;; - *:*VMS:*:*) - UNAME_MACHINE=`(uname -p) 2>/dev/null` - case "${UNAME_MACHINE}" in - A*) echo alpha-dec-vms ; exit ;; - I*) echo ia64-dec-vms ; exit ;; - V*) echo vax-dec-vms ; exit ;; - esac ;; - *:XENIX:*:SysV) - echo i386-pc-xenix - exit ;; - i*86:skyos:*:*) - echo ${UNAME_MACHINE}-pc-skyos`echo ${UNAME_RELEASE}` | sed -e 's/ .*$//' - exit ;; - i*86:rdos:*:*) - echo ${UNAME_MACHINE}-pc-rdos - exit ;; -esac - -#echo '(No uname command or uname output not recognized.)' 1>&2 -#echo "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" 1>&2 - -eval $set_cc_for_build -cat >$dummy.c < -# include -#endif -main () -{ -#if defined (sony) -#if defined (MIPSEB) - /* BFD wants "bsd" instead of "newsos". Perhaps BFD should be changed, - I don't know.... */ - printf ("mips-sony-bsd\n"); exit (0); -#else -#include - printf ("m68k-sony-newsos%s\n", -#ifdef NEWSOS4 - "4" -#else - "" -#endif - ); exit (0); -#endif -#endif - -#if defined (__arm) && defined (__acorn) && defined (__unix) - printf ("arm-acorn-riscix\n"); exit (0); -#endif - -#if defined (hp300) && !defined (hpux) - printf ("m68k-hp-bsd\n"); exit (0); -#endif - -#if defined (NeXT) -#if !defined (__ARCHITECTURE__) -#define __ARCHITECTURE__ "m68k" -#endif - int version; - version=`(hostinfo | sed -n 's/.*NeXT Mach \([0-9]*\).*/\1/p') 2>/dev/null`; - if (version < 4) - printf ("%s-next-nextstep%d\n", __ARCHITECTURE__, version); - else - printf ("%s-next-openstep%d\n", __ARCHITECTURE__, version); - exit (0); -#endif - -#if defined (MULTIMAX) || defined (n16) -#if defined (UMAXV) - printf ("ns32k-encore-sysv\n"); exit (0); -#else -#if defined (CMU) - printf ("ns32k-encore-mach\n"); exit (0); -#else - printf ("ns32k-encore-bsd\n"); exit (0); -#endif -#endif -#endif - -#if defined (__386BSD__) - printf ("i386-pc-bsd\n"); exit (0); -#endif - -#if defined (sequent) -#if defined (i386) - printf ("i386-sequent-dynix\n"); exit (0); -#endif -#if defined (ns32000) - printf ("ns32k-sequent-dynix\n"); exit (0); -#endif -#endif - -#if defined (_SEQUENT_) - struct utsname un; - - uname(&un); - - if (strncmp(un.version, "V2", 2) == 0) { - printf ("i386-sequent-ptx2\n"); exit (0); - } - if (strncmp(un.version, "V1", 2) == 0) { /* XXX is V1 correct? */ - printf ("i386-sequent-ptx1\n"); exit (0); - } - printf ("i386-sequent-ptx\n"); exit (0); - -#endif - -#if defined (vax) -# if !defined (ultrix) -# include -# if defined (BSD) -# if BSD == 43 - printf ("vax-dec-bsd4.3\n"); exit (0); -# else -# if BSD == 199006 - printf ("vax-dec-bsd4.3reno\n"); exit (0); -# else - printf ("vax-dec-bsd\n"); exit (0); -# endif -# endif -# else - printf ("vax-dec-bsd\n"); exit (0); -# endif -# else - printf ("vax-dec-ultrix\n"); exit (0); -# endif -#endif - -#if defined (alliant) && defined (i860) - printf ("i860-alliant-bsd\n"); exit (0); -#endif - - exit (1); -} -EOF - -$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && SYSTEM_NAME=`$dummy` && - { echo "$SYSTEM_NAME"; exit; } - -# Apollos put the system type in the environment. - -test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit; } - -# Convex versions that predate uname can use getsysinfo(1) - -if [ -x /usr/convex/getsysinfo ] -then - case `getsysinfo -f cpu_type` in - c1*) - echo c1-convex-bsd - exit ;; - c2*) - if getsysinfo -f scalar_acc - then echo c32-convex-bsd - else echo c2-convex-bsd - fi - exit ;; - c34*) - echo c34-convex-bsd - exit ;; - c38*) - echo c38-convex-bsd - exit ;; - c4*) - echo c4-convex-bsd - exit ;; - esac -fi - -cat >&2 < in order to provide the needed -information to handle your system. - -config.guess timestamp = $timestamp - -uname -m = `(uname -m) 2>/dev/null || echo unknown` -uname -r = `(uname -r) 2>/dev/null || echo unknown` -uname -s = `(uname -s) 2>/dev/null || echo unknown` -uname -v = `(uname -v) 2>/dev/null || echo unknown` - -/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null` -/bin/uname -X = `(/bin/uname -X) 2>/dev/null` - -hostinfo = `(hostinfo) 2>/dev/null` -/bin/universe = `(/bin/universe) 2>/dev/null` -/usr/bin/arch -k = `(/usr/bin/arch -k) 2>/dev/null` -/bin/arch = `(/bin/arch) 2>/dev/null` -/usr/bin/oslevel = `(/usr/bin/oslevel) 2>/dev/null` -/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null` - -UNAME_MACHINE = ${UNAME_MACHINE} -UNAME_RELEASE = ${UNAME_RELEASE} -UNAME_SYSTEM = ${UNAME_SYSTEM} -UNAME_VERSION = ${UNAME_VERSION} -EOF - -exit 1 - -# Local variables: -# eval: (add-hook 'write-file-hooks 'time-stamp) -# time-stamp-start: "timestamp='" -# time-stamp-format: "%:y-%02m-%02d" -# time-stamp-end: "'" -# End: diff --git a/src/cc/rogue/config.h.in b/src/cc/rogue/config.h.in deleted file mode 100644 index 54f9b7cba..000000000 --- a/src/cc/rogue/config.h.in +++ /dev/null @@ -1,269 +0,0 @@ -/* config.h.in. Generated from configure.ac by autoheader. */ - -/* Define if scorefile is top scores, not top players */ -#undef ALLSCORES - -/* Define if checktime feature should be enabled */ -#undef CHECKTIME - -/* Define to group owner of setgid executable */ -#undef GROUPOWNER - -/* Define to 1 if you have the `alarm' function. */ -#undef HAVE_ALARM - -/* Define to 1 if you have the header file. */ -#undef HAVE_ARPA_INET_H - -/* Define to 1 if libcurses is requested */ -#undef HAVE_CURSES_H - -/* Define to 1 if you don't have `vprintf' but do have `_doprnt.' */ -#undef HAVE_DOPRNT - -/* Define to 1 if you have the `erasechar' function. */ -#undef HAVE_ERASECHAR - -/* Define if ncurses has ESCDELAY variable */ -#undef HAVE_ESCDELAY - -/* Define to 1 if you have the header file. */ -#undef HAVE_FCNTL_H - -/* Define to 1 if you have the `fork' function. */ -#undef HAVE_FORK - -/* Define to 1 if you have the `getgid' function. */ -#undef HAVE_GETGID - -/* Define to 1 if you have the `getloadavg' function. */ -#undef HAVE_GETLOADAVG - -/* Define to 1 if you have the `getpass' function. */ -#undef HAVE_GETPASS - -/* Define to 1 if you have the `getpwuid' function. */ -#undef HAVE_GETPWUID - -/* Define to 1 if you have the `getuid' function. */ -#undef HAVE_GETUID - -/* Define to 1 if you have the header file. */ -#undef HAVE_INTTYPES_H - -/* Define to 1 if you have the `killchar' function. */ -#undef HAVE_KILLCHAR - -/* Define to 1 if you have the header file. */ -#undef HAVE_LIMITS_H - -/* Define to 1 if you have the `loadav' function. */ -#undef HAVE_LOADAV - -/* Define to 1 if `lstat' has the bug that it succeeds when given the - zero-length file name argument. */ -#undef HAVE_LSTAT_EMPTY_STRING_BUG - -/* Define to 1 if you have the header file. */ -#undef HAVE_MEMORY_H - -/* Define to 1 if you have the `memset' function. */ -#undef HAVE_MEMSET - -/* Define to 1 if libncurses is requested */ -#undef HAVE_NCURSES_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_NCURSES_TERM_H - -/* Define to 1 if you have the `nlist' function. */ -#undef HAVE_NLIST - -/* Define to 1 if you have the header file. */ -#undef HAVE_NLIST_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_PROCESS_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_PWD_H - -/* Define to 1 if you have the `setenv' function. */ -#undef HAVE_SETENV - -/* Define to 1 if you have the `setgid' function. */ -#undef HAVE_SETGID - -/* Define to 1 if you have the `setregid' function. */ -#undef HAVE_SETREGID - -/* Define to 1 if you have the `setresgid' function. */ -#undef HAVE_SETRESGID - -/* Define to 1 if you have the `setresuid' function. */ -#undef HAVE_SETRESUID - -/* Define to 1 if you have the `setreuid' function. */ -#undef HAVE_SETREUID - -/* Define to 1 if you have the `setuid' function. */ -#undef HAVE_SETUID - -/* Define to 1 if you have the `spawnl' function. */ -#undef HAVE_SPAWNL - -/* Define to 1 if `stat' has the bug that it succeeds when given the - zero-length file name argument. */ -#undef HAVE_STAT_EMPTY_STRING_BUG - -/* Define to 1 if stdbool.h conforms to C99. */ -#undef HAVE_STDBOOL_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_STDINT_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_STDLIB_H - -/* Define to 1 if you have the `strchr' function. */ -#undef HAVE_STRCHR - -/* Define to 1 if you have the `strerror' function. */ -#undef HAVE_STRERROR - -/* Define to 1 if you have the header file. */ -#undef HAVE_STRINGS_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_STRING_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_SYS_IOCTL_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_SYS_STAT_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_SYS_TYPES_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_SYS_UTSNAME_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_TERMIOS_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_TERM_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_UNISTD_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_UTMP_H - -/* Define to 1 if you have the `vfork' function. */ -#undef HAVE_VFORK - -/* Define to 1 if you have the header file. */ -#undef HAVE_VFORK_H - -/* Define to 1 if you have the `vprintf' function. */ -#undef HAVE_VPRINTF - -/* Define to 1 if `fork' works. */ -#undef HAVE_WORKING_FORK - -/* Define to 1 if `vfork' works. */ -#undef HAVE_WORKING_VFORK - -/* Define to 1 if the system has the type `_Bool'. */ -#undef HAVE__BOOL - -/* Define to 1 if you have the `_spawnl' function. */ -#undef HAVE__SPAWNL - -/* define if we should use program's load average function instead of system - */ -#undef LOADAV - -/* Define to file to use for scoreboard lockfile */ -#undef LOCKFILE - -/* Define to 1 if `lstat' dereferences a symlink specified with a trailing - slash. */ -#undef LSTAT_FOLLOWS_SLASHED_SYMLINK - -/* Define to include wizard mode */ -#undef MASTER - -/* Define if maxusers feature should be enabled */ -#undef MAXLOAD - -/* Define if maxusers feature should be enabled */ -#undef MAXUSERS - -/* kernel file to pass to nlist() when reading load average (unlikely to work) - */ -#undef NAMELIST - -/* word for the number of scores to store in scoreboard */ -#undef NUMNAME - -/* number of scores to store in scoreboard */ -#undef NUMSCORES - -/* Define to the address where bug reports for this package should be sent. */ -#undef PACKAGE_BUGREPORT - -/* Define to the full name of this package. */ -#undef PACKAGE_NAME - -/* Define to the full name and version of this package. */ -#undef PACKAGE_STRING - -/* Define to the one symbol short name of this package. */ -#undef PACKAGE_TARNAME - -/* Define to the version of this package. */ -#undef PACKAGE_VERSION - -/* Define crypt(3) wizard mode password */ -#undef PASSWD - -/* Define as the return type of signal handlers (`int' or `void'). */ -#undef RETSIGTYPE - -/* Define to file to use for scoreboard */ -#undef SCOREFILE - -/* Define to 1 if you have the ANSI C header files. */ -#undef STDC_HEADERS - -/* Define to 1 if your declares `struct tm'. */ -#undef TM_IN_SYS_TIME - -/* define if we should use program's user counting function instead of - system's */ -#undef UCOUNT - -/* utmp like file to pass to ucount() when counting online users (unlikely to - work) */ -#undef UTMP - -/* Define to empty if `const' does not conform to ANSI C. */ -#undef const - -/* Define to `int' if doesn't define. */ -#undef gid_t - -/* Define to `int' if does not define. */ -#undef pid_t - -/* Define to `unsigned int' if does not define. */ -#undef size_t - -/* Define to `int' if doesn't define. */ -#undef uid_t - -/* Define as `fork' if `vfork' does not work. */ -#undef vfork diff --git a/src/cc/rogue/config.sub b/src/cc/rogue/config.sub deleted file mode 100755 index 387c18d1a..000000000 --- a/src/cc/rogue/config.sub +++ /dev/null @@ -1,1608 +0,0 @@ -#! /bin/sh -# Configuration validation subroutine script. -# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, -# 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, -# Inc. - -timestamp='2006-07-02' - -# This file is (in principle) common to ALL GNU software. -# The presence of a machine in this file suggests that SOME GNU software -# can handle that machine. It does not imply ALL GNU software can. -# -# This file is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA -# 02110-1301, USA. -# -# As a special exception to the GNU General Public License, if you -# distribute this file as part of a program that contains a -# configuration script generated by Autoconf, you may include it under -# the same distribution terms that you use for the rest of that program. - - -# Please send patches to . Submit a context -# diff and a properly formatted ChangeLog entry. -# -# Configuration subroutine to validate and canonicalize a configuration type. -# Supply the specified configuration type as an argument. -# If it is invalid, we print an error message on stderr and exit with code 1. -# Otherwise, we print the canonical config type on stdout and succeed. - -# This file is supposed to be the same for all GNU packages -# and recognize all the CPU types, system types and aliases -# that are meaningful with *any* GNU software. -# Each package is responsible for reporting which valid configurations -# it does not support. The user should be able to distinguish -# a failure to support a valid configuration from a meaningless -# configuration. - -# The goal of this file is to map all the various variations of a given -# machine specification into a single specification in the form: -# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM -# or in some cases, the newer four-part form: -# CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM -# It is wrong to echo any other type of specification. - -me=`echo "$0" | sed -e 's,.*/,,'` - -usage="\ -Usage: $0 [OPTION] CPU-MFR-OPSYS - $0 [OPTION] ALIAS - -Canonicalize a configuration name. - -Operation modes: - -h, --help print this help, then exit - -t, --time-stamp print date of last modification, then exit - -v, --version print version number, then exit - -Report bugs and patches to ." - -version="\ -GNU config.sub ($timestamp) - -Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005 -Free Software Foundation, Inc. - -This is free software; see the source for copying conditions. There is NO -warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." - -help=" -Try \`$me --help' for more information." - -# Parse command line -while test $# -gt 0 ; do - case $1 in - --time-stamp | --time* | -t ) - echo "$timestamp" ; exit ;; - --version | -v ) - echo "$version" ; exit ;; - --help | --h* | -h ) - echo "$usage"; exit ;; - -- ) # Stop option processing - shift; break ;; - - ) # Use stdin as input. - break ;; - -* ) - echo "$me: invalid option $1$help" - exit 1 ;; - - *local*) - # First pass through any local machine types. - echo $1 - exit ;; - - * ) - break ;; - esac -done - -case $# in - 0) echo "$me: missing argument$help" >&2 - exit 1;; - 1) ;; - *) echo "$me: too many arguments$help" >&2 - exit 1;; -esac - -# Separate what the user gave into CPU-COMPANY and OS or KERNEL-OS (if any). -# Here we must recognize all the valid KERNEL-OS combinations. -maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'` -case $maybe_os in - nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \ - uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \ - storm-chaos* | os2-emx* | rtmk-nova*) - os=-$maybe_os - basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'` - ;; - *) - basic_machine=`echo $1 | sed 's/-[^-]*$//'` - if [ $basic_machine != $1 ] - then os=`echo $1 | sed 's/.*-/-/'` - else os=; fi - ;; -esac - -### Let's recognize common machines as not being operating systems so -### that things like config.sub decstation-3100 work. We also -### recognize some manufacturers as not being operating systems, so we -### can provide default operating systems below. -case $os in - -sun*os*) - # Prevent following clause from handling this invalid input. - ;; - -dec* | -mips* | -sequent* | -encore* | -pc532* | -sgi* | -sony* | \ - -att* | -7300* | -3300* | -delta* | -motorola* | -sun[234]* | \ - -unicom* | -ibm* | -next | -hp | -isi* | -apollo | -altos* | \ - -convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\ - -c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \ - -harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \ - -apple | -axis | -knuth | -cray) - os= - basic_machine=$1 - ;; - -sim | -cisco | -oki | -wec | -winbond) - os= - basic_machine=$1 - ;; - -scout) - ;; - -wrs) - os=-vxworks - basic_machine=$1 - ;; - -chorusos*) - os=-chorusos - basic_machine=$1 - ;; - -chorusrdb) - os=-chorusrdb - basic_machine=$1 - ;; - -hiux*) - os=-hiuxwe2 - ;; - -sco6) - os=-sco5v6 - basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` - ;; - -sco5) - os=-sco3.2v5 - basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` - ;; - -sco4) - os=-sco3.2v4 - basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` - ;; - -sco3.2.[4-9]*) - os=`echo $os | sed -e 's/sco3.2./sco3.2v/'` - basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` - ;; - -sco3.2v[4-9]*) - # Don't forget version if it is 3.2v4 or newer. - basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` - ;; - -sco5v6*) - # Don't forget version if it is 3.2v4 or newer. - basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` - ;; - -sco*) - os=-sco3.2v2 - basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` - ;; - -udk*) - basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` - ;; - -isc) - os=-isc2.2 - basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` - ;; - -clix*) - basic_machine=clipper-intergraph - ;; - -isc*) - basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` - ;; - -lynx*) - os=-lynxos - ;; - -ptx*) - basic_machine=`echo $1 | sed -e 's/86-.*/86-sequent/'` - ;; - -windowsnt*) - os=`echo $os | sed -e 's/windowsnt/winnt/'` - ;; - -psos*) - os=-psos - ;; - -mint | -mint[0-9]*) - basic_machine=m68k-atari - os=-mint - ;; -esac - -# Decode aliases for certain CPU-COMPANY combinations. -case $basic_machine in - # Recognize the basic CPU types without company name. - # Some are omitted here because they have special meanings below. - 1750a | 580 \ - | a29k \ - | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \ - | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \ - | am33_2.0 \ - | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \ - | bfin \ - | c4x | clipper \ - | d10v | d30v | dlx | dsp16xx \ - | fr30 | frv \ - | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \ - | i370 | i860 | i960 | ia64 \ - | ip2k | iq2000 \ - | m32c | m32r | m32rle | m68000 | m68k | m88k \ - | maxq | mb | microblaze | mcore \ - | mips | mipsbe | mipseb | mipsel | mipsle \ - | mips16 \ - | mips64 | mips64el \ - | mips64vr | mips64vrel \ - | mips64orion | mips64orionel \ - | mips64vr4100 | mips64vr4100el \ - | mips64vr4300 | mips64vr4300el \ - | mips64vr5000 | mips64vr5000el \ - | mips64vr5900 | mips64vr5900el \ - | mipsisa32 | mipsisa32el \ - | mipsisa32r2 | mipsisa32r2el \ - | mipsisa64 | mipsisa64el \ - | mipsisa64r2 | mipsisa64r2el \ - | mipsisa64sb1 | mipsisa64sb1el \ - | mipsisa64sr71k | mipsisa64sr71kel \ - | mipstx39 | mipstx39el \ - | mn10200 | mn10300 \ - | mt \ - | msp430 \ - | nios | nios2 \ - | ns16k | ns32k \ - | or32 \ - | pdp10 | pdp11 | pj | pjl \ - | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \ - | pyramid \ - | sh | sh[1234] | sh[24]a | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \ - | sh64 | sh64le \ - | sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \ - | sparcv8 | sparcv9 | sparcv9b | sparcv9v \ - | spu | strongarm \ - | tahoe | thumb | tic4x | tic80 | tron \ - | v850 | v850e \ - | we32k \ - | x86 | xscale | xscalee[bl] | xstormy16 | xtensa \ - | z8k) - basic_machine=$basic_machine-unknown - ;; - m6811 | m68hc11 | m6812 | m68hc12) - # Motorola 68HC11/12. - basic_machine=$basic_machine-unknown - os=-none - ;; - m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65 | z8k) - ;; - ms1) - basic_machine=mt-unknown - ;; - - # We use `pc' rather than `unknown' - # because (1) that's what they normally are, and - # (2) the word "unknown" tends to confuse beginning users. - i*86 | x86_64) - basic_machine=$basic_machine-pc - ;; - # Object if more than one company name word. - *-*-*) - echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2 - exit 1 - ;; - # Recognize the basic CPU types with company name. - 580-* \ - | a29k-* \ - | alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \ - | alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \ - | alphapca5[67]-* | alpha64pca5[67]-* | arc-* \ - | arm-* | armbe-* | armle-* | armeb-* | armv*-* \ - | avr-* | avr32-* \ - | bfin-* | bs2000-* \ - | c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \ - | clipper-* | craynv-* | cydra-* \ - | d10v-* | d30v-* | dlx-* \ - | elxsi-* \ - | f30[01]-* | f700-* | fr30-* | frv-* | fx80-* \ - | h8300-* | h8500-* \ - | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \ - | i*86-* | i860-* | i960-* | ia64-* \ - | ip2k-* | iq2000-* \ - | m32c-* | m32r-* | m32rle-* \ - | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \ - | m88110-* | m88k-* | maxq-* | mcore-* \ - | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \ - | mips16-* \ - | mips64-* | mips64el-* \ - | mips64vr-* | mips64vrel-* \ - | mips64orion-* | mips64orionel-* \ - | mips64vr4100-* | mips64vr4100el-* \ - | mips64vr4300-* | mips64vr4300el-* \ - | mips64vr5000-* | mips64vr5000el-* \ - | mips64vr5900-* | mips64vr5900el-* \ - | mipsisa32-* | mipsisa32el-* \ - | mipsisa32r2-* | mipsisa32r2el-* \ - | mipsisa64-* | mipsisa64el-* \ - | mipsisa64r2-* | mipsisa64r2el-* \ - | mipsisa64sb1-* | mipsisa64sb1el-* \ - | mipsisa64sr71k-* | mipsisa64sr71kel-* \ - | mipstx39-* | mipstx39el-* \ - | mmix-* \ - | mt-* \ - | msp430-* \ - | nios-* | nios2-* \ - | none-* | np1-* | ns16k-* | ns32k-* \ - | orion-* \ - | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \ - | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \ - | pyramid-* \ - | romp-* | rs6000-* \ - | sh-* | sh[1234]-* | sh[24]a-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \ - | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \ - | sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \ - | sparclite-* \ - | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \ - | tahoe-* | thumb-* \ - | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \ - | tron-* \ - | v850-* | v850e-* | vax-* \ - | we32k-* \ - | x86-* | x86_64-* | xps100-* | xscale-* | xscalee[bl]-* \ - | xstormy16-* | xtensa-* \ - | ymp-* \ - | z8k-*) - ;; - # Recognize the various machine names and aliases which stand - # for a CPU type and a company and sometimes even an OS. - 386bsd) - basic_machine=i386-unknown - os=-bsd - ;; - 3b1 | 7300 | 7300-att | att-7300 | pc7300 | safari | unixpc) - basic_machine=m68000-att - ;; - 3b*) - basic_machine=we32k-att - ;; - a29khif) - basic_machine=a29k-amd - os=-udi - ;; - abacus) - basic_machine=abacus-unknown - ;; - adobe68k) - basic_machine=m68010-adobe - os=-scout - ;; - alliant | fx80) - basic_machine=fx80-alliant - ;; - altos | altos3068) - basic_machine=m68k-altos - ;; - am29k) - basic_machine=a29k-none - os=-bsd - ;; - amd64) - basic_machine=x86_64-pc - ;; - amd64-*) - basic_machine=x86_64-`echo $basic_machine | sed 's/^[^-]*-//'` - ;; - amdahl) - basic_machine=580-amdahl - os=-sysv - ;; - amiga | amiga-*) - basic_machine=m68k-unknown - ;; - amigaos | amigados) - basic_machine=m68k-unknown - os=-amigaos - ;; - amigaunix | amix) - basic_machine=m68k-unknown - os=-sysv4 - ;; - apollo68) - basic_machine=m68k-apollo - os=-sysv - ;; - apollo68bsd) - basic_machine=m68k-apollo - os=-bsd - ;; - aux) - basic_machine=m68k-apple - os=-aux - ;; - balance) - basic_machine=ns32k-sequent - os=-dynix - ;; - c90) - basic_machine=c90-cray - os=-unicos - ;; - convex-c1) - basic_machine=c1-convex - os=-bsd - ;; - convex-c2) - basic_machine=c2-convex - os=-bsd - ;; - convex-c32) - basic_machine=c32-convex - os=-bsd - ;; - convex-c34) - basic_machine=c34-convex - os=-bsd - ;; - convex-c38) - basic_machine=c38-convex - os=-bsd - ;; - cray | j90) - basic_machine=j90-cray - os=-unicos - ;; - craynv) - basic_machine=craynv-cray - os=-unicosmp - ;; - cr16c) - basic_machine=cr16c-unknown - os=-elf - ;; - crds | unos) - basic_machine=m68k-crds - ;; - crisv32 | crisv32-* | etraxfs*) - basic_machine=crisv32-axis - ;; - cris | cris-* | etrax*) - basic_machine=cris-axis - ;; - crx) - basic_machine=crx-unknown - os=-elf - ;; - da30 | da30-*) - basic_machine=m68k-da30 - ;; - decstation | decstation-3100 | pmax | pmax-* | pmin | dec3100 | decstatn) - basic_machine=mips-dec - ;; - decsystem10* | dec10*) - basic_machine=pdp10-dec - os=-tops10 - ;; - decsystem20* | dec20*) - basic_machine=pdp10-dec - os=-tops20 - ;; - delta | 3300 | motorola-3300 | motorola-delta \ - | 3300-motorola | delta-motorola) - basic_machine=m68k-motorola - ;; - delta88) - basic_machine=m88k-motorola - os=-sysv3 - ;; - djgpp) - basic_machine=i586-pc - os=-msdosdjgpp - ;; - dpx20 | dpx20-*) - basic_machine=rs6000-bull - os=-bosx - ;; - dpx2* | dpx2*-bull) - basic_machine=m68k-bull - os=-sysv3 - ;; - ebmon29k) - basic_machine=a29k-amd - os=-ebmon - ;; - elxsi) - basic_machine=elxsi-elxsi - os=-bsd - ;; - encore | umax | mmax) - basic_machine=ns32k-encore - ;; - es1800 | OSE68k | ose68k | ose | OSE) - basic_machine=m68k-ericsson - os=-ose - ;; - fx2800) - basic_machine=i860-alliant - ;; - genix) - basic_machine=ns32k-ns - ;; - gmicro) - basic_machine=tron-gmicro - os=-sysv - ;; - go32) - basic_machine=i386-pc - os=-go32 - ;; - h3050r* | hiux*) - basic_machine=hppa1.1-hitachi - os=-hiuxwe2 - ;; - h8300hms) - basic_machine=h8300-hitachi - os=-hms - ;; - h8300xray) - basic_machine=h8300-hitachi - os=-xray - ;; - h8500hms) - basic_machine=h8500-hitachi - os=-hms - ;; - harris) - basic_machine=m88k-harris - os=-sysv3 - ;; - hp300-*) - basic_machine=m68k-hp - ;; - hp300bsd) - basic_machine=m68k-hp - os=-bsd - ;; - hp300hpux) - basic_machine=m68k-hp - os=-hpux - ;; - hp3k9[0-9][0-9] | hp9[0-9][0-9]) - basic_machine=hppa1.0-hp - ;; - hp9k2[0-9][0-9] | hp9k31[0-9]) - basic_machine=m68000-hp - ;; - hp9k3[2-9][0-9]) - basic_machine=m68k-hp - ;; - hp9k6[0-9][0-9] | hp6[0-9][0-9]) - basic_machine=hppa1.0-hp - ;; - hp9k7[0-79][0-9] | hp7[0-79][0-9]) - basic_machine=hppa1.1-hp - ;; - hp9k78[0-9] | hp78[0-9]) - # FIXME: really hppa2.0-hp - basic_machine=hppa1.1-hp - ;; - hp9k8[67]1 | hp8[67]1 | hp9k80[24] | hp80[24] | hp9k8[78]9 | hp8[78]9 | hp9k893 | hp893) - # FIXME: really hppa2.0-hp - basic_machine=hppa1.1-hp - ;; - hp9k8[0-9][13679] | hp8[0-9][13679]) - basic_machine=hppa1.1-hp - ;; - hp9k8[0-9][0-9] | hp8[0-9][0-9]) - basic_machine=hppa1.0-hp - ;; - hppa-next) - os=-nextstep3 - ;; - hppaosf) - basic_machine=hppa1.1-hp - os=-osf - ;; - hppro) - basic_machine=hppa1.1-hp - os=-proelf - ;; - i370-ibm* | ibm*) - basic_machine=i370-ibm - ;; -# I'm not sure what "Sysv32" means. Should this be sysv3.2? - i*86v32) - basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'` - os=-sysv32 - ;; - i*86v4*) - basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'` - os=-sysv4 - ;; - i*86v) - basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'` - os=-sysv - ;; - i*86sol2) - basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'` - os=-solaris2 - ;; - i386mach) - basic_machine=i386-mach - os=-mach - ;; - i386-vsta | vsta) - basic_machine=i386-unknown - os=-vsta - ;; - iris | iris4d) - basic_machine=mips-sgi - case $os in - -irix*) - ;; - *) - os=-irix4 - ;; - esac - ;; - isi68 | isi) - basic_machine=m68k-isi - os=-sysv - ;; - m88k-omron*) - basic_machine=m88k-omron - ;; - magnum | m3230) - basic_machine=mips-mips - os=-sysv - ;; - merlin) - basic_machine=ns32k-utek - os=-sysv - ;; - mingw32) - basic_machine=i386-pc - os=-mingw32 - ;; - miniframe) - basic_machine=m68000-convergent - ;; - *mint | -mint[0-9]* | *MiNT | *MiNT[0-9]*) - basic_machine=m68k-atari - os=-mint - ;; - mips3*-*) - basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'` - ;; - mips3*) - basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`-unknown - ;; - monitor) - basic_machine=m68k-rom68k - os=-coff - ;; - morphos) - basic_machine=powerpc-unknown - os=-morphos - ;; - msdos) - basic_machine=i386-pc - os=-msdos - ;; - ms1-*) - basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'` - ;; - mvs) - basic_machine=i370-ibm - os=-mvs - ;; - ncr3000) - basic_machine=i486-ncr - os=-sysv4 - ;; - netbsd386) - basic_machine=i386-unknown - os=-netbsd - ;; - netwinder) - basic_machine=armv4l-rebel - os=-linux - ;; - news | news700 | news800 | news900) - basic_machine=m68k-sony - os=-newsos - ;; - news1000) - basic_machine=m68030-sony - os=-newsos - ;; - news-3600 | risc-news) - basic_machine=mips-sony - os=-newsos - ;; - necv70) - basic_machine=v70-nec - os=-sysv - ;; - next | m*-next ) - basic_machine=m68k-next - case $os in - -nextstep* ) - ;; - -ns2*) - os=-nextstep2 - ;; - *) - os=-nextstep3 - ;; - esac - ;; - nh3000) - basic_machine=m68k-harris - os=-cxux - ;; - nh[45]000) - basic_machine=m88k-harris - os=-cxux - ;; - nindy960) - basic_machine=i960-intel - os=-nindy - ;; - mon960) - basic_machine=i960-intel - os=-mon960 - ;; - nonstopux) - basic_machine=mips-compaq - os=-nonstopux - ;; - np1) - basic_machine=np1-gould - ;; - nsr-tandem) - basic_machine=nsr-tandem - ;; - op50n-* | op60c-*) - basic_machine=hppa1.1-oki - os=-proelf - ;; - openrisc | openrisc-*) - basic_machine=or32-unknown - ;; - os400) - basic_machine=powerpc-ibm - os=-os400 - ;; - OSE68000 | ose68000) - basic_machine=m68000-ericsson - os=-ose - ;; - os68k) - basic_machine=m68k-none - os=-os68k - ;; - pa-hitachi) - basic_machine=hppa1.1-hitachi - os=-hiuxwe2 - ;; - paragon) - basic_machine=i860-intel - os=-osf - ;; - pbd) - basic_machine=sparc-tti - ;; - pbb) - basic_machine=m68k-tti - ;; - pc532 | pc532-*) - basic_machine=ns32k-pc532 - ;; - pc98) - basic_machine=i386-pc - ;; - pc98-*) - basic_machine=i386-`echo $basic_machine | sed 's/^[^-]*-//'` - ;; - pentium | p5 | k5 | k6 | nexgen | viac3) - basic_machine=i586-pc - ;; - pentiumpro | p6 | 6x86 | athlon | athlon_*) - basic_machine=i686-pc - ;; - pentiumii | pentium2 | pentiumiii | pentium3) - basic_machine=i686-pc - ;; - pentium4) - basic_machine=i786-pc - ;; - pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*) - basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'` - ;; - pentiumpro-* | p6-* | 6x86-* | athlon-*) - basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'` - ;; - pentiumii-* | pentium2-* | pentiumiii-* | pentium3-*) - basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'` - ;; - pentium4-*) - basic_machine=i786-`echo $basic_machine | sed 's/^[^-]*-//'` - ;; - pn) - basic_machine=pn-gould - ;; - power) basic_machine=power-ibm - ;; - ppc) basic_machine=powerpc-unknown - ;; - ppc-*) basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'` - ;; - ppcle | powerpclittle | ppc-le | powerpc-little) - basic_machine=powerpcle-unknown - ;; - ppcle-* | powerpclittle-*) - basic_machine=powerpcle-`echo $basic_machine | sed 's/^[^-]*-//'` - ;; - ppc64) basic_machine=powerpc64-unknown - ;; - ppc64-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'` - ;; - ppc64le | powerpc64little | ppc64-le | powerpc64-little) - basic_machine=powerpc64le-unknown - ;; - ppc64le-* | powerpc64little-*) - basic_machine=powerpc64le-`echo $basic_machine | sed 's/^[^-]*-//'` - ;; - ps2) - basic_machine=i386-ibm - ;; - pw32) - basic_machine=i586-unknown - os=-pw32 - ;; - rdos) - basic_machine=i386-pc - os=-rdos - ;; - rom68k) - basic_machine=m68k-rom68k - os=-coff - ;; - rm[46]00) - basic_machine=mips-siemens - ;; - rtpc | rtpc-*) - basic_machine=romp-ibm - ;; - s390 | s390-*) - basic_machine=s390-ibm - ;; - s390x | s390x-*) - basic_machine=s390x-ibm - ;; - sa29200) - basic_machine=a29k-amd - os=-udi - ;; - sb1) - basic_machine=mipsisa64sb1-unknown - ;; - sb1el) - basic_machine=mipsisa64sb1el-unknown - ;; - sei) - basic_machine=mips-sei - os=-seiux - ;; - sequent) - basic_machine=i386-sequent - ;; - sh) - basic_machine=sh-hitachi - os=-hms - ;; - sh64) - basic_machine=sh64-unknown - ;; - sparclite-wrs | simso-wrs) - basic_machine=sparclite-wrs - os=-vxworks - ;; - sps7) - basic_machine=m68k-bull - os=-sysv2 - ;; - spur) - basic_machine=spur-unknown - ;; - st2000) - basic_machine=m68k-tandem - ;; - stratus) - basic_machine=i860-stratus - os=-sysv4 - ;; - sun2) - basic_machine=m68000-sun - ;; - sun2os3) - basic_machine=m68000-sun - os=-sunos3 - ;; - sun2os4) - basic_machine=m68000-sun - os=-sunos4 - ;; - sun3os3) - basic_machine=m68k-sun - os=-sunos3 - ;; - sun3os4) - basic_machine=m68k-sun - os=-sunos4 - ;; - sun4os3) - basic_machine=sparc-sun - os=-sunos3 - ;; - sun4os4) - basic_machine=sparc-sun - os=-sunos4 - ;; - sun4sol2) - basic_machine=sparc-sun - os=-solaris2 - ;; - sun3 | sun3-*) - basic_machine=m68k-sun - ;; - sun4) - basic_machine=sparc-sun - ;; - sun386 | sun386i | roadrunner) - basic_machine=i386-sun - ;; - sv1) - basic_machine=sv1-cray - os=-unicos - ;; - symmetry) - basic_machine=i386-sequent - os=-dynix - ;; - t3e) - basic_machine=alphaev5-cray - os=-unicos - ;; - t90) - basic_machine=t90-cray - os=-unicos - ;; - tic54x | c54x*) - basic_machine=tic54x-unknown - os=-coff - ;; - tic55x | c55x*) - basic_machine=tic55x-unknown - os=-coff - ;; - tic6x | c6x*) - basic_machine=tic6x-unknown - os=-coff - ;; - tx39) - basic_machine=mipstx39-unknown - ;; - tx39el) - basic_machine=mipstx39el-unknown - ;; - toad1) - basic_machine=pdp10-xkl - os=-tops20 - ;; - tower | tower-32) - basic_machine=m68k-ncr - ;; - tpf) - basic_machine=s390x-ibm - os=-tpf - ;; - udi29k) - basic_machine=a29k-amd - os=-udi - ;; - ultra3) - basic_machine=a29k-nyu - os=-sym1 - ;; - v810 | necv810) - basic_machine=v810-nec - os=-none - ;; - vaxv) - basic_machine=vax-dec - os=-sysv - ;; - vms) - basic_machine=vax-dec - os=-vms - ;; - vpp*|vx|vx-*) - basic_machine=f301-fujitsu - ;; - vxworks960) - basic_machine=i960-wrs - os=-vxworks - ;; - vxworks68) - basic_machine=m68k-wrs - os=-vxworks - ;; - vxworks29k) - basic_machine=a29k-wrs - os=-vxworks - ;; - w65*) - basic_machine=w65-wdc - os=-none - ;; - w89k-*) - basic_machine=hppa1.1-winbond - os=-proelf - ;; - xbox) - basic_machine=i686-pc - os=-mingw32 - ;; - xps | xps100) - basic_machine=xps100-honeywell - ;; - ymp) - basic_machine=ymp-cray - os=-unicos - ;; - z8k-*-coff) - basic_machine=z8k-unknown - os=-sim - ;; - none) - basic_machine=none-none - os=-none - ;; - -# Here we handle the default manufacturer of certain CPU types. It is in -# some cases the only manufacturer, in others, it is the most popular. - w89k) - basic_machine=hppa1.1-winbond - ;; - op50n) - basic_machine=hppa1.1-oki - ;; - op60c) - basic_machine=hppa1.1-oki - ;; - romp) - basic_machine=romp-ibm - ;; - mmix) - basic_machine=mmix-knuth - ;; - rs6000) - basic_machine=rs6000-ibm - ;; - vax) - basic_machine=vax-dec - ;; - pdp10) - # there are many clones, so DEC is not a safe bet - basic_machine=pdp10-unknown - ;; - pdp11) - basic_machine=pdp11-dec - ;; - we32k) - basic_machine=we32k-att - ;; - sh[1234] | sh[24]a | sh[34]eb | sh[1234]le | sh[23]ele) - basic_machine=sh-unknown - ;; - sparc | sparcv8 | sparcv9 | sparcv9b | sparcv9v) - basic_machine=sparc-sun - ;; - cydra) - basic_machine=cydra-cydrome - ;; - orion) - basic_machine=orion-highlevel - ;; - orion105) - basic_machine=clipper-highlevel - ;; - mac | mpw | mac-mpw) - basic_machine=m68k-apple - ;; - pmac | pmac-mpw) - basic_machine=powerpc-apple - ;; - *-unknown) - # Make sure to match an already-canonicalized machine name. - ;; - *) - echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2 - exit 1 - ;; -esac - -# Here we canonicalize certain aliases for manufacturers. -case $basic_machine in - *-digital*) - basic_machine=`echo $basic_machine | sed 's/digital.*/dec/'` - ;; - *-commodore*) - basic_machine=`echo $basic_machine | sed 's/commodore.*/cbm/'` - ;; - *) - ;; -esac - -# Decode manufacturer-specific aliases for certain operating systems. - -if [ x"$os" != x"" ] -then -case $os in - # First match some system type aliases - # that might get confused with valid system types. - # -solaris* is a basic system type, with this one exception. - -solaris1 | -solaris1.*) - os=`echo $os | sed -e 's|solaris1|sunos4|'` - ;; - -solaris) - os=-solaris2 - ;; - -svr4*) - os=-sysv4 - ;; - -unixware*) - os=-sysv4.2uw - ;; - -gnu/linux*) - os=`echo $os | sed -e 's|gnu/linux|linux-gnu|'` - ;; - # First accept the basic system types. - # The portable systems comes first. - # Each alternative MUST END IN A *, to match a version number. - # -sysv* is not here because it comes later, after sysvr4. - -gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \ - | -*vms* | -sco* | -esix* | -isc* | -aix* | -sunos | -sunos[34]*\ - | -hpux* | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \ - | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \ - | -aos* \ - | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \ - | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \ - | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \ - | -openbsd* | -solidbsd* \ - | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \ - | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \ - | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \ - | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \ - | -chorusos* | -chorusrdb* \ - | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ - | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \ - | -uxpv* | -beos* | -mpeix* | -udk* \ - | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \ - | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \ - | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \ - | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \ - | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \ - | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \ - | -skyos* | -haiku* | -rdos* | -toppers*) - # Remember, each alternative MUST END IN *, to match a version number. - ;; - -qnx*) - case $basic_machine in - x86-* | i*86-*) - ;; - *) - os=-nto$os - ;; - esac - ;; - -nto-qnx*) - ;; - -nto*) - os=`echo $os | sed -e 's|nto|nto-qnx|'` - ;; - -sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \ - | -windows* | -osx | -abug | -netware* | -os9* | -beos* | -haiku* \ - | -macos* | -mpw* | -magic* | -mmixware* | -mon960* | -lnews*) - ;; - -mac*) - os=`echo $os | sed -e 's|mac|macos|'` - ;; - -linux-dietlibc) - os=-linux-dietlibc - ;; - -linux*) - os=`echo $os | sed -e 's|linux|linux-gnu|'` - ;; - -sunos5*) - os=`echo $os | sed -e 's|sunos5|solaris2|'` - ;; - -sunos6*) - os=`echo $os | sed -e 's|sunos6|solaris3|'` - ;; - -opened*) - os=-openedition - ;; - -os400*) - os=-os400 - ;; - -wince*) - os=-wince - ;; - -osfrose*) - os=-osfrose - ;; - -osf*) - os=-osf - ;; - -utek*) - os=-bsd - ;; - -dynix*) - os=-bsd - ;; - -acis*) - os=-aos - ;; - -atheos*) - os=-atheos - ;; - -syllable*) - os=-syllable - ;; - -386bsd) - os=-bsd - ;; - -ctix* | -uts*) - os=-sysv - ;; - -nova*) - os=-rtmk-nova - ;; - -ns2 ) - os=-nextstep2 - ;; - -nsk*) - os=-nsk - ;; - # Preserve the version number of sinix5. - -sinix5.*) - os=`echo $os | sed -e 's|sinix|sysv|'` - ;; - -sinix*) - os=-sysv4 - ;; - -tpf*) - os=-tpf - ;; - -triton*) - os=-sysv3 - ;; - -oss*) - os=-sysv3 - ;; - -svr4) - os=-sysv4 - ;; - -svr3) - os=-sysv3 - ;; - -sysvr4) - os=-sysv4 - ;; - # This must come after -sysvr4. - -sysv*) - ;; - -ose*) - os=-ose - ;; - -es1800*) - os=-ose - ;; - -xenix) - os=-xenix - ;; - -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*) - os=-mint - ;; - -aros*) - os=-aros - ;; - -kaos*) - os=-kaos - ;; - -zvmoe) - os=-zvmoe - ;; - -none) - ;; - *) - # Get rid of the `-' at the beginning of $os. - os=`echo $os | sed 's/[^-]*-//'` - echo Invalid configuration \`$1\': system \`$os\' not recognized 1>&2 - exit 1 - ;; -esac -else - -# Here we handle the default operating systems that come with various machines. -# The value should be what the vendor currently ships out the door with their -# machine or put another way, the most popular os provided with the machine. - -# Note that if you're going to try to match "-MANUFACTURER" here (say, -# "-sun"), then you have to tell the case statement up towards the top -# that MANUFACTURER isn't an operating system. Otherwise, code above -# will signal an error saying that MANUFACTURER isn't an operating -# system, and we'll never get to this point. - -case $basic_machine in - spu-*) - os=-elf - ;; - *-acorn) - os=-riscix1.2 - ;; - arm*-rebel) - os=-linux - ;; - arm*-semi) - os=-aout - ;; - c4x-* | tic4x-*) - os=-coff - ;; - # This must come before the *-dec entry. - pdp10-*) - os=-tops20 - ;; - pdp11-*) - os=-none - ;; - *-dec | vax-*) - os=-ultrix4.2 - ;; - m68*-apollo) - os=-domain - ;; - i386-sun) - os=-sunos4.0.2 - ;; - m68000-sun) - os=-sunos3 - # This also exists in the configure program, but was not the - # default. - # os=-sunos4 - ;; - m68*-cisco) - os=-aout - ;; - mips*-cisco) - os=-elf - ;; - mips*-*) - os=-elf - ;; - or32-*) - os=-coff - ;; - *-tti) # must be before sparc entry or we get the wrong os. - os=-sysv3 - ;; - sparc-* | *-sun) - os=-sunos4.1.1 - ;; - *-be) - os=-beos - ;; - *-haiku) - os=-haiku - ;; - *-ibm) - os=-aix - ;; - *-knuth) - os=-mmixware - ;; - *-wec) - os=-proelf - ;; - *-winbond) - os=-proelf - ;; - *-oki) - os=-proelf - ;; - *-hp) - os=-hpux - ;; - *-hitachi) - os=-hiux - ;; - i860-* | *-att | *-ncr | *-altos | *-motorola | *-convergent) - os=-sysv - ;; - *-cbm) - os=-amigaos - ;; - *-dg) - os=-dgux - ;; - *-dolphin) - os=-sysv3 - ;; - m68k-ccur) - os=-rtu - ;; - m88k-omron*) - os=-luna - ;; - *-next ) - os=-nextstep - ;; - *-sequent) - os=-ptx - ;; - *-crds) - os=-unos - ;; - *-ns) - os=-genix - ;; - i370-*) - os=-mvs - ;; - *-next) - os=-nextstep3 - ;; - *-gould) - os=-sysv - ;; - *-highlevel) - os=-bsd - ;; - *-encore) - os=-bsd - ;; - *-sgi) - os=-irix - ;; - *-siemens) - os=-sysv4 - ;; - *-masscomp) - os=-rtu - ;; - f30[01]-fujitsu | f700-fujitsu) - os=-uxpv - ;; - *-rom68k) - os=-coff - ;; - *-*bug) - os=-coff - ;; - *-apple) - os=-macos - ;; - *-atari*) - os=-mint - ;; - *) - os=-none - ;; -esac -fi - -# Here we handle the case where we know the os, and the CPU type, but not the -# manufacturer. We pick the logical manufacturer. -vendor=unknown -case $basic_machine in - *-unknown) - case $os in - -riscix*) - vendor=acorn - ;; - -sunos*) - vendor=sun - ;; - -aix*) - vendor=ibm - ;; - -beos*) - vendor=be - ;; - -hpux*) - vendor=hp - ;; - -mpeix*) - vendor=hp - ;; - -hiux*) - vendor=hitachi - ;; - -unos*) - vendor=crds - ;; - -dgux*) - vendor=dg - ;; - -luna*) - vendor=omron - ;; - -genix*) - vendor=ns - ;; - -mvs* | -opened*) - vendor=ibm - ;; - -os400*) - vendor=ibm - ;; - -ptx*) - vendor=sequent - ;; - -tpf*) - vendor=ibm - ;; - -vxsim* | -vxworks* | -windiss*) - vendor=wrs - ;; - -aux*) - vendor=apple - ;; - -hms*) - vendor=hitachi - ;; - -mpw* | -macos*) - vendor=apple - ;; - -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*) - vendor=atari - ;; - -vos*) - vendor=stratus - ;; - esac - basic_machine=`echo $basic_machine | sed "s/unknown/$vendor/"` - ;; -esac - -echo $basic_machine$os -exit - -# Local variables: -# eval: (add-hook 'write-file-hooks 'time-stamp) -# time-stamp-start: "timestamp='" -# time-stamp-format: "%:y-%02m-%02d" -# time-stamp-end: "'" -# End: diff --git a/src/cc/rogue/configure b/src/cc/rogue/configure deleted file mode 100755 index a7b95e78d..000000000 --- a/src/cc/rogue/configure +++ /dev/null @@ -1,7511 +0,0 @@ -#! /bin/sh -# Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.61 for Rogue 5.4.4. -# -# Report bugs to . -# -# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, -# 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. -# This configure script is free software; the Free Software Foundation -# gives unlimited permission to copy, distribute and modify it. -## --------------------- ## -## M4sh Initialization. ## -## --------------------- ## - -# Be more Bourne compatible -DUALCASE=1; export DUALCASE # for MKS sh -if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then - emulate sh - NULLCMD=: - # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which - # is contrary to our usage. Disable this feature. - alias -g '${1+"$@"}'='"$@"' - setopt NO_GLOB_SUBST -else - case `(set -o) 2>/dev/null` in - *posix*) set -o posix ;; -esac - -fi - - - - -# PATH needs CR -# Avoid depending upon Character Ranges. -as_cr_letters='abcdefghijklmnopqrstuvwxyz' -as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ' -as_cr_Letters=$as_cr_letters$as_cr_LETTERS -as_cr_digits='0123456789' -as_cr_alnum=$as_cr_Letters$as_cr_digits - -# The user is always right. -if test "${PATH_SEPARATOR+set}" != set; then - echo "#! /bin/sh" >conf$$.sh - echo "exit 0" >>conf$$.sh - chmod +x conf$$.sh - if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then - PATH_SEPARATOR=';' - else - PATH_SEPARATOR=: - fi - rm -f conf$$.sh -fi - -# Support unset when possible. -if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then - as_unset=unset -else - as_unset=false -fi - - -# IFS -# We need space, tab and new line, in precisely that order. Quoting is -# there to prevent editors from complaining about space-tab. -# (If _AS_PATH_WALK were called with IFS unset, it would disable word -# splitting by setting IFS to empty value.) -as_nl=' -' -IFS=" "" $as_nl" - -# Find who we are. Look in the path if we contain no directory separator. -case $0 in - *[\\/]* ) as_myself=$0 ;; - *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break -done -IFS=$as_save_IFS - - ;; -esac -# We did not find ourselves, most probably we were run as `sh COMMAND' -# in which case we are not to be found in the path. -if test "x$as_myself" = x; then - as_myself=$0 -fi -if test ! -f "$as_myself"; then - echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 - { (exit 1); exit 1; } -fi - -# Work around bugs in pre-3.0 UWIN ksh. -for as_var in ENV MAIL MAILPATH -do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var -done -PS1='$ ' -PS2='> ' -PS4='+ ' - -# NLS nuisances. -for as_var in \ - LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \ - LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \ - LC_TELEPHONE LC_TIME -do - if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then - eval $as_var=C; export $as_var - else - ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var - fi -done - -# Required to use basename. -if expr a : '\(a\)' >/dev/null 2>&1 && - test "X`expr 00001 : '.*\(...\)'`" = X001; then - as_expr=expr -else - as_expr=false -fi - -if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then - as_basename=basename -else - as_basename=false -fi - - -# Name of the executable. -as_me=`$as_basename -- "$0" || -$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ - X"$0" : 'X\(//\)$' \| \ - X"$0" : 'X\(/\)' \| . 2>/dev/null || -echo X/"$0" | - sed '/^.*\/\([^/][^/]*\)\/*$/{ - s//\1/ - q - } - /^X\/\(\/\/\)$/{ - s//\1/ - q - } - /^X\/\(\/\).*/{ - s//\1/ - q - } - s/.*/./; q'` - -# CDPATH. -$as_unset CDPATH - - -if test "x$CONFIG_SHELL" = x; then - if (eval ":") 2>/dev/null; then - as_have_required=yes -else - as_have_required=no -fi - - if test $as_have_required = yes && (eval ": -(as_func_return () { - (exit \$1) -} -as_func_success () { - as_func_return 0 -} -as_func_failure () { - as_func_return 1 -} -as_func_ret_success () { - return 0 -} -as_func_ret_failure () { - return 1 -} - -exitcode=0 -if as_func_success; then - : -else - exitcode=1 - echo as_func_success failed. -fi - -if as_func_failure; then - exitcode=1 - echo as_func_failure succeeded. -fi - -if as_func_ret_success; then - : -else - exitcode=1 - echo as_func_ret_success failed. -fi - -if as_func_ret_failure; then - exitcode=1 - echo as_func_ret_failure succeeded. -fi - -if ( set x; as_func_ret_success y && test x = \"\$1\" ); then - : -else - exitcode=1 - echo positional parameters were not saved. -fi - -test \$exitcode = 0) || { (exit 1); exit 1; } - -( - as_lineno_1=\$LINENO - as_lineno_2=\$LINENO - test \"x\$as_lineno_1\" != \"x\$as_lineno_2\" && - test \"x\`expr \$as_lineno_1 + 1\`\" = \"x\$as_lineno_2\") || { (exit 1); exit 1; } -") 2> /dev/null; then - : -else - as_candidate_shells= - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - case $as_dir in - /*) - for as_base in sh bash ksh sh5; do - as_candidate_shells="$as_candidate_shells $as_dir/$as_base" - done;; - esac -done -IFS=$as_save_IFS - - - for as_shell in $as_candidate_shells $SHELL; do - # Try only shells that exist, to save several forks. - if { test -f "$as_shell" || test -f "$as_shell.exe"; } && - { ("$as_shell") 2> /dev/null <<\_ASEOF -if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then - emulate sh - NULLCMD=: - # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which - # is contrary to our usage. Disable this feature. - alias -g '${1+"$@"}'='"$@"' - setopt NO_GLOB_SUBST -else - case `(set -o) 2>/dev/null` in - *posix*) set -o posix ;; -esac - -fi - - -: -_ASEOF -}; then - CONFIG_SHELL=$as_shell - as_have_required=yes - if { "$as_shell" 2> /dev/null <<\_ASEOF -if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then - emulate sh - NULLCMD=: - # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which - # is contrary to our usage. Disable this feature. - alias -g '${1+"$@"}'='"$@"' - setopt NO_GLOB_SUBST -else - case `(set -o) 2>/dev/null` in - *posix*) set -o posix ;; -esac - -fi - - -: -(as_func_return () { - (exit $1) -} -as_func_success () { - as_func_return 0 -} -as_func_failure () { - as_func_return 1 -} -as_func_ret_success () { - return 0 -} -as_func_ret_failure () { - return 1 -} - -exitcode=0 -if as_func_success; then - : -else - exitcode=1 - echo as_func_success failed. -fi - -if as_func_failure; then - exitcode=1 - echo as_func_failure succeeded. -fi - -if as_func_ret_success; then - : -else - exitcode=1 - echo as_func_ret_success failed. -fi - -if as_func_ret_failure; then - exitcode=1 - echo as_func_ret_failure succeeded. -fi - -if ( set x; as_func_ret_success y && test x = "$1" ); then - : -else - exitcode=1 - echo positional parameters were not saved. -fi - -test $exitcode = 0) || { (exit 1); exit 1; } - -( - as_lineno_1=$LINENO - as_lineno_2=$LINENO - test "x$as_lineno_1" != "x$as_lineno_2" && - test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2") || { (exit 1); exit 1; } - -_ASEOF -}; then - break -fi - -fi - - done - - if test "x$CONFIG_SHELL" != x; then - for as_var in BASH_ENV ENV - do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var - done - export CONFIG_SHELL - exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"} -fi - - - if test $as_have_required = no; then - echo This script requires a shell more modern than all the - echo shells that I found on your system. Please install a - echo modern shell, or manually run the script under such a - echo shell if you do have one. - { (exit 1); exit 1; } -fi - - -fi - -fi - - - -(eval "as_func_return () { - (exit \$1) -} -as_func_success () { - as_func_return 0 -} -as_func_failure () { - as_func_return 1 -} -as_func_ret_success () { - return 0 -} -as_func_ret_failure () { - return 1 -} - -exitcode=0 -if as_func_success; then - : -else - exitcode=1 - echo as_func_success failed. -fi - -if as_func_failure; then - exitcode=1 - echo as_func_failure succeeded. -fi - -if as_func_ret_success; then - : -else - exitcode=1 - echo as_func_ret_success failed. -fi - -if as_func_ret_failure; then - exitcode=1 - echo as_func_ret_failure succeeded. -fi - -if ( set x; as_func_ret_success y && test x = \"\$1\" ); then - : -else - exitcode=1 - echo positional parameters were not saved. -fi - -test \$exitcode = 0") || { - echo No shell found that supports shell functions. - echo Please tell autoconf@gnu.org about your system, - echo including any error possibly output before this - echo message -} - - - - as_lineno_1=$LINENO - as_lineno_2=$LINENO - test "x$as_lineno_1" != "x$as_lineno_2" && - test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2" || { - - # Create $as_me.lineno as a copy of $as_myself, but with $LINENO - # uniformly replaced by the line number. The first 'sed' inserts a - # line-number line after each line using $LINENO; the second 'sed' - # does the real work. The second script uses 'N' to pair each - # line-number line with the line containing $LINENO, and appends - # trailing '-' during substitution so that $LINENO is not a special - # case at line end. - # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the - # scripts with optimization help from Paolo Bonzini. Blame Lee - # E. McMahon (1931-1989) for sed's syntax. :-) - sed -n ' - p - /[$]LINENO/= - ' <$as_myself | - sed ' - s/[$]LINENO.*/&-/ - t lineno - b - :lineno - N - :loop - s/[$]LINENO\([^'$as_cr_alnum'_].*\n\)\(.*\)/\2\1\2/ - t loop - s/-\n.*// - ' >$as_me.lineno && - chmod +x "$as_me.lineno" || - { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2 - { (exit 1); exit 1; }; } - - # Don't try to exec as it changes $[0], causing all sort of problems - # (the dirname of $[0] is not the place where we might find the - # original and so on. Autoconf is especially sensitive to this). - . "./$as_me.lineno" - # Exit status is that of the last command. - exit -} - - -if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then - as_dirname=dirname -else - as_dirname=false -fi - -ECHO_C= ECHO_N= ECHO_T= -case `echo -n x` in --n*) - case `echo 'x\c'` in - *c*) ECHO_T=' ';; # ECHO_T is single tab character. - *) ECHO_C='\c';; - esac;; -*) - ECHO_N='-n';; -esac - -if expr a : '\(a\)' >/dev/null 2>&1 && - test "X`expr 00001 : '.*\(...\)'`" = X001; then - as_expr=expr -else - as_expr=false -fi - -rm -f conf$$ conf$$.exe conf$$.file -if test -d conf$$.dir; then - rm -f conf$$.dir/conf$$.file -else - rm -f conf$$.dir - mkdir conf$$.dir -fi -echo >conf$$.file -if ln -s conf$$.file conf$$ 2>/dev/null; then - as_ln_s='ln -s' - # ... but there are two gotchas: - # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. - # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. - # In both cases, we have to default to `cp -p'. - ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || - as_ln_s='cp -p' -elif ln conf$$.file conf$$ 2>/dev/null; then - as_ln_s=ln -else - as_ln_s='cp -p' -fi -rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file -rmdir conf$$.dir 2>/dev/null - -if mkdir -p . 2>/dev/null; then - as_mkdir_p=: -else - test -d ./-p && rmdir ./-p - as_mkdir_p=false -fi - -if test -x / >/dev/null 2>&1; then - as_test_x='test -x' -else - if ls -dL / >/dev/null 2>&1; then - as_ls_L_option=L - else - as_ls_L_option= - fi - as_test_x=' - eval sh -c '\'' - if test -d "$1"; then - test -d "$1/."; - else - case $1 in - -*)set "./$1";; - esac; - case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in - ???[sx]*):;;*)false;;esac;fi - '\'' sh - ' -fi -as_executable_p=$as_test_x - -# Sed expression to map a string onto a valid CPP name. -as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" - -# Sed expression to map a string onto a valid variable name. -as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'" - - - -exec 7<&0 &1 - -# Name of the host. -# hostname on some systems (SVR3.2, Linux) returns a bogus exit status, -# so uname gets run too. -ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q` - -# -# Initializations. -# -ac_default_prefix=/usr/local -ac_clean_files= -ac_config_libobj_dir=. -LIBOBJS= -cross_compiling=no -subdirs= -MFLAGS= -MAKEFLAGS= -SHELL=${CONFIG_SHELL-/bin/sh} - -# Identity of this package. -PACKAGE_NAME='Rogue' -PACKAGE_TARNAME='rogue' -PACKAGE_VERSION='5.4.4' -PACKAGE_STRING='Rogue 5.4.4' -PACKAGE_BUGREPORT='yendor@rogueforge.net' - -ac_unique_file="armor.c" -# Factoring default headers for most tests. -ac_includes_default="\ -#include -#ifdef HAVE_SYS_TYPES_H -# include -#endif -#ifdef HAVE_SYS_STAT_H -# include -#endif -#ifdef STDC_HEADERS -# include -# include -#else -# ifdef HAVE_STDLIB_H -# include -# endif -#endif -#ifdef HAVE_STRING_H -# if !defined STDC_HEADERS && defined HAVE_MEMORY_H -# include -# endif -# include -#endif -#ifdef HAVE_STRINGS_H -# include -#endif -#ifdef HAVE_INTTYPES_H -# include -#endif -#ifdef HAVE_STDINT_H -# include -#endif -#ifdef HAVE_UNISTD_H -# include -#endif" - -ac_subst_vars='SHELL -PATH_SEPARATOR -PACKAGE_NAME -PACKAGE_TARNAME -PACKAGE_VERSION -PACKAGE_STRING -PACKAGE_BUGREPORT -exec_prefix -prefix -program_transform_name -bindir -sbindir -libexecdir -datarootdir -datadir -sysconfdir -sharedstatedir -localstatedir -includedir -oldincludedir -docdir -infodir -htmldir -dvidir -pdfdir -psdir -libdir -localedir -mandir -DEFS -ECHO_C -ECHO_N -ECHO_T -LIBS -build_alias -host_alias -target_alias -build -build_cpu -build_vendor -build_os -host -host_cpu -host_vendor -host_os -target -target_cpu -target_vendor -target_os -CC -CFLAGS -LDFLAGS -CPPFLAGS -ac_ct_CC -EXEEXT -OBJEXT -CPP -GREP -EGREP -LIBOBJS -NROFF -GROFF -COLCRT -TBL -SED -PROGRAM -GROUPOWNER -SCOREFILE -LOCKFILE -TARGET -LTLIBOBJS' -ac_subst_files='' - ac_precious_vars='build_alias -host_alias -target_alias -CC -CFLAGS -LDFLAGS -LIBS -CPPFLAGS -CPP' - - -# Initialize some variables set by options. -ac_init_help= -ac_init_version=false -# The variables have the same names as the options, with -# dashes changed to underlines. -cache_file=/dev/null -exec_prefix=NONE -no_create= -no_recursion= -prefix=NONE -program_prefix=NONE -program_suffix=NONE -program_transform_name=s,x,x, -silent= -site= -srcdir= -verbose= -x_includes=NONE -x_libraries=NONE - -# Installation directory options. -# These are left unexpanded so users can "make install exec_prefix=/foo" -# and all the variables that are supposed to be based on exec_prefix -# by default will actually change. -# Use braces instead of parens because sh, perl, etc. also accept them. -# (The list follows the same order as the GNU Coding Standards.) -bindir='${exec_prefix}/bin' -sbindir='${exec_prefix}/sbin' -libexecdir='${exec_prefix}/libexec' -datarootdir='${prefix}/share' -datadir='${datarootdir}' -sysconfdir='${prefix}/etc' -sharedstatedir='${prefix}/com' -localstatedir='${prefix}/var' -includedir='${prefix}/include' -oldincludedir='/usr/include' -docdir='${datarootdir}/doc/${PACKAGE_TARNAME}' -infodir='${datarootdir}/info' -htmldir='${docdir}' -dvidir='${docdir}' -pdfdir='${docdir}' -psdir='${docdir}' -libdir='${exec_prefix}/lib' -localedir='${datarootdir}/locale' -mandir='${datarootdir}/man' - -ac_prev= -ac_dashdash= -for ac_option -do - # If the previous option needs an argument, assign it. - if test -n "$ac_prev"; then - eval $ac_prev=\$ac_option - ac_prev= - continue - fi - - case $ac_option in - *=*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;; - *) ac_optarg=yes ;; - esac - - # Accept the important Cygnus configure options, so we can diagnose typos. - - case $ac_dashdash$ac_option in - --) - ac_dashdash=yes ;; - - -bindir | --bindir | --bindi | --bind | --bin | --bi) - ac_prev=bindir ;; - -bindir=* | --bindir=* | --bindi=* | --bind=* | --bin=* | --bi=*) - bindir=$ac_optarg ;; - - -build | --build | --buil | --bui | --bu) - ac_prev=build_alias ;; - -build=* | --build=* | --buil=* | --bui=* | --bu=*) - build_alias=$ac_optarg ;; - - -cache-file | --cache-file | --cache-fil | --cache-fi \ - | --cache-f | --cache- | --cache | --cach | --cac | --ca | --c) - ac_prev=cache_file ;; - -cache-file=* | --cache-file=* | --cache-fil=* | --cache-fi=* \ - | --cache-f=* | --cache-=* | --cache=* | --cach=* | --cac=* | --ca=* | --c=*) - cache_file=$ac_optarg ;; - - --config-cache | -C) - cache_file=config.cache ;; - - -datadir | --datadir | --datadi | --datad) - ac_prev=datadir ;; - -datadir=* | --datadir=* | --datadi=* | --datad=*) - datadir=$ac_optarg ;; - - -datarootdir | --datarootdir | --datarootdi | --datarootd | --dataroot \ - | --dataroo | --dataro | --datar) - ac_prev=datarootdir ;; - -datarootdir=* | --datarootdir=* | --datarootdi=* | --datarootd=* \ - | --dataroot=* | --dataroo=* | --dataro=* | --datar=*) - datarootdir=$ac_optarg ;; - - -disable-* | --disable-*) - ac_feature=`expr "x$ac_option" : 'x-*disable-\(.*\)'` - # Reject names that are not valid shell variable names. - expr "x$ac_feature" : ".*[^-._$as_cr_alnum]" >/dev/null && - { echo "$as_me: error: invalid feature name: $ac_feature" >&2 - { (exit 1); exit 1; }; } - ac_feature=`echo $ac_feature | sed 's/[-.]/_/g'` - eval enable_$ac_feature=no ;; - - -docdir | --docdir | --docdi | --doc | --do) - ac_prev=docdir ;; - -docdir=* | --docdir=* | --docdi=* | --doc=* | --do=*) - docdir=$ac_optarg ;; - - -dvidir | --dvidir | --dvidi | --dvid | --dvi | --dv) - ac_prev=dvidir ;; - -dvidir=* | --dvidir=* | --dvidi=* | --dvid=* | --dvi=* | --dv=*) - dvidir=$ac_optarg ;; - - -enable-* | --enable-*) - ac_feature=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'` - # Reject names that are not valid shell variable names. - expr "x$ac_feature" : ".*[^-._$as_cr_alnum]" >/dev/null && - { echo "$as_me: error: invalid feature name: $ac_feature" >&2 - { (exit 1); exit 1; }; } - ac_feature=`echo $ac_feature | sed 's/[-.]/_/g'` - eval enable_$ac_feature=\$ac_optarg ;; - - -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \ - | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \ - | --exec | --exe | --ex) - ac_prev=exec_prefix ;; - -exec-prefix=* | --exec_prefix=* | --exec-prefix=* | --exec-prefi=* \ - | --exec-pref=* | --exec-pre=* | --exec-pr=* | --exec-p=* | --exec-=* \ - | --exec=* | --exe=* | --ex=*) - exec_prefix=$ac_optarg ;; - - -gas | --gas | --ga | --g) - # Obsolete; use --with-gas. - with_gas=yes ;; - - -help | --help | --hel | --he | -h) - ac_init_help=long ;; - -help=r* | --help=r* | --hel=r* | --he=r* | -hr*) - ac_init_help=recursive ;; - -help=s* | --help=s* | --hel=s* | --he=s* | -hs*) - ac_init_help=short ;; - - -host | --host | --hos | --ho) - ac_prev=host_alias ;; - -host=* | --host=* | --hos=* | --ho=*) - host_alias=$ac_optarg ;; - - -htmldir | --htmldir | --htmldi | --htmld | --html | --htm | --ht) - ac_prev=htmldir ;; - -htmldir=* | --htmldir=* | --htmldi=* | --htmld=* | --html=* | --htm=* \ - | --ht=*) - htmldir=$ac_optarg ;; - - -includedir | --includedir | --includedi | --included | --include \ - | --includ | --inclu | --incl | --inc) - ac_prev=includedir ;; - -includedir=* | --includedir=* | --includedi=* | --included=* | --include=* \ - | --includ=* | --inclu=* | --incl=* | --inc=*) - includedir=$ac_optarg ;; - - -infodir | --infodir | --infodi | --infod | --info | --inf) - ac_prev=infodir ;; - -infodir=* | --infodir=* | --infodi=* | --infod=* | --info=* | --inf=*) - infodir=$ac_optarg ;; - - -libdir | --libdir | --libdi | --libd) - ac_prev=libdir ;; - -libdir=* | --libdir=* | --libdi=* | --libd=*) - libdir=$ac_optarg ;; - - -libexecdir | --libexecdir | --libexecdi | --libexecd | --libexec \ - | --libexe | --libex | --libe) - ac_prev=libexecdir ;; - -libexecdir=* | --libexecdir=* | --libexecdi=* | --libexecd=* | --libexec=* \ - | --libexe=* | --libex=* | --libe=*) - libexecdir=$ac_optarg ;; - - -localedir | --localedir | --localedi | --localed | --locale) - ac_prev=localedir ;; - -localedir=* | --localedir=* | --localedi=* | --localed=* | --locale=*) - localedir=$ac_optarg ;; - - -localstatedir | --localstatedir | --localstatedi | --localstated \ - | --localstate | --localstat | --localsta | --localst | --locals) - ac_prev=localstatedir ;; - -localstatedir=* | --localstatedir=* | --localstatedi=* | --localstated=* \ - | --localstate=* | --localstat=* | --localsta=* | --localst=* | --locals=*) - localstatedir=$ac_optarg ;; - - -mandir | --mandir | --mandi | --mand | --man | --ma | --m) - ac_prev=mandir ;; - -mandir=* | --mandir=* | --mandi=* | --mand=* | --man=* | --ma=* | --m=*) - mandir=$ac_optarg ;; - - -nfp | --nfp | --nf) - # Obsolete; use --without-fp. - with_fp=no ;; - - -no-create | --no-create | --no-creat | --no-crea | --no-cre \ - | --no-cr | --no-c | -n) - no_create=yes ;; - - -no-recursion | --no-recursion | --no-recursio | --no-recursi \ - | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r) - no_recursion=yes ;; - - -oldincludedir | --oldincludedir | --oldincludedi | --oldincluded \ - | --oldinclude | --oldinclud | --oldinclu | --oldincl | --oldinc \ - | --oldin | --oldi | --old | --ol | --o) - ac_prev=oldincludedir ;; - -oldincludedir=* | --oldincludedir=* | --oldincludedi=* | --oldincluded=* \ - | --oldinclude=* | --oldinclud=* | --oldinclu=* | --oldincl=* | --oldinc=* \ - | --oldin=* | --oldi=* | --old=* | --ol=* | --o=*) - oldincludedir=$ac_optarg ;; - - -prefix | --prefix | --prefi | --pref | --pre | --pr | --p) - ac_prev=prefix ;; - -prefix=* | --prefix=* | --prefi=* | --pref=* | --pre=* | --pr=* | --p=*) - prefix=$ac_optarg ;; - - -program-prefix | --program-prefix | --program-prefi | --program-pref \ - | --program-pre | --program-pr | --program-p) - ac_prev=program_prefix ;; - -program-prefix=* | --program-prefix=* | --program-prefi=* \ - | --program-pref=* | --program-pre=* | --program-pr=* | --program-p=*) - program_prefix=$ac_optarg ;; - - -program-suffix | --program-suffix | --program-suffi | --program-suff \ - | --program-suf | --program-su | --program-s) - ac_prev=program_suffix ;; - -program-suffix=* | --program-suffix=* | --program-suffi=* \ - | --program-suff=* | --program-suf=* | --program-su=* | --program-s=*) - program_suffix=$ac_optarg ;; - - -program-transform-name | --program-transform-name \ - | --program-transform-nam | --program-transform-na \ - | --program-transform-n | --program-transform- \ - | --program-transform | --program-transfor \ - | --program-transfo | --program-transf \ - | --program-trans | --program-tran \ - | --progr-tra | --program-tr | --program-t) - ac_prev=program_transform_name ;; - -program-transform-name=* | --program-transform-name=* \ - | --program-transform-nam=* | --program-transform-na=* \ - | --program-transform-n=* | --program-transform-=* \ - | --program-transform=* | --program-transfor=* \ - | --program-transfo=* | --program-transf=* \ - | --program-trans=* | --program-tran=* \ - | --progr-tra=* | --program-tr=* | --program-t=*) - program_transform_name=$ac_optarg ;; - - -pdfdir | --pdfdir | --pdfdi | --pdfd | --pdf | --pd) - ac_prev=pdfdir ;; - -pdfdir=* | --pdfdir=* | --pdfdi=* | --pdfd=* | --pdf=* | --pd=*) - pdfdir=$ac_optarg ;; - - -psdir | --psdir | --psdi | --psd | --ps) - ac_prev=psdir ;; - -psdir=* | --psdir=* | --psdi=* | --psd=* | --ps=*) - psdir=$ac_optarg ;; - - -q | -quiet | --quiet | --quie | --qui | --qu | --q \ - | -silent | --silent | --silen | --sile | --sil) - silent=yes ;; - - -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb) - ac_prev=sbindir ;; - -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \ - | --sbi=* | --sb=*) - sbindir=$ac_optarg ;; - - -sharedstatedir | --sharedstatedir | --sharedstatedi \ - | --sharedstated | --sharedstate | --sharedstat | --sharedsta \ - | --sharedst | --shareds | --shared | --share | --shar \ - | --sha | --sh) - ac_prev=sharedstatedir ;; - -sharedstatedir=* | --sharedstatedir=* | --sharedstatedi=* \ - | --sharedstated=* | --sharedstate=* | --sharedstat=* | --sharedsta=* \ - | --sharedst=* | --shareds=* | --shared=* | --share=* | --shar=* \ - | --sha=* | --sh=*) - sharedstatedir=$ac_optarg ;; - - -site | --site | --sit) - ac_prev=site ;; - -site=* | --site=* | --sit=*) - site=$ac_optarg ;; - - -srcdir | --srcdir | --srcdi | --srcd | --src | --sr) - ac_prev=srcdir ;; - -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*) - srcdir=$ac_optarg ;; - - -sysconfdir | --sysconfdir | --sysconfdi | --sysconfd | --sysconf \ - | --syscon | --sysco | --sysc | --sys | --sy) - ac_prev=sysconfdir ;; - -sysconfdir=* | --sysconfdir=* | --sysconfdi=* | --sysconfd=* | --sysconf=* \ - | --syscon=* | --sysco=* | --sysc=* | --sys=* | --sy=*) - sysconfdir=$ac_optarg ;; - - -target | --target | --targe | --targ | --tar | --ta | --t) - ac_prev=target_alias ;; - -target=* | --target=* | --targe=* | --targ=* | --tar=* | --ta=* | --t=*) - target_alias=$ac_optarg ;; - - -v | -verbose | --verbose | --verbos | --verbo | --verb) - verbose=yes ;; - - -version | --version | --versio | --versi | --vers | -V) - ac_init_version=: ;; - - -with-* | --with-*) - ac_package=`expr "x$ac_option" : 'x-*with-\([^=]*\)'` - # Reject names that are not valid shell variable names. - expr "x$ac_package" : ".*[^-._$as_cr_alnum]" >/dev/null && - { echo "$as_me: error: invalid package name: $ac_package" >&2 - { (exit 1); exit 1; }; } - ac_package=`echo $ac_package | sed 's/[-.]/_/g'` - eval with_$ac_package=\$ac_optarg ;; - - -without-* | --without-*) - ac_package=`expr "x$ac_option" : 'x-*without-\(.*\)'` - # Reject names that are not valid shell variable names. - expr "x$ac_package" : ".*[^-._$as_cr_alnum]" >/dev/null && - { echo "$as_me: error: invalid package name: $ac_package" >&2 - { (exit 1); exit 1; }; } - ac_package=`echo $ac_package | sed 's/[-.]/_/g'` - eval with_$ac_package=no ;; - - --x) - # Obsolete; use --with-x. - with_x=yes ;; - - -x-includes | --x-includes | --x-include | --x-includ | --x-inclu \ - | --x-incl | --x-inc | --x-in | --x-i) - ac_prev=x_includes ;; - -x-includes=* | --x-includes=* | --x-include=* | --x-includ=* | --x-inclu=* \ - | --x-incl=* | --x-inc=* | --x-in=* | --x-i=*) - x_includes=$ac_optarg ;; - - -x-libraries | --x-libraries | --x-librarie | --x-librari \ - | --x-librar | --x-libra | --x-libr | --x-lib | --x-li | --x-l) - ac_prev=x_libraries ;; - -x-libraries=* | --x-libraries=* | --x-librarie=* | --x-librari=* \ - | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*) - x_libraries=$ac_optarg ;; - - -*) { echo "$as_me: error: unrecognized option: $ac_option -Try \`$0 --help' for more information." >&2 - { (exit 1); exit 1; }; } - ;; - - *=*) - ac_envvar=`expr "x$ac_option" : 'x\([^=]*\)='` - # Reject names that are not valid shell variable names. - expr "x$ac_envvar" : ".*[^_$as_cr_alnum]" >/dev/null && - { echo "$as_me: error: invalid variable name: $ac_envvar" >&2 - { (exit 1); exit 1; }; } - eval $ac_envvar=\$ac_optarg - export $ac_envvar ;; - - *) - # FIXME: should be removed in autoconf 3.0. - echo "$as_me: WARNING: you should use --build, --host, --target" >&2 - expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null && - echo "$as_me: WARNING: invalid host type: $ac_option" >&2 - : ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option} - ;; - - esac -done - -if test -n "$ac_prev"; then - ac_option=--`echo $ac_prev | sed 's/_/-/g'` - { echo "$as_me: error: missing argument to $ac_option" >&2 - { (exit 1); exit 1; }; } -fi - -# Be sure to have absolute directory names. -for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \ - datadir sysconfdir sharedstatedir localstatedir includedir \ - oldincludedir docdir infodir htmldir dvidir pdfdir psdir \ - libdir localedir mandir -do - eval ac_val=\$$ac_var - case $ac_val in - [\\/$]* | ?:[\\/]* ) continue;; - NONE | '' ) case $ac_var in *prefix ) continue;; esac;; - esac - { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2 - { (exit 1); exit 1; }; } -done - -# There might be people who depend on the old broken behavior: `$host' -# used to hold the argument of --host etc. -# FIXME: To remove some day. -build=$build_alias -host=$host_alias -target=$target_alias - -# FIXME: To remove some day. -if test "x$host_alias" != x; then - if test "x$build_alias" = x; then - cross_compiling=maybe - echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host. - If a cross compiler is detected then cross compile mode will be used." >&2 - elif test "x$build_alias" != "x$host_alias"; then - cross_compiling=yes - fi -fi - -ac_tool_prefix= -test -n "$host_alias" && ac_tool_prefix=$host_alias- - -test "$silent" = yes && exec 6>/dev/null - - -ac_pwd=`pwd` && test -n "$ac_pwd" && -ac_ls_di=`ls -di .` && -ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` || - { echo "$as_me: error: Working directory cannot be determined" >&2 - { (exit 1); exit 1; }; } -test "X$ac_ls_di" = "X$ac_pwd_ls_di" || - { echo "$as_me: error: pwd does not report name of working directory" >&2 - { (exit 1); exit 1; }; } - - -# Find the source files, if location was not specified. -if test -z "$srcdir"; then - ac_srcdir_defaulted=yes - # Try the directory containing this script, then the parent directory. - ac_confdir=`$as_dirname -- "$0" || -$as_expr X"$0" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X"$0" : 'X\(//\)[^/]' \| \ - X"$0" : 'X\(//\)$' \| \ - X"$0" : 'X\(/\)' \| . 2>/dev/null || -echo X"$0" | - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ - s//\1/ - q - } - /^X\(\/\/\)[^/].*/{ - s//\1/ - q - } - /^X\(\/\/\)$/{ - s//\1/ - q - } - /^X\(\/\).*/{ - s//\1/ - q - } - s/.*/./; q'` - srcdir=$ac_confdir - if test ! -r "$srcdir/$ac_unique_file"; then - srcdir=.. - fi -else - ac_srcdir_defaulted=no -fi -if test ! -r "$srcdir/$ac_unique_file"; then - test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .." - { echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2 - { (exit 1); exit 1; }; } -fi -ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work" -ac_abs_confdir=`( - cd "$srcdir" && test -r "./$ac_unique_file" || { echo "$as_me: error: $ac_msg" >&2 - { (exit 1); exit 1; }; } - pwd)` -# When building in place, set srcdir=. -if test "$ac_abs_confdir" = "$ac_pwd"; then - srcdir=. -fi -# Remove unnecessary trailing slashes from srcdir. -# Double slashes in file names in object file debugging info -# mess up M-x gdb in Emacs. -case $srcdir in -*/) srcdir=`expr "X$srcdir" : 'X\(.*[^/]\)' \| "X$srcdir" : 'X\(.*\)'`;; -esac -for ac_var in $ac_precious_vars; do - eval ac_env_${ac_var}_set=\${${ac_var}+set} - eval ac_env_${ac_var}_value=\$${ac_var} - eval ac_cv_env_${ac_var}_set=\${${ac_var}+set} - eval ac_cv_env_${ac_var}_value=\$${ac_var} -done - -# -# Report the --help message. -# -if test "$ac_init_help" = "long"; then - # Omit some internal or obsolete options to make the list less imposing. - # This message is too long to be a string in the A/UX 3.1 sh. - cat <<_ACEOF -\`configure' configures Rogue 5.4.4 to adapt to many kinds of systems. - -Usage: $0 [OPTION]... [VAR=VALUE]... - -To assign environment variables (e.g., CC, CFLAGS...), specify them as -VAR=VALUE. See below for descriptions of some of the useful variables. - -Defaults for the options are specified in brackets. - -Configuration: - -h, --help display this help and exit - --help=short display options specific to this package - --help=recursive display the short help of all the included packages - -V, --version display version information and exit - -q, --quiet, --silent do not print \`checking...' messages - --cache-file=FILE cache test results in FILE [disabled] - -C, --config-cache alias for \`--cache-file=config.cache' - -n, --no-create do not create output files - --srcdir=DIR find the sources in DIR [configure dir or \`..'] - -Installation directories: - --prefix=PREFIX install architecture-independent files in PREFIX - [$ac_default_prefix] - --exec-prefix=EPREFIX install architecture-dependent files in EPREFIX - [PREFIX] - -By default, \`make install' will install all the files in -\`$ac_default_prefix/bin', \`$ac_default_prefix/lib' etc. You can specify -an installation prefix other than \`$ac_default_prefix' using \`--prefix', -for instance \`--prefix=\$HOME'. - -For better control, use the options below. - -Fine tuning of the installation directories: - --bindir=DIR user executables [EPREFIX/bin] - --sbindir=DIR system admin executables [EPREFIX/sbin] - --libexecdir=DIR program executables [EPREFIX/libexec] - --sysconfdir=DIR read-only single-machine data [PREFIX/etc] - --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com] - --localstatedir=DIR modifiable single-machine data [PREFIX/var] - --libdir=DIR object code libraries [EPREFIX/lib] - --includedir=DIR C header files [PREFIX/include] - --oldincludedir=DIR C header files for non-gcc [/usr/include] - --datarootdir=DIR read-only arch.-independent data root [PREFIX/share] - --datadir=DIR read-only architecture-independent data [DATAROOTDIR] - --infodir=DIR info documentation [DATAROOTDIR/info] - --localedir=DIR locale-dependent data [DATAROOTDIR/locale] - --mandir=DIR man documentation [DATAROOTDIR/man] - --docdir=DIR documentation root [DATAROOTDIR/doc/rogue] - --htmldir=DIR html documentation [DOCDIR] - --dvidir=DIR dvi documentation [DOCDIR] - --pdfdir=DIR pdf documentation [DOCDIR] - --psdir=DIR ps documentation [DOCDIR] -_ACEOF - - cat <<\_ACEOF - -System types: - --build=BUILD configure for building on BUILD [guessed] - --host=HOST cross-compile to build programs to run on HOST [BUILD] - --target=TARGET configure for building compilers for TARGET [HOST] -_ACEOF -fi - -if test -n "$ac_init_help"; then - case $ac_init_help in - short | recursive ) echo "Configuration of Rogue 5.4.4:";; - esac - cat <<\_ACEOF - -Optional Features: - --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no) - --enable-FEATURE[=ARG] include FEATURE [ARG=yes] - --enable-setgid=NAME install executable as setgid with group ownership of - NAME [default=no]] - --enable-scorefile=SCOREFILE - enable scoreboard with given filename - --enable-lockfile=LOCKFILE - enable scoreboard lockfile with given filename - --enable-wizardmode enable availability of wizard mode [default=no] - --enable-allscores enable scoreboard to show top scores, not just top - players [default=yes] - --enable-checktime enable checktime [default=no] - --enable-maxload enable maxload [default=no] - --enable-maxusers enable maxuser [default=no] - --enable-numscores number of scores to store in scoreboard [default=10] - --enable-numname word for number of scores to store in scoreboard - [default=Ten] - --enable-loadav=NAMELIST - use program's load average function (unlikely to - work) [default=no] - --enable-ucount=UTMPFILE - use program's own function to count users (unlikely - to work) [default=no] - -Optional Packages: - --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] - --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no) - --with-ncurses Force the use of ncurses over curses - --with-program-name=NAME - alternate executable name - -Some influential environment variables: - CC C compiler command - CFLAGS C compiler flags - LDFLAGS linker flags, e.g. -L if you have libraries in a - nonstandard directory - LIBS libraries to pass to the linker, e.g. -l - CPPFLAGS C/C++/Objective C preprocessor flags, e.g. -I if - you have headers in a nonstandard directory - CPP C preprocessor - -Use these variables to override the choices made by `configure' or to help -it to find libraries and programs with nonstandard names/locations. - -Report bugs to . -_ACEOF -ac_status=$? -fi - -if test "$ac_init_help" = "recursive"; then - # If there are subdirs, report their specific --help. - for ac_dir in : $ac_subdirs_all; do test "x$ac_dir" = x: && continue - test -d "$ac_dir" || continue - ac_builddir=. - -case "$ac_dir" in -.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;; -*) - ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'` - # A ".." for each directory in $ac_dir_suffix. - ac_top_builddir_sub=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,/..,g;s,/,,'` - case $ac_top_builddir_sub in - "") ac_top_builddir_sub=. ac_top_build_prefix= ;; - *) ac_top_build_prefix=$ac_top_builddir_sub/ ;; - esac ;; -esac -ac_abs_top_builddir=$ac_pwd -ac_abs_builddir=$ac_pwd$ac_dir_suffix -# for backward compatibility: -ac_top_builddir=$ac_top_build_prefix - -case $srcdir in - .) # We are building in place. - ac_srcdir=. - ac_top_srcdir=$ac_top_builddir_sub - ac_abs_top_srcdir=$ac_pwd ;; - [\\/]* | ?:[\\/]* ) # Absolute name. - ac_srcdir=$srcdir$ac_dir_suffix; - ac_top_srcdir=$srcdir - ac_abs_top_srcdir=$srcdir ;; - *) # Relative name. - ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix - ac_top_srcdir=$ac_top_build_prefix$srcdir - ac_abs_top_srcdir=$ac_pwd/$srcdir ;; -esac -ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix - - cd "$ac_dir" || { ac_status=$?; continue; } - # Check for guested configure. - if test -f "$ac_srcdir/configure.gnu"; then - echo && - $SHELL "$ac_srcdir/configure.gnu" --help=recursive - elif test -f "$ac_srcdir/configure"; then - echo && - $SHELL "$ac_srcdir/configure" --help=recursive - else - echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2 - fi || ac_status=$? - cd "$ac_pwd" || { ac_status=$?; break; } - done -fi - -test -n "$ac_init_help" && exit $ac_status -if $ac_init_version; then - cat <<\_ACEOF -Rogue configure 5.4.4 -generated by GNU Autoconf 2.61 - -Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, -2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. -This configure script is free software; the Free Software Foundation -gives unlimited permission to copy, distribute and modify it. -_ACEOF - exit -fi -cat >config.log <<_ACEOF -This file contains any messages produced by compilers while -running configure, to aid debugging if configure makes a mistake. - -It was created by Rogue $as_me 5.4.4, which was -generated by GNU Autoconf 2.61. Invocation command line was - - $ $0 $@ - -_ACEOF -exec 5>>config.log -{ -cat <<_ASUNAME -## --------- ## -## Platform. ## -## --------- ## - -hostname = `(hostname || uname -n) 2>/dev/null | sed 1q` -uname -m = `(uname -m) 2>/dev/null || echo unknown` -uname -r = `(uname -r) 2>/dev/null || echo unknown` -uname -s = `(uname -s) 2>/dev/null || echo unknown` -uname -v = `(uname -v) 2>/dev/null || echo unknown` - -/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null || echo unknown` -/bin/uname -X = `(/bin/uname -X) 2>/dev/null || echo unknown` - -/bin/arch = `(/bin/arch) 2>/dev/null || echo unknown` -/usr/bin/arch -k = `(/usr/bin/arch -k) 2>/dev/null || echo unknown` -/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null || echo unknown` -/usr/bin/hostinfo = `(/usr/bin/hostinfo) 2>/dev/null || echo unknown` -/bin/machine = `(/bin/machine) 2>/dev/null || echo unknown` -/usr/bin/oslevel = `(/usr/bin/oslevel) 2>/dev/null || echo unknown` -/bin/universe = `(/bin/universe) 2>/dev/null || echo unknown` - -_ASUNAME - -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - echo "PATH: $as_dir" -done -IFS=$as_save_IFS - -} >&5 - -cat >&5 <<_ACEOF - - -## ----------- ## -## Core tests. ## -## ----------- ## - -_ACEOF - - -# Keep a trace of the command line. -# Strip out --no-create and --no-recursion so they do not pile up. -# Strip out --silent because we don't want to record it for future runs. -# Also quote any args containing shell meta-characters. -# Make two passes to allow for proper duplicate-argument suppression. -ac_configure_args= -ac_configure_args0= -ac_configure_args1= -ac_must_keep_next=false -for ac_pass in 1 2 -do - for ac_arg - do - case $ac_arg in - -no-create | --no-c* | -n | -no-recursion | --no-r*) continue ;; - -q | -quiet | --quiet | --quie | --qui | --qu | --q \ - | -silent | --silent | --silen | --sile | --sil) - continue ;; - *\'*) - ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;; - esac - case $ac_pass in - 1) ac_configure_args0="$ac_configure_args0 '$ac_arg'" ;; - 2) - ac_configure_args1="$ac_configure_args1 '$ac_arg'" - if test $ac_must_keep_next = true; then - ac_must_keep_next=false # Got value, back to normal. - else - case $ac_arg in - *=* | --config-cache | -C | -disable-* | --disable-* \ - | -enable-* | --enable-* | -gas | --g* | -nfp | --nf* \ - | -q | -quiet | --q* | -silent | --sil* | -v | -verb* \ - | -with-* | --with-* | -without-* | --without-* | --x) - case "$ac_configure_args0 " in - "$ac_configure_args1"*" '$ac_arg' "* ) continue ;; - esac - ;; - -* ) ac_must_keep_next=true ;; - esac - fi - ac_configure_args="$ac_configure_args '$ac_arg'" - ;; - esac - done -done -$as_unset ac_configure_args0 || test "${ac_configure_args0+set}" != set || { ac_configure_args0=; export ac_configure_args0; } -$as_unset ac_configure_args1 || test "${ac_configure_args1+set}" != set || { ac_configure_args1=; export ac_configure_args1; } - -# When interrupted or exit'd, cleanup temporary files, and complete -# config.log. We remove comments because anyway the quotes in there -# would cause problems or look ugly. -# WARNING: Use '\'' to represent an apostrophe within the trap. -# WARNING: Do not start the trap code with a newline, due to a FreeBSD 4.0 bug. -trap 'exit_status=$? - # Save into config.log some information that might help in debugging. - { - echo - - cat <<\_ASBOX -## ---------------- ## -## Cache variables. ## -## ---------------- ## -_ASBOX - echo - # The following way of writing the cache mishandles newlines in values, -( - for ac_var in `(set) 2>&1 | sed -n '\''s/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'\''`; do - eval ac_val=\$$ac_var - case $ac_val in #( - *${as_nl}*) - case $ac_var in #( - *_cv_*) { echo "$as_me:$LINENO: WARNING: Cache variable $ac_var contains a newline." >&5 -echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;; - esac - case $ac_var in #( - _ | IFS | as_nl) ;; #( - *) $as_unset $ac_var ;; - esac ;; - esac - done - (set) 2>&1 | - case $as_nl`(ac_space='\'' '\''; set) 2>&1` in #( - *${as_nl}ac_space=\ *) - sed -n \ - "s/'\''/'\''\\\\'\'''\''/g; - s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\''\\2'\''/p" - ;; #( - *) - sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p" - ;; - esac | - sort -) - echo - - cat <<\_ASBOX -## ----------------- ## -## Output variables. ## -## ----------------- ## -_ASBOX - echo - for ac_var in $ac_subst_vars - do - eval ac_val=\$$ac_var - case $ac_val in - *\'\''*) ac_val=`echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;; - esac - echo "$ac_var='\''$ac_val'\''" - done | sort - echo - - if test -n "$ac_subst_files"; then - cat <<\_ASBOX -## ------------------- ## -## File substitutions. ## -## ------------------- ## -_ASBOX - echo - for ac_var in $ac_subst_files - do - eval ac_val=\$$ac_var - case $ac_val in - *\'\''*) ac_val=`echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;; - esac - echo "$ac_var='\''$ac_val'\''" - done | sort - echo - fi - - if test -s confdefs.h; then - cat <<\_ASBOX -## ----------- ## -## confdefs.h. ## -## ----------- ## -_ASBOX - echo - cat confdefs.h - echo - fi - test "$ac_signal" != 0 && - echo "$as_me: caught signal $ac_signal" - echo "$as_me: exit $exit_status" - } >&5 - rm -f core *.core core.conftest.* && - rm -f -r conftest* confdefs* conf$$* $ac_clean_files && - exit $exit_status -' 0 -for ac_signal in 1 2 13 15; do - trap 'ac_signal='$ac_signal'; { (exit 1); exit 1; }' $ac_signal -done -ac_signal=0 - -# confdefs.h avoids OS command line length limits that DEFS can exceed. -rm -f -r conftest* confdefs.h - -# Predefined preprocessor variables. - -cat >>confdefs.h <<_ACEOF -#define PACKAGE_NAME "$PACKAGE_NAME" -_ACEOF - - -cat >>confdefs.h <<_ACEOF -#define PACKAGE_TARNAME "$PACKAGE_TARNAME" -_ACEOF - - -cat >>confdefs.h <<_ACEOF -#define PACKAGE_VERSION "$PACKAGE_VERSION" -_ACEOF - - -cat >>confdefs.h <<_ACEOF -#define PACKAGE_STRING "$PACKAGE_STRING" -_ACEOF - - -cat >>confdefs.h <<_ACEOF -#define PACKAGE_BUGREPORT "$PACKAGE_BUGREPORT" -_ACEOF - - -# Let the site file select an alternate cache file if it wants to. -# Prefer explicitly selected file to automatically selected ones. -if test -n "$CONFIG_SITE"; then - set x "$CONFIG_SITE" -elif test "x$prefix" != xNONE; then - set x "$prefix/share/config.site" "$prefix/etc/config.site" -else - set x "$ac_default_prefix/share/config.site" \ - "$ac_default_prefix/etc/config.site" -fi -shift -for ac_site_file -do - if test -r "$ac_site_file"; then - { echo "$as_me:$LINENO: loading site script $ac_site_file" >&5 -echo "$as_me: loading site script $ac_site_file" >&6;} - sed 's/^/| /' "$ac_site_file" >&5 - . "$ac_site_file" - fi -done - -if test -r "$cache_file"; then - # Some versions of bash will fail to source /dev/null (special - # files actually), so we avoid doing that. - if test -f "$cache_file"; then - { echo "$as_me:$LINENO: loading cache $cache_file" >&5 -echo "$as_me: loading cache $cache_file" >&6;} - case $cache_file in - [\\/]* | ?:[\\/]* ) . "$cache_file";; - *) . "./$cache_file";; - esac - fi -else - { echo "$as_me:$LINENO: creating cache $cache_file" >&5 -echo "$as_me: creating cache $cache_file" >&6;} - >$cache_file -fi - -# Check that the precious variables saved in the cache have kept the same -# value. -ac_cache_corrupted=false -for ac_var in $ac_precious_vars; do - eval ac_old_set=\$ac_cv_env_${ac_var}_set - eval ac_new_set=\$ac_env_${ac_var}_set - eval ac_old_val=\$ac_cv_env_${ac_var}_value - eval ac_new_val=\$ac_env_${ac_var}_value - case $ac_old_set,$ac_new_set in - set,) - { echo "$as_me:$LINENO: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5 -echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;} - ac_cache_corrupted=: ;; - ,set) - { echo "$as_me:$LINENO: error: \`$ac_var' was not set in the previous run" >&5 -echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;} - ac_cache_corrupted=: ;; - ,);; - *) - if test "x$ac_old_val" != "x$ac_new_val"; then - { echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5 -echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;} - { echo "$as_me:$LINENO: former value: $ac_old_val" >&5 -echo "$as_me: former value: $ac_old_val" >&2;} - { echo "$as_me:$LINENO: current value: $ac_new_val" >&5 -echo "$as_me: current value: $ac_new_val" >&2;} - ac_cache_corrupted=: - fi;; - esac - # Pass precious variables to config.status. - if test "$ac_new_set" = set; then - case $ac_new_val in - *\'*) ac_arg=$ac_var=`echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;; - *) ac_arg=$ac_var=$ac_new_val ;; - esac - case " $ac_configure_args " in - *" '$ac_arg' "*) ;; # Avoid dups. Use of quotes ensures accuracy. - *) ac_configure_args="$ac_configure_args '$ac_arg'" ;; - esac - fi -done -if $ac_cache_corrupted; then - { echo "$as_me:$LINENO: error: changes in the environment can compromise the build" >&5 -echo "$as_me: error: changes in the environment can compromise the build" >&2;} - { { echo "$as_me:$LINENO: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5 -echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;} - { (exit 1); exit 1; }; } -fi - - - - - - - - - - - - - - - - - - - - - - - - - -ac_ext=c -ac_cpp='$CPP $CPPFLAGS' -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_c_compiler_gnu - - - -ac_config_headers="$ac_config_headers config.h" - -ac_config_files="$ac_config_files Makefile rogue.6 rogue.cat rogue.doc rogue.html rogue.me" - -ac_aux_dir= -for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do - if test -f "$ac_dir/install-sh"; then - ac_aux_dir=$ac_dir - ac_install_sh="$ac_aux_dir/install-sh -c" - break - elif test -f "$ac_dir/install.sh"; then - ac_aux_dir=$ac_dir - ac_install_sh="$ac_aux_dir/install.sh -c" - break - elif test -f "$ac_dir/shtool"; then - ac_aux_dir=$ac_dir - ac_install_sh="$ac_aux_dir/shtool install -c" - break - fi -done -if test -z "$ac_aux_dir"; then - { { echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" >&5 -echo "$as_me: error: cannot find install-sh or install.sh in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" >&2;} - { (exit 1); exit 1; }; } -fi - -# These three variables are undocumented and unsupported, -# and are intended to be withdrawn in a future Autoconf release. -# They can cause serious problems if a builder's source tree is in a directory -# whose full name contains unusual characters. -ac_config_guess="$SHELL $ac_aux_dir/config.guess" # Please don't use this var. -ac_config_sub="$SHELL $ac_aux_dir/config.sub" # Please don't use this var. -ac_configure="$SHELL $ac_aux_dir/configure" # Please don't use this var. - - -# Make sure we can run config.sub. -$SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 || - { { echo "$as_me:$LINENO: error: cannot run $SHELL $ac_aux_dir/config.sub" >&5 -echo "$as_me: error: cannot run $SHELL $ac_aux_dir/config.sub" >&2;} - { (exit 1); exit 1; }; } - -{ echo "$as_me:$LINENO: checking build system type" >&5 -echo $ECHO_N "checking build system type... $ECHO_C" >&6; } -if test "${ac_cv_build+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_build_alias=$build_alias -test "x$ac_build_alias" = x && - ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"` -test "x$ac_build_alias" = x && - { { echo "$as_me:$LINENO: error: cannot guess build type; you must specify one" >&5 -echo "$as_me: error: cannot guess build type; you must specify one" >&2;} - { (exit 1); exit 1; }; } -ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` || - { { echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&5 -echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&2;} - { (exit 1); exit 1; }; } - -fi -{ echo "$as_me:$LINENO: result: $ac_cv_build" >&5 -echo "${ECHO_T}$ac_cv_build" >&6; } -case $ac_cv_build in -*-*-*) ;; -*) { { echo "$as_me:$LINENO: error: invalid value of canonical build" >&5 -echo "$as_me: error: invalid value of canonical build" >&2;} - { (exit 1); exit 1; }; };; -esac -build=$ac_cv_build -ac_save_IFS=$IFS; IFS='-' -set x $ac_cv_build -shift -build_cpu=$1 -build_vendor=$2 -shift; shift -# Remember, the first character of IFS is used to create $*, -# except with old shells: -build_os=$* -IFS=$ac_save_IFS -case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac - - -{ echo "$as_me:$LINENO: checking host system type" >&5 -echo $ECHO_N "checking host system type... $ECHO_C" >&6; } -if test "${ac_cv_host+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test "x$host_alias" = x; then - ac_cv_host=$ac_cv_build -else - ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` || - { { echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&5 -echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&2;} - { (exit 1); exit 1; }; } -fi - -fi -{ echo "$as_me:$LINENO: result: $ac_cv_host" >&5 -echo "${ECHO_T}$ac_cv_host" >&6; } -case $ac_cv_host in -*-*-*) ;; -*) { { echo "$as_me:$LINENO: error: invalid value of canonical host" >&5 -echo "$as_me: error: invalid value of canonical host" >&2;} - { (exit 1); exit 1; }; };; -esac -host=$ac_cv_host -ac_save_IFS=$IFS; IFS='-' -set x $ac_cv_host -shift -host_cpu=$1 -host_vendor=$2 -shift; shift -# Remember, the first character of IFS is used to create $*, -# except with old shells: -host_os=$* -IFS=$ac_save_IFS -case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac - - -{ echo "$as_me:$LINENO: checking target system type" >&5 -echo $ECHO_N "checking target system type... $ECHO_C" >&6; } -if test "${ac_cv_target+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test "x$target_alias" = x; then - ac_cv_target=$ac_cv_host -else - ac_cv_target=`$SHELL "$ac_aux_dir/config.sub" $target_alias` || - { { echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $target_alias failed" >&5 -echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $target_alias failed" >&2;} - { (exit 1); exit 1; }; } -fi - -fi -{ echo "$as_me:$LINENO: result: $ac_cv_target" >&5 -echo "${ECHO_T}$ac_cv_target" >&6; } -case $ac_cv_target in -*-*-*) ;; -*) { { echo "$as_me:$LINENO: error: invalid value of canonical target" >&5 -echo "$as_me: error: invalid value of canonical target" >&2;} - { (exit 1); exit 1; }; };; -esac -target=$ac_cv_target -ac_save_IFS=$IFS; IFS='-' -set x $ac_cv_target -shift -target_cpu=$1 -target_vendor=$2 -shift; shift -# Remember, the first character of IFS is used to create $*, -# except with old shells: -target_os=$* -IFS=$ac_save_IFS -case $target_os in *\ *) target_os=`echo "$target_os" | sed 's/ /-/g'`;; esac - - -# The aliases save the names the user supplied, while $host etc. -# will get canonicalized. -test -n "$target_alias" && - test "$program_prefix$program_suffix$program_transform_name" = \ - NONENONEs,x,x, && - program_prefix=${target_alias}- - -# Checks for programs. -ac_ext=c -ac_cpp='$CPP $CPPFLAGS' -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_c_compiler_gnu -if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args. -set dummy ${ac_tool_prefix}gcc; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_prog_CC+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test -n "$CC"; then - ac_cv_prog_CC="$CC" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_CC="${ac_tool_prefix}gcc" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done -IFS=$as_save_IFS - -fi -fi -CC=$ac_cv_prog_CC -if test -n "$CC"; then - { echo "$as_me:$LINENO: result: $CC" >&5 -echo "${ECHO_T}$CC" >&6; } -else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } -fi - - -fi -if test -z "$ac_cv_prog_CC"; then - ac_ct_CC=$CC - # Extract the first word of "gcc", so it can be a program name with args. -set dummy gcc; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_prog_ac_ct_CC+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test -n "$ac_ct_CC"; then - ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_ac_ct_CC="gcc" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done -IFS=$as_save_IFS - -fi -fi -ac_ct_CC=$ac_cv_prog_ac_ct_CC -if test -n "$ac_ct_CC"; then - { echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 -echo "${ECHO_T}$ac_ct_CC" >&6; } -else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } -fi - - if test "x$ac_ct_CC" = x; then - CC="" - else - case $cross_compiling:$ac_tool_warned in -yes:) -{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools -whose name does not start with the host triplet. If you think this -configuration is useful to you, please write to autoconf@gnu.org." >&5 -echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools -whose name does not start with the host triplet. If you think this -configuration is useful to you, please write to autoconf@gnu.org." >&2;} -ac_tool_warned=yes ;; -esac - CC=$ac_ct_CC - fi -else - CC="$ac_cv_prog_CC" -fi - -if test -z "$CC"; then - if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args. -set dummy ${ac_tool_prefix}cc; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_prog_CC+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test -n "$CC"; then - ac_cv_prog_CC="$CC" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_CC="${ac_tool_prefix}cc" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done -IFS=$as_save_IFS - -fi -fi -CC=$ac_cv_prog_CC -if test -n "$CC"; then - { echo "$as_me:$LINENO: result: $CC" >&5 -echo "${ECHO_T}$CC" >&6; } -else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } -fi - - - fi -fi -if test -z "$CC"; then - # Extract the first word of "cc", so it can be a program name with args. -set dummy cc; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_prog_CC+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test -n "$CC"; then - ac_cv_prog_CC="$CC" # Let the user override the test. -else - ac_prog_rejected=no -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then - ac_prog_rejected=yes - continue - fi - ac_cv_prog_CC="cc" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done -IFS=$as_save_IFS - -if test $ac_prog_rejected = yes; then - # We found a bogon in the path, so make sure we never use it. - set dummy $ac_cv_prog_CC - shift - if test $# != 0; then - # We chose a different compiler from the bogus one. - # However, it has the same basename, so the bogon will be chosen - # first if we set CC to just the basename; use the full file name. - shift - ac_cv_prog_CC="$as_dir/$ac_word${1+' '}$@" - fi -fi -fi -fi -CC=$ac_cv_prog_CC -if test -n "$CC"; then - { echo "$as_me:$LINENO: result: $CC" >&5 -echo "${ECHO_T}$CC" >&6; } -else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } -fi - - -fi -if test -z "$CC"; then - if test -n "$ac_tool_prefix"; then - for ac_prog in cl.exe - do - # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. -set dummy $ac_tool_prefix$ac_prog; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_prog_CC+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test -n "$CC"; then - ac_cv_prog_CC="$CC" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_CC="$ac_tool_prefix$ac_prog" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done -IFS=$as_save_IFS - -fi -fi -CC=$ac_cv_prog_CC -if test -n "$CC"; then - { echo "$as_me:$LINENO: result: $CC" >&5 -echo "${ECHO_T}$CC" >&6; } -else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } -fi - - - test -n "$CC" && break - done -fi -if test -z "$CC"; then - ac_ct_CC=$CC - for ac_prog in cl.exe -do - # Extract the first word of "$ac_prog", so it can be a program name with args. -set dummy $ac_prog; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_prog_ac_ct_CC+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test -n "$ac_ct_CC"; then - ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_ac_ct_CC="$ac_prog" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done -IFS=$as_save_IFS - -fi -fi -ac_ct_CC=$ac_cv_prog_ac_ct_CC -if test -n "$ac_ct_CC"; then - { echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 -echo "${ECHO_T}$ac_ct_CC" >&6; } -else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } -fi - - - test -n "$ac_ct_CC" && break -done - - if test "x$ac_ct_CC" = x; then - CC="" - else - case $cross_compiling:$ac_tool_warned in -yes:) -{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools -whose name does not start with the host triplet. If you think this -configuration is useful to you, please write to autoconf@gnu.org." >&5 -echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools -whose name does not start with the host triplet. If you think this -configuration is useful to you, please write to autoconf@gnu.org." >&2;} -ac_tool_warned=yes ;; -esac - CC=$ac_ct_CC - fi -fi - -fi - - -test -z "$CC" && { { echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH -See \`config.log' for more details." >&5 -echo "$as_me: error: no acceptable C compiler found in \$PATH -See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; } - -# Provide some information about the compiler. -echo "$as_me:$LINENO: checking for C compiler version" >&5 -ac_compiler=`set X $ac_compile; echo $2` -{ (ac_try="$ac_compiler --version >&5" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compiler --version >&5") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } -{ (ac_try="$ac_compiler -v >&5" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compiler -v >&5") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } -{ (ac_try="$ac_compiler -V >&5" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compiler -V >&5") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } - -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -int -main () -{ - - ; - return 0; -} -_ACEOF -ac_clean_files_save=$ac_clean_files -ac_clean_files="$ac_clean_files a.out a.exe b.out" -# Try to create an executable without -o first, disregard a.out. -# It will help us diagnose broken compilers, and finding out an intuition -# of exeext. -{ echo "$as_me:$LINENO: checking for C compiler default output file name" >&5 -echo $ECHO_N "checking for C compiler default output file name... $ECHO_C" >&6; } -ac_link_default=`echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'` -# -# List of possible output files, starting from the most likely. -# The algorithm is not robust to junk in `.', hence go to wildcards (a.*) -# only as a last resort. b.out is created by i960 compilers. -ac_files='a_out.exe a.exe conftest.exe a.out conftest a.* conftest.* b.out' -# -# The IRIX 6 linker writes into existing files which may not be -# executable, retaining their permissions. Remove them first so a -# subsequent execution test works. -ac_rmfiles= -for ac_file in $ac_files -do - case $ac_file in - *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj ) ;; - * ) ac_rmfiles="$ac_rmfiles $ac_file";; - esac -done -rm -f $ac_rmfiles - -if { (ac_try="$ac_link_default" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link_default") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then - # Autoconf-2.13 could set the ac_cv_exeext variable to `no'. -# So ignore a value of `no', otherwise this would lead to `EXEEXT = no' -# in a Makefile. We should not override ac_cv_exeext if it was cached, -# so that the user can short-circuit this test for compilers unknown to -# Autoconf. -for ac_file in $ac_files '' -do - test -f "$ac_file" || continue - case $ac_file in - *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj ) - ;; - [ab].out ) - # We found the default executable, but exeext='' is most - # certainly right. - break;; - *.* ) - if test "${ac_cv_exeext+set}" = set && test "$ac_cv_exeext" != no; - then :; else - ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` - fi - # We set ac_cv_exeext here because the later test for it is not - # safe: cross compilers may not add the suffix if given an `-o' - # argument, so we may need to know it at that point already. - # Even if this section looks crufty: it has the advantage of - # actually working. - break;; - * ) - break;; - esac -done -test "$ac_cv_exeext" = no && ac_cv_exeext= - -else - ac_file='' -fi - -{ echo "$as_me:$LINENO: result: $ac_file" >&5 -echo "${ECHO_T}$ac_file" >&6; } -if test -z "$ac_file"; then - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -{ { echo "$as_me:$LINENO: error: C compiler cannot create executables -See \`config.log' for more details." >&5 -echo "$as_me: error: C compiler cannot create executables -See \`config.log' for more details." >&2;} - { (exit 77); exit 77; }; } -fi - -ac_exeext=$ac_cv_exeext - -# Check that the compiler produces executables we can run. If not, either -# the compiler is broken, or we cross compile. -{ echo "$as_me:$LINENO: checking whether the C compiler works" >&5 -echo $ECHO_N "checking whether the C compiler works... $ECHO_C" >&6; } -# FIXME: These cross compiler hacks should be removed for Autoconf 3.0 -# If not cross compiling, check that we can run a simple program. -if test "$cross_compiling" != yes; then - if { ac_try='./$ac_file' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - cross_compiling=no - else - if test "$cross_compiling" = maybe; then - cross_compiling=yes - else - { { echo "$as_me:$LINENO: error: cannot run C compiled programs. -If you meant to cross compile, use \`--host'. -See \`config.log' for more details." >&5 -echo "$as_me: error: cannot run C compiled programs. -If you meant to cross compile, use \`--host'. -See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; } - fi - fi -fi -{ echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } - -rm -f a.out a.exe conftest$ac_cv_exeext b.out -ac_clean_files=$ac_clean_files_save -# Check that the compiler produces executables we can run. If not, either -# the compiler is broken, or we cross compile. -{ echo "$as_me:$LINENO: checking whether we are cross compiling" >&5 -echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6; } -{ echo "$as_me:$LINENO: result: $cross_compiling" >&5 -echo "${ECHO_T}$cross_compiling" >&6; } - -{ echo "$as_me:$LINENO: checking for suffix of executables" >&5 -echo $ECHO_N "checking for suffix of executables... $ECHO_C" >&6; } -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then - # If both `conftest.exe' and `conftest' are `present' (well, observable) -# catch `conftest.exe'. For instance with Cygwin, `ls conftest' will -# work properly (i.e., refer to `conftest.exe'), while it won't with -# `rm'. -for ac_file in conftest.exe conftest conftest.*; do - test -f "$ac_file" || continue - case $ac_file in - *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj ) ;; - *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` - break;; - * ) break;; - esac -done -else - { { echo "$as_me:$LINENO: error: cannot compute suffix of executables: cannot compile and link -See \`config.log' for more details." >&5 -echo "$as_me: error: cannot compute suffix of executables: cannot compile and link -See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; } -fi - -rm -f conftest$ac_cv_exeext -{ echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5 -echo "${ECHO_T}$ac_cv_exeext" >&6; } - -rm -f conftest.$ac_ext -EXEEXT=$ac_cv_exeext -ac_exeext=$EXEEXT -{ echo "$as_me:$LINENO: checking for suffix of object files" >&5 -echo $ECHO_N "checking for suffix of object files... $ECHO_C" >&6; } -if test "${ac_cv_objext+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -int -main () -{ - - ; - return 0; -} -_ACEOF -rm -f conftest.o conftest.obj -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then - for ac_file in conftest.o conftest.obj conftest.*; do - test -f "$ac_file" || continue; - case $ac_file in - *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf ) ;; - *) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'` - break;; - esac -done -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -{ { echo "$as_me:$LINENO: error: cannot compute suffix of object files: cannot compile -See \`config.log' for more details." >&5 -echo "$as_me: error: cannot compute suffix of object files: cannot compile -See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; } -fi - -rm -f conftest.$ac_cv_objext conftest.$ac_ext -fi -{ echo "$as_me:$LINENO: result: $ac_cv_objext" >&5 -echo "${ECHO_T}$ac_cv_objext" >&6; } -OBJEXT=$ac_cv_objext -ac_objext=$OBJEXT -{ echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5 -echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6; } -if test "${ac_cv_c_compiler_gnu+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -int -main () -{ -#ifndef __GNUC__ - choke me -#endif - - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_compiler_gnu=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_compiler_gnu=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -ac_cv_c_compiler_gnu=$ac_compiler_gnu - -fi -{ echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5 -echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6; } -GCC=`test $ac_compiler_gnu = yes && echo yes` -ac_test_CFLAGS=${CFLAGS+set} -ac_save_CFLAGS=$CFLAGS -{ echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5 -echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6; } -if test "${ac_cv_prog_cc_g+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_save_c_werror_flag=$ac_c_werror_flag - ac_c_werror_flag=yes - ac_cv_prog_cc_g=no - CFLAGS="-g" - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -int -main () -{ - - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_cv_prog_cc_g=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - CFLAGS="" - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -int -main () -{ - - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - : -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_c_werror_flag=$ac_save_c_werror_flag - CFLAGS="-g" - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -int -main () -{ - - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_cv_prog_cc_g=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - ac_c_werror_flag=$ac_save_c_werror_flag -fi -{ echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5 -echo "${ECHO_T}$ac_cv_prog_cc_g" >&6; } -if test "$ac_test_CFLAGS" = set; then - CFLAGS=$ac_save_CFLAGS -elif test $ac_cv_prog_cc_g = yes; then - if test "$GCC" = yes; then - CFLAGS="-g -O2" - else - CFLAGS="-g" - fi -else - if test "$GCC" = yes; then - CFLAGS="-O2" - else - CFLAGS= - fi -fi -{ echo "$as_me:$LINENO: checking for $CC option to accept ISO C89" >&5 -echo $ECHO_N "checking for $CC option to accept ISO C89... $ECHO_C" >&6; } -if test "${ac_cv_prog_cc_c89+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_cv_prog_cc_c89=no -ac_save_CC=$CC -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include -#include -#include -#include -/* Most of the following tests are stolen from RCS 5.7's src/conf.sh. */ -struct buf { int x; }; -FILE * (*rcsopen) (struct buf *, struct stat *, int); -static char *e (p, i) - char **p; - int i; -{ - return p[i]; -} -static char *f (char * (*g) (char **, int), char **p, ...) -{ - char *s; - va_list v; - va_start (v,p); - s = g (p, va_arg (v,int)); - va_end (v); - return s; -} - -/* OSF 4.0 Compaq cc is some sort of almost-ANSI by default. It has - function prototypes and stuff, but not '\xHH' hex character constants. - These don't provoke an error unfortunately, instead are silently treated - as 'x'. The following induces an error, until -std is added to get - proper ANSI mode. Curiously '\x00'!='x' always comes out true, for an - array size at least. It's necessary to write '\x00'==0 to get something - that's true only with -std. */ -int osf4_cc_array ['\x00' == 0 ? 1 : -1]; - -/* IBM C 6 for AIX is almost-ANSI by default, but it replaces macro parameters - inside strings and character constants. */ -#define FOO(x) 'x' -int xlc6_cc_array[FOO(a) == 'x' ? 1 : -1]; - -int test (int i, double x); -struct s1 {int (*f) (int a);}; -struct s2 {int (*f) (double a);}; -int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int); -int argc; -char **argv; -int -main () -{ -return f (e, argv, 0) != argv[0] || f (e, argv, 1) != argv[1]; - ; - return 0; -} -_ACEOF -for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std \ - -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__" -do - CC="$ac_save_CC $ac_arg" - rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_cv_prog_cc_c89=$ac_arg -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - -fi - -rm -f core conftest.err conftest.$ac_objext - test "x$ac_cv_prog_cc_c89" != "xno" && break -done -rm -f conftest.$ac_ext -CC=$ac_save_CC - -fi -# AC_CACHE_VAL -case "x$ac_cv_prog_cc_c89" in - x) - { echo "$as_me:$LINENO: result: none needed" >&5 -echo "${ECHO_T}none needed" >&6; } ;; - xno) - { echo "$as_me:$LINENO: result: unsupported" >&5 -echo "${ECHO_T}unsupported" >&6; } ;; - *) - CC="$CC $ac_cv_prog_cc_c89" - { echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c89" >&5 -echo "${ECHO_T}$ac_cv_prog_cc_c89" >&6; } ;; -esac - - -ac_ext=c -ac_cpp='$CPP $CPPFLAGS' -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_c_compiler_gnu - - -# Checks for libraries. - -# Checks for header files. - -ac_ext=c -ac_cpp='$CPP $CPPFLAGS' -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_c_compiler_gnu -{ echo "$as_me:$LINENO: checking how to run the C preprocessor" >&5 -echo $ECHO_N "checking how to run the C preprocessor... $ECHO_C" >&6; } -# On Suns, sometimes $CPP names a directory. -if test -n "$CPP" && test -d "$CPP"; then - CPP= -fi -if test -z "$CPP"; then - if test "${ac_cv_prog_CPP+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - # Double quotes because CPP needs to be expanded - for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp" - do - ac_preproc_ok=false -for ac_c_preproc_warn_flag in '' yes -do - # Use a header file that comes with gcc, so configuring glibc - # with a fresh cross-compiler works. - # Prefer to if __STDC__ is defined, since - # exists even on freestanding compilers. - # On the NeXT, cc -E runs the code through the compiler's parser, - # not just through cpp. "Syntax error" is here to catch this case. - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#ifdef __STDC__ -# include -#else -# include -#endif - Syntax error -_ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then - : -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - # Broken: fails on valid input. -continue -fi - -rm -f conftest.err conftest.$ac_ext - - # OK, works on sane cases. Now check whether nonexistent headers - # can be detected and how. - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include -_ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then - # Broken: success on invalid input. -continue -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - # Passes both tests. -ac_preproc_ok=: -break -fi - -rm -f conftest.err conftest.$ac_ext - -done -# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. -rm -f conftest.err conftest.$ac_ext -if $ac_preproc_ok; then - break -fi - - done - ac_cv_prog_CPP=$CPP - -fi - CPP=$ac_cv_prog_CPP -else - ac_cv_prog_CPP=$CPP -fi -{ echo "$as_me:$LINENO: result: $CPP" >&5 -echo "${ECHO_T}$CPP" >&6; } -ac_preproc_ok=false -for ac_c_preproc_warn_flag in '' yes -do - # Use a header file that comes with gcc, so configuring glibc - # with a fresh cross-compiler works. - # Prefer to if __STDC__ is defined, since - # exists even on freestanding compilers. - # On the NeXT, cc -E runs the code through the compiler's parser, - # not just through cpp. "Syntax error" is here to catch this case. - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#ifdef __STDC__ -# include -#else -# include -#endif - Syntax error -_ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then - : -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - # Broken: fails on valid input. -continue -fi - -rm -f conftest.err conftest.$ac_ext - - # OK, works on sane cases. Now check whether nonexistent headers - # can be detected and how. - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include -_ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then - # Broken: success on invalid input. -continue -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - # Passes both tests. -ac_preproc_ok=: -break -fi - -rm -f conftest.err conftest.$ac_ext - -done -# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. -rm -f conftest.err conftest.$ac_ext -if $ac_preproc_ok; then - : -else - { { echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity check -See \`config.log' for more details." >&5 -echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check -See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; } -fi - -ac_ext=c -ac_cpp='$CPP $CPPFLAGS' -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_c_compiler_gnu - - -{ echo "$as_me:$LINENO: checking for grep that handles long lines and -e" >&5 -echo $ECHO_N "checking for grep that handles long lines and -e... $ECHO_C" >&6; } -if test "${ac_cv_path_GREP+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - # Extract the first word of "grep ggrep" to use in msg output -if test -z "$GREP"; then -set dummy grep ggrep; ac_prog_name=$2 -if test "${ac_cv_path_GREP+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_path_GREP_found=false -# Loop through the user's path and test for each of PROGNAME-LIST -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_prog in grep ggrep; do - for ac_exec_ext in '' $ac_executable_extensions; do - ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext" - { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue - # Check for GNU ac_path_GREP and select it if it is found. - # Check for GNU $ac_path_GREP -case `"$ac_path_GREP" --version 2>&1` in -*GNU*) - ac_cv_path_GREP="$ac_path_GREP" ac_path_GREP_found=:;; -*) - ac_count=0 - echo $ECHO_N "0123456789$ECHO_C" >"conftest.in" - while : - do - cat "conftest.in" "conftest.in" >"conftest.tmp" - mv "conftest.tmp" "conftest.in" - cp "conftest.in" "conftest.nl" - echo 'GREP' >> "conftest.nl" - "$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break - diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break - ac_count=`expr $ac_count + 1` - if test $ac_count -gt ${ac_path_GREP_max-0}; then - # Best one so far, save it but keep looking for a better one - ac_cv_path_GREP="$ac_path_GREP" - ac_path_GREP_max=$ac_count - fi - # 10*(2^10) chars as input seems more than enough - test $ac_count -gt 10 && break - done - rm -f conftest.in conftest.tmp conftest.nl conftest.out;; -esac - - - $ac_path_GREP_found && break 3 - done -done - -done -IFS=$as_save_IFS - - -fi - -GREP="$ac_cv_path_GREP" -if test -z "$GREP"; then - { { echo "$as_me:$LINENO: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5 -echo "$as_me: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;} - { (exit 1); exit 1; }; } -fi - -else - ac_cv_path_GREP=$GREP -fi - - -fi -{ echo "$as_me:$LINENO: result: $ac_cv_path_GREP" >&5 -echo "${ECHO_T}$ac_cv_path_GREP" >&6; } - GREP="$ac_cv_path_GREP" - - -{ echo "$as_me:$LINENO: checking for egrep" >&5 -echo $ECHO_N "checking for egrep... $ECHO_C" >&6; } -if test "${ac_cv_path_EGREP+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if echo a | $GREP -E '(a|b)' >/dev/null 2>&1 - then ac_cv_path_EGREP="$GREP -E" - else - # Extract the first word of "egrep" to use in msg output -if test -z "$EGREP"; then -set dummy egrep; ac_prog_name=$2 -if test "${ac_cv_path_EGREP+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_path_EGREP_found=false -# Loop through the user's path and test for each of PROGNAME-LIST -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_prog in egrep; do - for ac_exec_ext in '' $ac_executable_extensions; do - ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext" - { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue - # Check for GNU ac_path_EGREP and select it if it is found. - # Check for GNU $ac_path_EGREP -case `"$ac_path_EGREP" --version 2>&1` in -*GNU*) - ac_cv_path_EGREP="$ac_path_EGREP" ac_path_EGREP_found=:;; -*) - ac_count=0 - echo $ECHO_N "0123456789$ECHO_C" >"conftest.in" - while : - do - cat "conftest.in" "conftest.in" >"conftest.tmp" - mv "conftest.tmp" "conftest.in" - cp "conftest.in" "conftest.nl" - echo 'EGREP' >> "conftest.nl" - "$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break - diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break - ac_count=`expr $ac_count + 1` - if test $ac_count -gt ${ac_path_EGREP_max-0}; then - # Best one so far, save it but keep looking for a better one - ac_cv_path_EGREP="$ac_path_EGREP" - ac_path_EGREP_max=$ac_count - fi - # 10*(2^10) chars as input seems more than enough - test $ac_count -gt 10 && break - done - rm -f conftest.in conftest.tmp conftest.nl conftest.out;; -esac - - - $ac_path_EGREP_found && break 3 - done -done - -done -IFS=$as_save_IFS - - -fi - -EGREP="$ac_cv_path_EGREP" -if test -z "$EGREP"; then - { { echo "$as_me:$LINENO: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5 -echo "$as_me: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;} - { (exit 1); exit 1; }; } -fi - -else - ac_cv_path_EGREP=$EGREP -fi - - - fi -fi -{ echo "$as_me:$LINENO: result: $ac_cv_path_EGREP" >&5 -echo "${ECHO_T}$ac_cv_path_EGREP" >&6; } - EGREP="$ac_cv_path_EGREP" - - -{ echo "$as_me:$LINENO: checking for ANSI C header files" >&5 -echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6; } -if test "${ac_cv_header_stdc+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include -#include -#include -#include - -int -main () -{ - - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_cv_header_stdc=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_header_stdc=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - -if test $ac_cv_header_stdc = yes; then - # SunOS 4.x string.h does not declare mem*, contrary to ANSI. - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include - -_ACEOF -if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - $EGREP "memchr" >/dev/null 2>&1; then - : -else - ac_cv_header_stdc=no -fi -rm -f conftest* - -fi - -if test $ac_cv_header_stdc = yes; then - # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include - -_ACEOF -if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - $EGREP "free" >/dev/null 2>&1; then - : -else - ac_cv_header_stdc=no -fi -rm -f conftest* - -fi - -if test $ac_cv_header_stdc = yes; then - # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi. - if test "$cross_compiling" = yes; then - : -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include -#include -#if ((' ' & 0x0FF) == 0x020) -# define ISLOWER(c) ('a' <= (c) && (c) <= 'z') -# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c)) -#else -# define ISLOWER(c) \ - (('a' <= (c) && (c) <= 'i') \ - || ('j' <= (c) && (c) <= 'r') \ - || ('s' <= (c) && (c) <= 'z')) -# define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c)) -#endif - -#define XOR(e, f) (((e) && !(f)) || (!(e) && (f))) -int -main () -{ - int i; - for (i = 0; i < 256; i++) - if (XOR (islower (i), ISLOWER (i)) - || toupper (i) != TOUPPER (i)) - return 2; - return 0; -} -_ACEOF -rm -f conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - : -else - echo "$as_me: program exited with status $ac_status" >&5 -echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -( exit $ac_status ) -ac_cv_header_stdc=no -fi -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext -fi - - -fi -fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5 -echo "${ECHO_T}$ac_cv_header_stdc" >&6; } -if test $ac_cv_header_stdc = yes; then - -cat >>confdefs.h <<\_ACEOF -#define STDC_HEADERS 1 -_ACEOF - -fi - -# On IRIX 5.3, sys/types and inttypes.h are conflicting. - - - - - - - - - -for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \ - inttypes.h stdint.h unistd.h -do -as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -{ echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default - -#include <$ac_header> -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - eval "$as_ac_Header=yes" -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - eval "$as_ac_Header=no" -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi -ac_res=`eval echo '${'$as_ac_Header'}'` - { echo "$as_me:$LINENO: result: $ac_res" >&5 -echo "${ECHO_T}$ac_res" >&6; } -if test `eval echo '${'$as_ac_Header'}'` = yes; then - cat >>confdefs.h <<_ACEOF -#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 -_ACEOF - -fi - -done - - - - - - - - - - - - - - - - - -for ac_header in arpa/inet.h sys/utsname.h pwd.h fcntl.h limits.h nlist.h stdlib.h string.h sys/ioctl.h termios.h unistd.h utmp.h term.h ncurses/term.h process.h -do -as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - { echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -fi -ac_res=`eval echo '${'$as_ac_Header'}'` - { echo "$as_me:$LINENO: result: $ac_res" >&5 -echo "${ECHO_T}$ac_res" >&6; } -else - # Is the header compilable? -{ echo "$as_me:$LINENO: checking $ac_header usability" >&5 -echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default -#include <$ac_header> -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_header_compiler=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_compiler=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6; } - -# Is the header present? -{ echo "$as_me:$LINENO: checking $ac_header presence" >&5 -echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include <$ac_header> -_ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then - ac_header_preproc=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_preproc=no -fi - -rm -f conftest.err conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6; } - -# So? What about this header? -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in - yes:no: ) - { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 -echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 -echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes - ;; - no:yes:* ) - { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 -echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 -echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 -echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 -echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} - ( cat <<\_ASBOX -## ------------------------------------ ## -## Report this to yendor@rogueforge.net ## -## ------------------------------------ ## -_ASBOX - ) | sed "s/^/$as_me: WARNING: /" >&2 - ;; -esac -{ echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - eval "$as_ac_Header=\$ac_header_preproc" -fi -ac_res=`eval echo '${'$as_ac_Header'}'` - { echo "$as_me:$LINENO: result: $ac_res" >&5 -echo "${ECHO_T}$ac_res" >&6; } - -fi -if test `eval echo '${'$as_ac_Header'}'` = yes; then - cat >>confdefs.h <<_ACEOF -#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 -_ACEOF - -fi - -done - - -# Checks for typedefs, structures, and compiler characteristics. -{ echo "$as_me:$LINENO: checking for stdbool.h that conforms to C99" >&5 -echo $ECHO_N "checking for stdbool.h that conforms to C99... $ECHO_C" >&6; } -if test "${ac_cv_header_stdbool_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -#include -#ifndef bool - "error: bool is not defined" -#endif -#ifndef false - "error: false is not defined" -#endif -#if false - "error: false is not 0" -#endif -#ifndef true - "error: true is not defined" -#endif -#if true != 1 - "error: true is not 1" -#endif -#ifndef __bool_true_false_are_defined - "error: __bool_true_false_are_defined is not defined" -#endif - - struct s { _Bool s: 1; _Bool t; } s; - - char a[true == 1 ? 1 : -1]; - char b[false == 0 ? 1 : -1]; - char c[__bool_true_false_are_defined == 1 ? 1 : -1]; - char d[(bool) 0.5 == true ? 1 : -1]; - bool e = &s; - char f[(_Bool) 0.0 == false ? 1 : -1]; - char g[true]; - char h[sizeof (_Bool)]; - char i[sizeof s.t]; - enum { j = false, k = true, l = false * true, m = true * 256 }; - _Bool n[m]; - char o[sizeof n == m * sizeof n[0] ? 1 : -1]; - char p[-1 - (_Bool) 0 < 0 && -1 - (bool) 0 < 0 ? 1 : -1]; -# if defined __xlc__ || defined __GNUC__ - /* Catch a bug in IBM AIX xlc compiler version 6.0.0.0 - reported by James Lemley on 2005-10-05; see - http://lists.gnu.org/archive/html/bug-coreutils/2005-10/msg00086.html - This test is not quite right, since xlc is allowed to - reject this program, as the initializer for xlcbug is - not one of the forms that C requires support for. - However, doing the test right would require a runtime - test, and that would make cross-compilation harder. - Let us hope that IBM fixes the xlc bug, and also adds - support for this kind of constant expression. In the - meantime, this test will reject xlc, which is OK, since - our stdbool.h substitute should suffice. We also test - this with GCC, where it should work, to detect more - quickly whether someone messes up the test in the - future. */ - char digs[] = "0123456789"; - int xlcbug = 1 / (&(digs + 5)[-2 + (bool) 1] == &digs[4] ? 1 : -1); -# endif - /* Catch a bug in an HP-UX C compiler. See - http://gcc.gnu.org/ml/gcc-patches/2003-12/msg02303.html - http://lists.gnu.org/archive/html/bug-coreutils/2005-11/msg00161.html - */ - _Bool q = true; - _Bool *pq = &q; - -int -main () -{ - - *pq |= q; - *pq |= ! q; - /* Refer to every declared value, to avoid compiler optimizations. */ - return (!a + !b + !c + !d + !e + !f + !g + !h + !i + !!j + !k + !!l - + !m + !n + !o + !p + !q + !pq); - - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_cv_header_stdbool_h=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_header_stdbool_h=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_stdbool_h" >&5 -echo "${ECHO_T}$ac_cv_header_stdbool_h" >&6; } -{ echo "$as_me:$LINENO: checking for _Bool" >&5 -echo $ECHO_N "checking for _Bool... $ECHO_C" >&6; } -if test "${ac_cv_type__Bool+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default -typedef _Bool ac__type_new_; -int -main () -{ -if ((ac__type_new_ *) 0) - return 0; -if (sizeof (ac__type_new_)) - return 0; - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_cv_type__Bool=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_type__Bool=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi -{ echo "$as_me:$LINENO: result: $ac_cv_type__Bool" >&5 -echo "${ECHO_T}$ac_cv_type__Bool" >&6; } -if test $ac_cv_type__Bool = yes; then - -cat >>confdefs.h <<_ACEOF -#define HAVE__BOOL 1 -_ACEOF - - -fi - -if test $ac_cv_header_stdbool_h = yes; then - -cat >>confdefs.h <<\_ACEOF -#define HAVE_STDBOOL_H 1 -_ACEOF - -fi - -{ echo "$as_me:$LINENO: checking for an ANSI C-conforming const" >&5 -echo $ECHO_N "checking for an ANSI C-conforming const... $ECHO_C" >&6; } -if test "${ac_cv_c_const+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -int -main () -{ -/* FIXME: Include the comments suggested by Paul. */ -#ifndef __cplusplus - /* Ultrix mips cc rejects this. */ - typedef int charset[2]; - const charset cs; - /* SunOS 4.1.1 cc rejects this. */ - char const *const *pcpcc; - char **ppc; - /* NEC SVR4.0.2 mips cc rejects this. */ - struct point {int x, y;}; - static struct point const zero = {0,0}; - /* AIX XL C 1.02.0.0 rejects this. - It does not let you subtract one const X* pointer from another in - an arm of an if-expression whose if-part is not a constant - expression */ - const char *g = "string"; - pcpcc = &g + (g ? g-g : 0); - /* HPUX 7.0 cc rejects these. */ - ++pcpcc; - ppc = (char**) pcpcc; - pcpcc = (char const *const *) ppc; - { /* SCO 3.2v4 cc rejects this. */ - char *t; - char const *s = 0 ? (char *) 0 : (char const *) 0; - - *t++ = 0; - if (s) return 0; - } - { /* Someone thinks the Sun supposedly-ANSI compiler will reject this. */ - int x[] = {25, 17}; - const int *foo = &x[0]; - ++foo; - } - { /* Sun SC1.0 ANSI compiler rejects this -- but not the above. */ - typedef const int *iptr; - iptr p = 0; - ++p; - } - { /* AIX XL C 1.02.0.0 rejects this saying - "k.c", line 2.27: 1506-025 (S) Operand must be a modifiable lvalue. */ - struct s { int j; const int *ap[3]; }; - struct s *b; b->j = 5; - } - { /* ULTRIX-32 V3.1 (Rev 9) vcc rejects this */ - const int foo = 10; - if (!foo) return 0; - } - return !cs[0] && !zero.x; -#endif - - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_cv_c_const=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_c_const=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi -{ echo "$as_me:$LINENO: result: $ac_cv_c_const" >&5 -echo "${ECHO_T}$ac_cv_c_const" >&6; } -if test $ac_cv_c_const = no; then - -cat >>confdefs.h <<\_ACEOF -#define const -_ACEOF - -fi - -{ echo "$as_me:$LINENO: checking for uid_t in sys/types.h" >&5 -echo $ECHO_N "checking for uid_t in sys/types.h... $ECHO_C" >&6; } -if test "${ac_cv_type_uid_t+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include - -_ACEOF -if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - $EGREP "uid_t" >/dev/null 2>&1; then - ac_cv_type_uid_t=yes -else - ac_cv_type_uid_t=no -fi -rm -f conftest* - -fi -{ echo "$as_me:$LINENO: result: $ac_cv_type_uid_t" >&5 -echo "${ECHO_T}$ac_cv_type_uid_t" >&6; } -if test $ac_cv_type_uid_t = no; then - -cat >>confdefs.h <<\_ACEOF -#define uid_t int -_ACEOF - - -cat >>confdefs.h <<\_ACEOF -#define gid_t int -_ACEOF - -fi - -{ echo "$as_me:$LINENO: checking for size_t" >&5 -echo $ECHO_N "checking for size_t... $ECHO_C" >&6; } -if test "${ac_cv_type_size_t+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default -typedef size_t ac__type_new_; -int -main () -{ -if ((ac__type_new_ *) 0) - return 0; -if (sizeof (ac__type_new_)) - return 0; - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_cv_type_size_t=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_type_size_t=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi -{ echo "$as_me:$LINENO: result: $ac_cv_type_size_t" >&5 -echo "${ECHO_T}$ac_cv_type_size_t" >&6; } -if test $ac_cv_type_size_t = yes; then - : -else - -cat >>confdefs.h <<_ACEOF -#define size_t unsigned int -_ACEOF - -fi - -{ echo "$as_me:$LINENO: checking whether struct tm is in sys/time.h or time.h" >&5 -echo $ECHO_N "checking whether struct tm is in sys/time.h or time.h... $ECHO_C" >&6; } -if test "${ac_cv_struct_tm+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include -#include - -int -main () -{ -struct tm tm; - int *p = &tm.tm_sec; - return !p; - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_cv_struct_tm=time.h -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_struct_tm=sys/time.h -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi -{ echo "$as_me:$LINENO: result: $ac_cv_struct_tm" >&5 -echo "${ECHO_T}$ac_cv_struct_tm" >&6; } -if test $ac_cv_struct_tm = sys/time.h; then - -cat >>confdefs.h <<\_ACEOF -#define TM_IN_SYS_TIME 1 -_ACEOF - -fi - - -# Check whether --with-ncurses was given. -if test "${with_ncurses+set}" = set; then - withval=$with_ncurses; -fi - - mp_save_LIBS="$LIBS" - CURSES_LIB="" - if test "$with_ncurses" != yes - then - { echo "$as_me:$LINENO: checking for working curses" >&5 -echo $ECHO_N "checking for working curses... $ECHO_C" >&6; } -if test "${mp_cv_curses+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - LIBS="$LIBS -lcurses" - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include -int -main () -{ -chtype a; int b=A_STANDOUT, c=KEY_LEFT; initscr(); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then - mp_cv_curses=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - mp_cv_curses=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -fi -{ echo "$as_me:$LINENO: result: $mp_cv_curses" >&5 -echo "${ECHO_T}$mp_cv_curses" >&6; } - if test "$mp_cv_curses" = yes - then - -cat >>confdefs.h <<\_ACEOF -#define HAVE_CURSES_H 1 -_ACEOF - - #AC_DEFINE(HAVE_CURSES_H) - CURSES_LIB="-lcurses" - fi - fi - if test ! "$CURSES_LIB" - then - { echo "$as_me:$LINENO: checking for working ncurses" >&5 -echo $ECHO_N "checking for working ncurses... $ECHO_C" >&6; } -if test "${mp_cv_ncurses+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - LIBS="$mp_save_LIBS -lncurses" - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include -int -main () -{ -chtype a; int b=A_STANDOUT, c=KEY_LEFT; initscr(); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then - mp_cv_ncurses=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - mp_cv_ncurses=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -fi -{ echo "$as_me:$LINENO: result: $mp_cv_ncurses" >&5 -echo "${ECHO_T}$mp_cv_ncurses" >&6; } - if test "$mp_cv_ncurses" = yes - then - -cat >>confdefs.h <<\_ACEOF -#define HAVE_NCURSES_H 1 -_ACEOF - - CURSES_LIB="-lncurses" - fi - fi - if test ! "$CURSES_LIB" - then - { echo "$as_me:$LINENO: checking for working pdcurses" >&5 -echo $ECHO_N "checking for working pdcurses... $ECHO_C" >&6; } -if test "${mp_cv_pdcurses+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - LIBS="$mp_save_LIBS -lpdcurses" - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include -int -main () -{ -chtype a; int b=A_STANDOUT, c=KEY_LEFT; initscr(); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then - mp_cv_pdcurses=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - mp_cv_pdcurses=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -fi -{ echo "$as_me:$LINENO: result: $mp_cv_pdcurses" >&5 -echo "${ECHO_T}$mp_cv_pdcurses" >&6; } - if test "$mp_cv_pdcurses" = yes - then - -cat >>confdefs.h <<\_ACEOF -#define HAVE_CURSES_H 1 -_ACEOF - - CURSES_LIB="-lpdcurses" - fi - fi - if test ! "$CURSES_LIB" - then - { echo "$as_me:$LINENO: checking for working pdcur" >&5 -echo $ECHO_N "checking for working pdcur... $ECHO_C" >&6; } -if test "${mp_cv_pdcur+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - LIBS="$mp_save_LIBS -lpdcur" - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include -int -main () -{ -chtype a; int b=A_STANDOUT, c=KEY_LEFT; initscr(); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then - mp_cv_pdcur=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - mp_cv_pdcur=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -fi -{ echo "$as_me:$LINENO: result: $mp_cv_pdcur" >&5 -echo "${ECHO_T}$mp_cv_pdcur" >&6; } - if test "$mp_cv_pdcur" = yes - then - -cat >>confdefs.h <<\_ACEOF -#define HAVE_CURSES_H 1 -_ACEOF - - CURSES_LIB="-lpdcur" - fi - fi - if test ! "$CURSES_LIB" - then - { echo "$as_me:$LINENO: checking for working peer pdcurses" >&5 -echo $ECHO_N "checking for working peer pdcurses... $ECHO_C" >&6; } -if test "${mp_cv_lpdcurses+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - LIBS="$mp_save_LIBS ../pdcurses/pdcurses.a" - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include "../pdcurses/curses.h" -int -main () -{ -chtype a; int b=A_STANDOUT, c=KEY_LEFT; initscr(); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then - mp_cv_lpdcurses=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - mp_cv_lpdcurses=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -fi -{ echo "$as_me:$LINENO: result: $mp_cv_lpdcurses" >&5 -echo "${ECHO_T}$mp_cv_lpdcurses" >&6; } - if test "$mp_cv_lpdcurses" = yes - then - -cat >>confdefs.h <<\_ACEOF -#define HAVE_CURSES_H 1 -_ACEOF - - CURSES_LIB="../pdcurses/pdcurses.a" - - if test "x$CPPFLAGS" = "x"; then - test "x$silent" != "xyes" && echo " setting CPPFLAGS to \""-I../pdcurses"\"" - CPPFLAGS=""-I../pdcurses"" - else - apr_addto_bugger=""-I../pdcurses"" - for i in $apr_addto_bugger; do - apr_addto_duplicate="0" - for j in $CPPFLAGS; do - if test "x$i" = "x$j"; then - apr_addto_duplicate="1" - break - fi - done - if test $apr_addto_duplicate = "0"; then - test "x$silent" != "xyes" && echo " adding \"$i\" to CPPFLAGS" - CPPFLAGS="$CPPFLAGS $i" - fi - done - fi - - fi - fi - { echo "$as_me:$LINENO: checking for ESCDELAY variable" >&5 -echo $ECHO_N "checking for ESCDELAY variable... $ECHO_C" >&6; } -if test "${mc_cv_ncurses_escdelay+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -int -main () -{ - - extern int ESCDELAY; - ESCDELAY = 0; - - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then - mc_cv_ncurses_escdelay=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - mc_cv_ncurses_escdelay=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext - -fi -{ echo "$as_me:$LINENO: result: $mc_cv_ncurses_escdelay" >&5 -echo "${ECHO_T}$mc_cv_ncurses_escdelay" >&6; } - if test "$mc_cv_ncurses_escdelay" = yes; then - -cat >>confdefs.h <<\_ACEOF -#define HAVE_ESCDELAY 1 -_ACEOF - - fi - if test ! "$CURSES_LIB" ; then - LIBS="$mp_save_LIBS" - fi - -# Checks for library functions. -{ echo "$as_me:$LINENO: checking for pid_t" >&5 -echo $ECHO_N "checking for pid_t... $ECHO_C" >&6; } -if test "${ac_cv_type_pid_t+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default -typedef pid_t ac__type_new_; -int -main () -{ -if ((ac__type_new_ *) 0) - return 0; -if (sizeof (ac__type_new_)) - return 0; - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_cv_type_pid_t=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_type_pid_t=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi -{ echo "$as_me:$LINENO: result: $ac_cv_type_pid_t" >&5 -echo "${ECHO_T}$ac_cv_type_pid_t" >&6; } -if test $ac_cv_type_pid_t = yes; then - : -else - -cat >>confdefs.h <<_ACEOF -#define pid_t int -_ACEOF - -fi - - -for ac_header in vfork.h -do -as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - { echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -fi -ac_res=`eval echo '${'$as_ac_Header'}'` - { echo "$as_me:$LINENO: result: $ac_res" >&5 -echo "${ECHO_T}$ac_res" >&6; } -else - # Is the header compilable? -{ echo "$as_me:$LINENO: checking $ac_header usability" >&5 -echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default -#include <$ac_header> -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_header_compiler=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_compiler=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6; } - -# Is the header present? -{ echo "$as_me:$LINENO: checking $ac_header presence" >&5 -echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include <$ac_header> -_ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then - ac_header_preproc=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_preproc=no -fi - -rm -f conftest.err conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6; } - -# So? What about this header? -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in - yes:no: ) - { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 -echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 -echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes - ;; - no:yes:* ) - { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 -echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 -echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 -echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 -echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} - ( cat <<\_ASBOX -## ------------------------------------ ## -## Report this to yendor@rogueforge.net ## -## ------------------------------------ ## -_ASBOX - ) | sed "s/^/$as_me: WARNING: /" >&2 - ;; -esac -{ echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - eval "$as_ac_Header=\$ac_header_preproc" -fi -ac_res=`eval echo '${'$as_ac_Header'}'` - { echo "$as_me:$LINENO: result: $ac_res" >&5 -echo "${ECHO_T}$ac_res" >&6; } - -fi -if test `eval echo '${'$as_ac_Header'}'` = yes; then - cat >>confdefs.h <<_ACEOF -#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 -_ACEOF - -fi - -done - - - -for ac_func in fork vfork -do -as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` -{ echo "$as_me:$LINENO: checking for $ac_func" >&5 -echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; } -if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -/* Define $ac_func to an innocuous variant, in case declares $ac_func. - For example, HP-UX 11i declares gettimeofday. */ -#define $ac_func innocuous_$ac_func - -/* System header to define __stub macros and hopefully few prototypes, - which can conflict with char $ac_func (); below. - Prefer to if __STDC__ is defined, since - exists even on freestanding compilers. */ - -#ifdef __STDC__ -# include -#else -# include -#endif - -#undef $ac_func - -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char $ac_func (); -/* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ -#if defined __stub_$ac_func || defined __stub___$ac_func -choke me -#endif - -int -main () -{ -return $ac_func (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then - eval "$as_ac_var=yes" -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - eval "$as_ac_var=no" -fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -fi -ac_res=`eval echo '${'$as_ac_var'}'` - { echo "$as_me:$LINENO: result: $ac_res" >&5 -echo "${ECHO_T}$ac_res" >&6; } -if test `eval echo '${'$as_ac_var'}'` = yes; then - cat >>confdefs.h <<_ACEOF -#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 -_ACEOF - -fi -done - -if test "x$ac_cv_func_fork" = xyes; then - { echo "$as_me:$LINENO: checking for working fork" >&5 -echo $ECHO_N "checking for working fork... $ECHO_C" >&6; } -if test "${ac_cv_func_fork_works+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test "$cross_compiling" = yes; then - ac_cv_func_fork_works=cross -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default -int -main () -{ - - /* By Ruediger Kuhlmann. */ - return fork () < 0; - - ; - return 0; -} -_ACEOF -rm -f conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_func_fork_works=yes -else - echo "$as_me: program exited with status $ac_status" >&5 -echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -( exit $ac_status ) -ac_cv_func_fork_works=no -fi -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext -fi - - -fi -{ echo "$as_me:$LINENO: result: $ac_cv_func_fork_works" >&5 -echo "${ECHO_T}$ac_cv_func_fork_works" >&6; } - -else - ac_cv_func_fork_works=$ac_cv_func_fork -fi -if test "x$ac_cv_func_fork_works" = xcross; then - case $host in - *-*-amigaos* | *-*-msdosdjgpp*) - # Override, as these systems have only a dummy fork() stub - ac_cv_func_fork_works=no - ;; - *) - ac_cv_func_fork_works=yes - ;; - esac - { echo "$as_me:$LINENO: WARNING: result $ac_cv_func_fork_works guessed because of cross compilation" >&5 -echo "$as_me: WARNING: result $ac_cv_func_fork_works guessed because of cross compilation" >&2;} -fi -ac_cv_func_vfork_works=$ac_cv_func_vfork -if test "x$ac_cv_func_vfork" = xyes; then - { echo "$as_me:$LINENO: checking for working vfork" >&5 -echo $ECHO_N "checking for working vfork... $ECHO_C" >&6; } -if test "${ac_cv_func_vfork_works+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test "$cross_compiling" = yes; then - ac_cv_func_vfork_works=cross -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -/* Thanks to Paul Eggert for this test. */ -$ac_includes_default -#include -#ifdef HAVE_VFORK_H -# include -#endif -/* On some sparc systems, changes by the child to local and incoming - argument registers are propagated back to the parent. The compiler - is told about this with #include , but some compilers - (e.g. gcc -O) don't grok . Test for this by using a - static variable whose address is put into a register that is - clobbered by the vfork. */ -static void -#ifdef __cplusplus -sparc_address_test (int arg) -# else -sparc_address_test (arg) int arg; -#endif -{ - static pid_t child; - if (!child) { - child = vfork (); - if (child < 0) { - perror ("vfork"); - _exit(2); - } - if (!child) { - arg = getpid(); - write(-1, "", 0); - _exit (arg); - } - } -} - -int -main () -{ - pid_t parent = getpid (); - pid_t child; - - sparc_address_test (0); - - child = vfork (); - - if (child == 0) { - /* Here is another test for sparc vfork register problems. This - test uses lots of local variables, at least as many local - variables as main has allocated so far including compiler - temporaries. 4 locals are enough for gcc 1.40.3 on a Solaris - 4.1.3 sparc, but we use 8 to be safe. A buggy compiler should - reuse the register of parent for one of the local variables, - since it will think that parent can't possibly be used any more - in this routine. Assigning to the local variable will thus - munge parent in the parent process. */ - pid_t - p = getpid(), p1 = getpid(), p2 = getpid(), p3 = getpid(), - p4 = getpid(), p5 = getpid(), p6 = getpid(), p7 = getpid(); - /* Convince the compiler that p..p7 are live; otherwise, it might - use the same hardware register for all 8 local variables. */ - if (p != p1 || p != p2 || p != p3 || p != p4 - || p != p5 || p != p6 || p != p7) - _exit(1); - - /* On some systems (e.g. IRIX 3.3), vfork doesn't separate parent - from child file descriptors. If the child closes a descriptor - before it execs or exits, this munges the parent's descriptor - as well. Test for this by closing stdout in the child. */ - _exit(close(fileno(stdout)) != 0); - } else { - int status; - struct stat st; - - while (wait(&status) != child) - ; - return ( - /* Was there some problem with vforking? */ - child < 0 - - /* Did the child fail? (This shouldn't happen.) */ - || status - - /* Did the vfork/compiler bug occur? */ - || parent != getpid() - - /* Did the file descriptor bug occur? */ - || fstat(fileno(stdout), &st) != 0 - ); - } -} -_ACEOF -rm -f conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_func_vfork_works=yes -else - echo "$as_me: program exited with status $ac_status" >&5 -echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -( exit $ac_status ) -ac_cv_func_vfork_works=no -fi -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext -fi - - -fi -{ echo "$as_me:$LINENO: result: $ac_cv_func_vfork_works" >&5 -echo "${ECHO_T}$ac_cv_func_vfork_works" >&6; } - -fi; -if test "x$ac_cv_func_fork_works" = xcross; then - ac_cv_func_vfork_works=$ac_cv_func_vfork - { echo "$as_me:$LINENO: WARNING: result $ac_cv_func_vfork_works guessed because of cross compilation" >&5 -echo "$as_me: WARNING: result $ac_cv_func_vfork_works guessed because of cross compilation" >&2;} -fi - -if test "x$ac_cv_func_vfork_works" = xyes; then - -cat >>confdefs.h <<\_ACEOF -#define HAVE_WORKING_VFORK 1 -_ACEOF - -else - -cat >>confdefs.h <<\_ACEOF -#define vfork fork -_ACEOF - -fi -if test "x$ac_cv_func_fork_works" = xyes; then - -cat >>confdefs.h <<\_ACEOF -#define HAVE_WORKING_FORK 1 -_ACEOF - -fi - -if test $ac_cv_c_compiler_gnu = yes; then - { echo "$as_me:$LINENO: checking whether $CC needs -traditional" >&5 -echo $ECHO_N "checking whether $CC needs -traditional... $ECHO_C" >&6; } -if test "${ac_cv_prog_gcc_traditional+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_pattern="Autoconf.*'x'" - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include -Autoconf TIOCGETP -_ACEOF -if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - $EGREP "$ac_pattern" >/dev/null 2>&1; then - ac_cv_prog_gcc_traditional=yes -else - ac_cv_prog_gcc_traditional=no -fi -rm -f conftest* - - - if test $ac_cv_prog_gcc_traditional = no; then - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include -Autoconf TCGETA -_ACEOF -if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - $EGREP "$ac_pattern" >/dev/null 2>&1; then - ac_cv_prog_gcc_traditional=yes -fi -rm -f conftest* - - fi -fi -{ echo "$as_me:$LINENO: result: $ac_cv_prog_gcc_traditional" >&5 -echo "${ECHO_T}$ac_cv_prog_gcc_traditional" >&6; } - if test $ac_cv_prog_gcc_traditional = yes; then - CC="$CC -traditional" - fi -fi - -{ echo "$as_me:$LINENO: checking whether lstat dereferences a symlink specified with a trailing slash" >&5 -echo $ECHO_N "checking whether lstat dereferences a symlink specified with a trailing slash... $ECHO_C" >&6; } -if test "${ac_cv_func_lstat_dereferences_slashed_symlink+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - rm -f conftest.sym conftest.file -echo >conftest.file -if test "$as_ln_s" = "ln -s" && ln -s conftest.file conftest.sym; then - if test "$cross_compiling" = yes; then - ac_cv_func_lstat_dereferences_slashed_symlink=no -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default -int -main () -{ -struct stat sbuf; - /* Linux will dereference the symlink and fail. - That is better in the sense that it means we will not - have to compile and use the lstat wrapper. */ - return lstat ("conftest.sym/", &sbuf) == 0; - ; - return 0; -} -_ACEOF -rm -f conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_func_lstat_dereferences_slashed_symlink=yes -else - echo "$as_me: program exited with status $ac_status" >&5 -echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -( exit $ac_status ) -ac_cv_func_lstat_dereferences_slashed_symlink=no -fi -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext -fi - - -else - # If the `ln -s' command failed, then we probably don't even - # have an lstat function. - ac_cv_func_lstat_dereferences_slashed_symlink=no -fi -rm -f conftest.sym conftest.file - -fi -{ echo "$as_me:$LINENO: result: $ac_cv_func_lstat_dereferences_slashed_symlink" >&5 -echo "${ECHO_T}$ac_cv_func_lstat_dereferences_slashed_symlink" >&6; } - -test $ac_cv_func_lstat_dereferences_slashed_symlink = yes && - -cat >>confdefs.h <<_ACEOF -#define LSTAT_FOLLOWS_SLASHED_SYMLINK 1 -_ACEOF - - -if test $ac_cv_func_lstat_dereferences_slashed_symlink = no; then - case " $LIBOBJS " in - *" lstat.$ac_objext "* ) ;; - *) LIBOBJS="$LIBOBJS lstat.$ac_objext" - ;; -esac - -fi - -{ echo "$as_me:$LINENO: checking whether lstat accepts an empty string" >&5 -echo $ECHO_N "checking whether lstat accepts an empty string... $ECHO_C" >&6; } -if test "${ac_cv_func_lstat_empty_string_bug+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test "$cross_compiling" = yes; then - ac_cv_func_lstat_empty_string_bug=yes -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default -int -main () -{ -struct stat sbuf; - return lstat ("", &sbuf) == 0; - ; - return 0; -} -_ACEOF -rm -f conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_func_lstat_empty_string_bug=no -else - echo "$as_me: program exited with status $ac_status" >&5 -echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -( exit $ac_status ) -ac_cv_func_lstat_empty_string_bug=yes -fi -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext -fi - - -fi -{ echo "$as_me:$LINENO: result: $ac_cv_func_lstat_empty_string_bug" >&5 -echo "${ECHO_T}$ac_cv_func_lstat_empty_string_bug" >&6; } -if test $ac_cv_func_lstat_empty_string_bug = yes; then - case " $LIBOBJS " in - *" lstat.$ac_objext "* ) ;; - *) LIBOBJS="$LIBOBJS lstat.$ac_objext" - ;; -esac - - -cat >>confdefs.h <<_ACEOF -#define HAVE_LSTAT_EMPTY_STRING_BUG 1 -_ACEOF - -fi - -{ echo "$as_me:$LINENO: checking whether lstat dereferences a symlink specified with a trailing slash" >&5 -echo $ECHO_N "checking whether lstat dereferences a symlink specified with a trailing slash... $ECHO_C" >&6; } -if test "${ac_cv_func_lstat_dereferences_slashed_symlink+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - rm -f conftest.sym conftest.file -echo >conftest.file -if test "$as_ln_s" = "ln -s" && ln -s conftest.file conftest.sym; then - if test "$cross_compiling" = yes; then - ac_cv_func_lstat_dereferences_slashed_symlink=no -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default -int -main () -{ -struct stat sbuf; - /* Linux will dereference the symlink and fail. - That is better in the sense that it means we will not - have to compile and use the lstat wrapper. */ - return lstat ("conftest.sym/", &sbuf) == 0; - ; - return 0; -} -_ACEOF -rm -f conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_func_lstat_dereferences_slashed_symlink=yes -else - echo "$as_me: program exited with status $ac_status" >&5 -echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -( exit $ac_status ) -ac_cv_func_lstat_dereferences_slashed_symlink=no -fi -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext -fi - - -else - # If the `ln -s' command failed, then we probably don't even - # have an lstat function. - ac_cv_func_lstat_dereferences_slashed_symlink=no -fi -rm -f conftest.sym conftest.file - -fi -{ echo "$as_me:$LINENO: result: $ac_cv_func_lstat_dereferences_slashed_symlink" >&5 -echo "${ECHO_T}$ac_cv_func_lstat_dereferences_slashed_symlink" >&6; } - -test $ac_cv_func_lstat_dereferences_slashed_symlink = yes && - -cat >>confdefs.h <<_ACEOF -#define LSTAT_FOLLOWS_SLASHED_SYMLINK 1 -_ACEOF - - -if test $ac_cv_func_lstat_dereferences_slashed_symlink = no; then - case " $LIBOBJS " in - *" lstat.$ac_objext "* ) ;; - *) LIBOBJS="$LIBOBJS lstat.$ac_objext" - ;; -esac - -fi - -{ echo "$as_me:$LINENO: checking return type of signal handlers" >&5 -echo $ECHO_N "checking return type of signal handlers... $ECHO_C" >&6; } -if test "${ac_cv_type_signal+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include -#include - -int -main () -{ -return *(signal (0, 0)) (0) == 1; - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_cv_type_signal=int -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_type_signal=void -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi -{ echo "$as_me:$LINENO: result: $ac_cv_type_signal" >&5 -echo "${ECHO_T}$ac_cv_type_signal" >&6; } - -cat >>confdefs.h <<_ACEOF -#define RETSIGTYPE $ac_cv_type_signal -_ACEOF - - -{ echo "$as_me:$LINENO: checking whether stat accepts an empty string" >&5 -echo $ECHO_N "checking whether stat accepts an empty string... $ECHO_C" >&6; } -if test "${ac_cv_func_stat_empty_string_bug+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test "$cross_compiling" = yes; then - ac_cv_func_stat_empty_string_bug=yes -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default -int -main () -{ -struct stat sbuf; - return stat ("", &sbuf) == 0; - ; - return 0; -} -_ACEOF -rm -f conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_func_stat_empty_string_bug=no -else - echo "$as_me: program exited with status $ac_status" >&5 -echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -( exit $ac_status ) -ac_cv_func_stat_empty_string_bug=yes -fi -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext -fi - - -fi -{ echo "$as_me:$LINENO: result: $ac_cv_func_stat_empty_string_bug" >&5 -echo "${ECHO_T}$ac_cv_func_stat_empty_string_bug" >&6; } -if test $ac_cv_func_stat_empty_string_bug = yes; then - case " $LIBOBJS " in - *" stat.$ac_objext "* ) ;; - *) LIBOBJS="$LIBOBJS stat.$ac_objext" - ;; -esac - - -cat >>confdefs.h <<_ACEOF -#define HAVE_STAT_EMPTY_STRING_BUG 1 -_ACEOF - -fi - - -for ac_func in vprintf -do -as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` -{ echo "$as_me:$LINENO: checking for $ac_func" >&5 -echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; } -if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -/* Define $ac_func to an innocuous variant, in case declares $ac_func. - For example, HP-UX 11i declares gettimeofday. */ -#define $ac_func innocuous_$ac_func - -/* System header to define __stub macros and hopefully few prototypes, - which can conflict with char $ac_func (); below. - Prefer to if __STDC__ is defined, since - exists even on freestanding compilers. */ - -#ifdef __STDC__ -# include -#else -# include -#endif - -#undef $ac_func - -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char $ac_func (); -/* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ -#if defined __stub_$ac_func || defined __stub___$ac_func -choke me -#endif - -int -main () -{ -return $ac_func (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then - eval "$as_ac_var=yes" -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - eval "$as_ac_var=no" -fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -fi -ac_res=`eval echo '${'$as_ac_var'}'` - { echo "$as_me:$LINENO: result: $ac_res" >&5 -echo "${ECHO_T}$ac_res" >&6; } -if test `eval echo '${'$as_ac_var'}'` = yes; then - cat >>confdefs.h <<_ACEOF -#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 -_ACEOF - -{ echo "$as_me:$LINENO: checking for _doprnt" >&5 -echo $ECHO_N "checking for _doprnt... $ECHO_C" >&6; } -if test "${ac_cv_func__doprnt+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -/* Define _doprnt to an innocuous variant, in case declares _doprnt. - For example, HP-UX 11i declares gettimeofday. */ -#define _doprnt innocuous__doprnt - -/* System header to define __stub macros and hopefully few prototypes, - which can conflict with char _doprnt (); below. - Prefer to if __STDC__ is defined, since - exists even on freestanding compilers. */ - -#ifdef __STDC__ -# include -#else -# include -#endif - -#undef _doprnt - -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char _doprnt (); -/* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ -#if defined __stub__doprnt || defined __stub____doprnt -choke me -#endif - -int -main () -{ -return _doprnt (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then - ac_cv_func__doprnt=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_func__doprnt=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -fi -{ echo "$as_me:$LINENO: result: $ac_cv_func__doprnt" >&5 -echo "${ECHO_T}$ac_cv_func__doprnt" >&6; } -if test $ac_cv_func__doprnt = yes; then - -cat >>confdefs.h <<\_ACEOF -#define HAVE_DOPRNT 1 -_ACEOF - -fi - -fi -done - - - - - - - - - - - - - - - - - - - - - - - - -for ac_func in erasechar killchar alarm getpass memset setenv strchr nlist _spawnl spawnl getpwuid loadav getloadavg strerror setresgid setregid setgid setresuid setreuid setuid getuid getgid -do -as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` -{ echo "$as_me:$LINENO: checking for $ac_func" >&5 -echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; } -if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -/* Define $ac_func to an innocuous variant, in case declares $ac_func. - For example, HP-UX 11i declares gettimeofday. */ -#define $ac_func innocuous_$ac_func - -/* System header to define __stub macros and hopefully few prototypes, - which can conflict with char $ac_func (); below. - Prefer to if __STDC__ is defined, since - exists even on freestanding compilers. */ - -#ifdef __STDC__ -# include -#else -# include -#endif - -#undef $ac_func - -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char $ac_func (); -/* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ -#if defined __stub_$ac_func || defined __stub___$ac_func -choke me -#endif - -int -main () -{ -return $ac_func (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then - eval "$as_ac_var=yes" -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - eval "$as_ac_var=no" -fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -fi -ac_res=`eval echo '${'$as_ac_var'}'` - { echo "$as_me:$LINENO: result: $ac_res" >&5 -echo "${ECHO_T}$ac_res" >&6; } -if test `eval echo '${'$as_ac_var'}'` = yes; then - cat >>confdefs.h <<_ACEOF -#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 -_ACEOF - -fi -done - - -# Extract the first word of "nroff", so it can be a program name with args. -set dummy nroff; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_prog_NROFF+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test -n "$NROFF"; then - ac_cv_prog_NROFF="$NROFF" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_NROFF="nroff" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done -IFS=$as_save_IFS - -fi -fi -NROFF=$ac_cv_prog_NROFF -if test -n "$NROFF"; then - { echo "$as_me:$LINENO: result: $NROFF" >&5 -echo "${ECHO_T}$NROFF" >&6; } -else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } -fi - - -# Extract the first word of "groff", so it can be a program name with args. -set dummy groff; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_prog_GROFF+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test -n "$GROFF"; then - ac_cv_prog_GROFF="$GROFF" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_GROFF="groff" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done -IFS=$as_save_IFS - -fi -fi -GROFF=$ac_cv_prog_GROFF -if test -n "$GROFF"; then - { echo "$as_me:$LINENO: result: $GROFF" >&5 -echo "${ECHO_T}$GROFF" >&6; } -else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } -fi - - -# Extract the first word of "colcrt", so it can be a program name with args. -set dummy colcrt; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_prog_COLCRT+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test -n "$COLCRT"; then - ac_cv_prog_COLCRT="$COLCRT" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_COLCRT="colcrt" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done -IFS=$as_save_IFS - -fi -fi -COLCRT=$ac_cv_prog_COLCRT -if test -n "$COLCRT"; then - { echo "$as_me:$LINENO: result: $COLCRT" >&5 -echo "${ECHO_T}$COLCRT" >&6; } -else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } -fi - - -# Extract the first word of "tbl", so it can be a program name with args. -set dummy tbl; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_prog_TBL+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test -n "$TBL"; then - ac_cv_prog_TBL="$TBL" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_TBL="tbl" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done -IFS=$as_save_IFS - -fi -fi -TBL=$ac_cv_prog_TBL -if test -n "$TBL"; then - { echo "$as_me:$LINENO: result: $TBL" >&5 -echo "${ECHO_T}$TBL" >&6; } -else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } -fi - - -# Extract the first word of "sed", so it can be a program name with args. -set dummy sed; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_prog_SED+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test -n "$SED"; then - ac_cv_prog_SED="$SED" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_SED="sed" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done -IFS=$as_save_IFS - -fi -fi -SED=$ac_cv_prog_SED -if test -n "$SED"; then - { echo "$as_me:$LINENO: result: $SED" >&5 -echo "${ECHO_T}$SED" >&6; } -else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } -fi - - - - -# Check whether --with-program-name was given. -if test "${with_program_name+set}" = set; then - withval=$with_program_name; progname="$withval" -else - progname="rogue" -fi - -PROGRAM=$progname - - -# Check whether --enable-setgid was given. -if test "${enable_setgid+set}" = set; then - enableval=$enable_setgid; -fi - -{ echo "$as_me:$LINENO: checking if using setgid execute bit" >&5 -echo $ECHO_N "checking if using setgid execute bit... $ECHO_C" >&6; } -if test "x$enable_setgid" = "xno" ; then -GROUPOWNER= -elif test "x$enable_setgid" = "xyes" ; then -GROUPOWNER=games -elif test "x$enable_setgid" = "x" ; then -GROUPOWNER= -else -GROUPOWNER=$enable_setgid -fi - -if test "x$GROUPOWNER" != "x" ; then - -cat >>confdefs.h <<_ACEOF -#define GROUPOWNER $GROUPOWNER -_ACEOF - -{ echo "$as_me:$LINENO: result: $GROUPOWNER" >&5 -echo "${ECHO_T}$GROUPOWNER" >&6; } -else -{ echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } -fi - - - -# Check whether --enable-scorefile was given. -if test "${enable_scorefile+set}" = set; then - enableval=$enable_scorefile; -fi - -{ echo "$as_me:$LINENO: checking for scoreboard file" >&5 -echo $ECHO_N "checking for scoreboard file... $ECHO_C" >&6; } -if test "x$enable_scorefile" = "xno" ; then -SCOREFILE= -elif test "x$enable_scorefile" = "xyes" ; then -SCOREFILE=$progname.scr -elif test "x$enable_scorefile" = "x" ; then -SCOREFILE=$progname.scr -else -SCOREFILE=$enable_scorefile -fi - -if test "x$SCOREFILE" != "x" ; then - -cat >>confdefs.h <<_ACEOF -#define SCOREFILE "$SCOREFILE" -_ACEOF - -{ echo "$as_me:$LINENO: result: $SCOREFILE" >&5 -echo "${ECHO_T}$SCOREFILE" >&6; } -else -{ echo "$as_me:$LINENO: result: disabled" >&5 -echo "${ECHO_T}disabled" >&6; } -fi - - - -# Check whether --enable-lockfile was given. -if test "${enable_lockfile+set}" = set; then - enableval=$enable_lockfile; -fi - -{ echo "$as_me:$LINENO: checking for scoreboard lockfile file" >&5 -echo $ECHO_N "checking for scoreboard lockfile file... $ECHO_C" >&6; } -if test "x$enable_lockfile" = "xno" ; then -LOCKFILE= -elif test "x$enable_lockfile" = "xyes" ; then -LOCKFILE=$progname.lck -elif test "x$enable_lockfile" = "x" ; then -LOCKFILE=$progname.lck -else -LOCKFILE=$enable_lockfile -fi - -if test "x$LOCKFILE" != "x" ; then - -cat >>confdefs.h <<_ACEOF -#define LOCKFILE "$LOCKFILE" -_ACEOF - -{ echo "$as_me:$LINENO: result: $LOCKFILE" >&5 -echo "${ECHO_T}$LOCKFILE" >&6; } -else -{ echo "$as_me:$LINENO: result: disabled" >&5 -echo "${ECHO_T}disabled" >&6; } -fi - - - -# Check whether --enable-wizardmode was given. -if test "${enable_wizardmode+set}" = set; then - enableval=$enable_wizardmode; -fi - -{ echo "$as_me:$LINENO: checking if wizard mode is enabled" >&5 -echo $ECHO_N "checking if wizard mode is enabled... $ECHO_C" >&6; } -if test "x$enable_wizardmode" = "xno" ; then -{ echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } -elif test "x$enable_wizardmode" = "x" ; then -{ echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } -else - -cat >>confdefs.h <<\_ACEOF -#define MASTER -_ACEOF - -if test "x$enable_wizardmode" != "xyes" ; then - -cat >>confdefs.h <<_ACEOF -#define PASSWD $enable_wizardmode -_ACEOF - -fi -{ echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } -fi - -# Check whether --enable-allscores was given. -if test "${enable_allscores+set}" = set; then - enableval=$enable_allscores; -else - enable_allscores=yes -fi - -{ echo "$as_me:$LINENO: checking if allscores is enabled" >&5 -echo $ECHO_N "checking if allscores is enabled... $ECHO_C" >&6; } -if test "x$enable_allscores" = "xyes" ; then - -cat >>confdefs.h <<\_ACEOF -#define ALLSCORES 1 -_ACEOF - -{ echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } -else -{ echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } -fi - -# Check whether --enable-checktime was given. -if test "${enable_checktime+set}" = set; then - enableval=$enable_checktime; -fi - -{ echo "$as_me:$LINENO: checking if checktime is enabled" >&5 -echo $ECHO_N "checking if checktime is enabled... $ECHO_C" >&6; } -if test "x$enable_checktime" = "xyes" ; then - -cat >>confdefs.h <<\_ACEOF -#define CHECKTIME 1 -_ACEOF - -{ echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } -else -{ echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } -fi - -# Check whether --enable-maxload was given. -if test "${enable_maxload+set}" = set; then - enableval=$enable_maxload; -fi - -{ echo "$as_me:$LINENO: checking runtime execution limit (maximum system load average)" >&5 -echo $ECHO_N "checking runtime execution limit (maximum system load average)... $ECHO_C" >&6; } -if test "x$enable_maxload" = "xyes" ; then - -cat >>confdefs.h <<\_ACEOF -#define MAXLOAD 100 -_ACEOF - -{ echo "$as_me:$LINENO: result: 100" >&5 -echo "${ECHO_T}100" >&6; } -elif test "x$enable_maxload" = "x" ; then -{ echo "$as_me:$LINENO: result: unlimited" >&5 -echo "${ECHO_T}unlimited" >&6; } -elif test "x$enable_maxload" = "xno" ; then -{ echo "$as_me:$LINENO: result: unlimited" >&5 -echo "${ECHO_T}unlimited" >&6; } -else - -cat >>confdefs.h <<_ACEOF -#define MAXLOAD $enable_maxload -_ACEOF - -{ echo "$as_me:$LINENO: result: $enable_maxload" >&5 -echo "${ECHO_T}$enable_maxload" >&6; } -fi - -# Check whether --enable-maxusers was given. -if test "${enable_maxusers+set}" = set; then - enableval=$enable_maxusers; -fi - -{ echo "$as_me:$LINENO: checking runtime execution limit (maximum online system users)" >&5 -echo $ECHO_N "checking runtime execution limit (maximum online system users)... $ECHO_C" >&6; } -if test "x$enable_maxusers" = "xyes" ; then - -cat >>confdefs.h <<\_ACEOF -#define MAXUSERS 100 -_ACEOF - -{ echo "$as_me:$LINENO: result: 100" >&5 -echo "${ECHO_T}100" >&6; } -elif test "x$enable_maxusers" = "x" ; then -{ echo "$as_me:$LINENO: result: unlimited" >&5 -echo "${ECHO_T}unlimited" >&6; } -elif test "x$enable_maxload" = "xno" ; then -{ echo "$as_me:$LINENO: result: unlimited" >&5 -echo "${ECHO_T}unlimited" >&6; } -else - -cat >>confdefs.h <<_ACEOF -#define MAXLOAD $enable_maxusers -_ACEOF - -{ echo "$as_me:$LINENO: result: $enable_maxusers" >&5 -echo "${ECHO_T}$enable_maxusers" >&6; } -fi - -# Check whether --enable-numscores was given. -if test "${enable_numscores+set}" = set; then - enableval=$enable_numscores; -fi - -{ echo "$as_me:$LINENO: checking what the number of scores to store in scoreboard is" >&5 -echo $ECHO_N "checking what the number of scores to store in scoreboard is... $ECHO_C" >&6; } -if test "x$numscores" = "xyes" ; then - -cat >>confdefs.h <<\_ACEOF -#define NUMSCORES 10 -_ACEOF - -{ echo "$as_me:$LINENO: result: 10" >&5 -echo "${ECHO_T}10" >&6; } -elif test "x$enable_numscores" = "x" ; then - -cat >>confdefs.h <<\_ACEOF -#define NUMSCORES 10 -_ACEOF - -{ echo "$as_me:$LINENO: result: 10" >&5 -echo "${ECHO_T}10" >&6; } -elif test "x$enable_numscores" = "xno" ; then - -cat >>confdefs.h <<\_ACEOF -#define NUMSCORES 10 -_ACEOF - -{ echo "$as_me:$LINENO: result: 10" >&5 -echo "${ECHO_T}10" >&6; } -else - -cat >>confdefs.h <<_ACEOF -#define NUMSCORES $enable_numscores -_ACEOF - -{ echo "$as_me:$LINENO: result: $enable_numscores" >&5 -echo "${ECHO_T}$enable_numscores" >&6; } -fi - -# Check whether --enable-numname was given. -if test "${enable_numname+set}" = set; then - enableval=$enable_numname; -fi - -{ echo "$as_me:$LINENO: checking word for the number of scores to store in scoreboard is" >&5 -echo $ECHO_N "checking word for the number of scores to store in scoreboard is... $ECHO_C" >&6; } -if test "x$enable_numname" = "xyes" ; then - -cat >>confdefs.h <<\_ACEOF -#define NUMNAME "Ten" -_ACEOF - -{ echo "$as_me:$LINENO: result: Ten" >&5 -echo "${ECHO_T}Ten" >&6; } -elif test "x$enable_numname" = "x" ; then - -cat >>confdefs.h <<\_ACEOF -#define NUMNAME "Ten" -_ACEOF - -{ echo "$as_me:$LINENO: result: Ten" >&5 -echo "${ECHO_T}Ten" >&6; } -elif test "x$enable_numname" = "xno" ; then - -cat >>confdefs.h <<\_ACEOF -#define NUMNAME "Ten" -_ACEOF - -{ echo "$as_me:$LINENO: result: Ten" >&5 -echo "${ECHO_T}Ten" >&6; } -else - -cat >>confdefs.h <<_ACEOF -#define NUMNAME "$enable_numname" -_ACEOF - -{ echo "$as_me:$LINENO: result: $enable_numname" >&5 -echo "${ECHO_T}$enable_numname" >&6; } -fi - -# Check whether --enable-loadav was given. -if test "${enable_loadav+set}" = set; then - enableval=$enable_loadav; -fi - -{ echo "$as_me:$LINENO: checking whether to use program's built in load average function" >&5 -echo $ECHO_N "checking whether to use program's built in load average function... $ECHO_C" >&6; } -if test "x$enable_loadav" = "xyes" ; then - -cat >>confdefs.h <<\_ACEOF -#define LOADAV -_ACEOF - - -cat >>confdefs.h <<\_ACEOF -#define NAMELIST /vmunix -_ACEOF - -{ echo "$as_me:$LINENO: result: /vmunix" >&5 -echo "${ECHO_T}/vmunix" >&6; } -elif test "x$enable_loadav" = "x" ; then -{ echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } -elif test "x$enable_loadav" = "xno" ; then -{ echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } -else - -cat >>confdefs.h <<\_ACEOF -#define LOADAV -_ACEOF - - -cat >>confdefs.h <<_ACEOF -#define NAMELIST $enable_loadav -_ACEOF - -{ echo "$as_me:$LINENO: result: $enable_loadav" >&5 -echo "${ECHO_T}$enable_loadav" >&6; } -fi - -# Check whether --enable-ucount was given. -if test "${enable_ucount+set}" = set; then - enableval=$enable_ucount; -fi - -{ echo "$as_me:$LINENO: checking whether to use program's built in user counting function" >&5 -echo $ECHO_N "checking whether to use program's built in user counting function... $ECHO_C" >&6; } -if test "x$enable_ucount" = "xyes" ; then - -cat >>confdefs.h <<\_ACEOF -#define UCOUNT -_ACEOF - - -cat >>confdefs.h <<\_ACEOF -#define UTMP /etc/utmp -_ACEOF - -{ echo "$as_me:$LINENO: result: /etc/utmp" >&5 -echo "${ECHO_T}/etc/utmp" >&6; } -elif test "x$enable_ucount" = "x" ; then -{ echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } -elif test "x$enable_count" = "xno" ; then -{ echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } -else - -cat >>confdefs.h <<\_ACEOF -#define UCOUNT -_ACEOF - - -cat >>confdefs.h <<_ACEOF -#define UTMP $enable_ucount -_ACEOF - -{ echo "$as_me:$LINENO: result: $enable_ucount" >&5 -echo "${ECHO_T}$enable_ucount" >&6; } -fi - -TARGET=$target - - -{ echo "$as_me:$LINENO: checking whether to docdir is defined" >&5 -echo $ECHO_N "checking whether to docdir is defined... $ECHO_C" >&6; } -if test "x$docdir" = "x" ; then -{ echo "$as_me:$LINENO: result: docdir undefined" >&5 -echo "${ECHO_T}docdir undefined" >&6; } -docdir=\${datadir}/doc/\${PACKAGE_TARNAME} - -else -{ echo "$as_me:$LINENO: result: docdir defined" >&5 -echo "${ECHO_T}docdir defined" >&6; } -fi - -cat >confcache <<\_ACEOF -# This file is a shell script that caches the results of configure -# tests run on this system so they can be shared between configure -# scripts and configure runs, see configure's option --config-cache. -# It is not useful on other systems. If it contains results you don't -# want to keep, you may remove or edit it. -# -# config.status only pays attention to the cache file if you give it -# the --recheck option to rerun configure. -# -# `ac_cv_env_foo' variables (set or unset) will be overridden when -# loading this file, other *unset* `ac_cv_foo' will be assigned the -# following values. - -_ACEOF - -# The following way of writing the cache mishandles newlines in values, -# but we know of no workaround that is simple, portable, and efficient. -# So, we kill variables containing newlines. -# Ultrix sh set writes to stderr and can't be redirected directly, -# and sets the high bit in the cache file unless we assign to the vars. -( - for ac_var in `(set) 2>&1 | sed -n 's/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'`; do - eval ac_val=\$$ac_var - case $ac_val in #( - *${as_nl}*) - case $ac_var in #( - *_cv_*) { echo "$as_me:$LINENO: WARNING: Cache variable $ac_var contains a newline." >&5 -echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;; - esac - case $ac_var in #( - _ | IFS | as_nl) ;; #( - *) $as_unset $ac_var ;; - esac ;; - esac - done - - (set) 2>&1 | - case $as_nl`(ac_space=' '; set) 2>&1` in #( - *${as_nl}ac_space=\ *) - # `set' does not quote correctly, so add quotes (double-quote - # substitution turns \\\\ into \\, and sed turns \\ into \). - sed -n \ - "s/'/'\\\\''/g; - s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p" - ;; #( - *) - # `set' quotes correctly as required by POSIX, so do not add quotes. - sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p" - ;; - esac | - sort -) | - sed ' - /^ac_cv_env_/b end - t clear - :clear - s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/ - t end - s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/ - :end' >>confcache -if diff "$cache_file" confcache >/dev/null 2>&1; then :; else - if test -w "$cache_file"; then - test "x$cache_file" != "x/dev/null" && - { echo "$as_me:$LINENO: updating cache $cache_file" >&5 -echo "$as_me: updating cache $cache_file" >&6;} - cat confcache >$cache_file - else - { echo "$as_me:$LINENO: not updating unwritable cache $cache_file" >&5 -echo "$as_me: not updating unwritable cache $cache_file" >&6;} - fi -fi -rm -f confcache - -test "x$prefix" = xNONE && prefix=$ac_default_prefix -# Let make expand exec_prefix. -test "x$exec_prefix" = xNONE && exec_prefix='${prefix}' - -DEFS=-DHAVE_CONFIG_H - -ac_libobjs= -ac_ltlibobjs= -for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue - # 1. Remove the extension, and $U if already installed. - ac_script='s/\$U\././;s/\.o$//;s/\.obj$//' - ac_i=`echo "$ac_i" | sed "$ac_script"` - # 2. Prepend LIBOBJDIR. When used with automake>=1.10 LIBOBJDIR - # will be set to the directory where LIBOBJS objects are built. - ac_libobjs="$ac_libobjs \${LIBOBJDIR}$ac_i\$U.$ac_objext" - ac_ltlibobjs="$ac_ltlibobjs \${LIBOBJDIR}$ac_i"'$U.lo' -done -LIBOBJS=$ac_libobjs - -LTLIBOBJS=$ac_ltlibobjs - - - -: ${CONFIG_STATUS=./config.status} -ac_clean_files_save=$ac_clean_files -ac_clean_files="$ac_clean_files $CONFIG_STATUS" -{ echo "$as_me:$LINENO: creating $CONFIG_STATUS" >&5 -echo "$as_me: creating $CONFIG_STATUS" >&6;} -cat >$CONFIG_STATUS <<_ACEOF -#! $SHELL -# Generated by $as_me. -# Run this file to recreate the current configuration. -# Compiler output produced by configure, useful for debugging -# configure, is in config.log if it exists. - -debug=false -ac_cs_recheck=false -ac_cs_silent=false -SHELL=\${CONFIG_SHELL-$SHELL} -_ACEOF - -cat >>$CONFIG_STATUS <<\_ACEOF -## --------------------- ## -## M4sh Initialization. ## -## --------------------- ## - -# Be more Bourne compatible -DUALCASE=1; export DUALCASE # for MKS sh -if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then - emulate sh - NULLCMD=: - # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which - # is contrary to our usage. Disable this feature. - alias -g '${1+"$@"}'='"$@"' - setopt NO_GLOB_SUBST -else - case `(set -o) 2>/dev/null` in - *posix*) set -o posix ;; -esac - -fi - - - - -# PATH needs CR -# Avoid depending upon Character Ranges. -as_cr_letters='abcdefghijklmnopqrstuvwxyz' -as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ' -as_cr_Letters=$as_cr_letters$as_cr_LETTERS -as_cr_digits='0123456789' -as_cr_alnum=$as_cr_Letters$as_cr_digits - -# The user is always right. -if test "${PATH_SEPARATOR+set}" != set; then - echo "#! /bin/sh" >conf$$.sh - echo "exit 0" >>conf$$.sh - chmod +x conf$$.sh - if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then - PATH_SEPARATOR=';' - else - PATH_SEPARATOR=: - fi - rm -f conf$$.sh -fi - -# Support unset when possible. -if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then - as_unset=unset -else - as_unset=false -fi - - -# IFS -# We need space, tab and new line, in precisely that order. Quoting is -# there to prevent editors from complaining about space-tab. -# (If _AS_PATH_WALK were called with IFS unset, it would disable word -# splitting by setting IFS to empty value.) -as_nl=' -' -IFS=" "" $as_nl" - -# Find who we are. Look in the path if we contain no directory separator. -case $0 in - *[\\/]* ) as_myself=$0 ;; - *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break -done -IFS=$as_save_IFS - - ;; -esac -# We did not find ourselves, most probably we were run as `sh COMMAND' -# in which case we are not to be found in the path. -if test "x$as_myself" = x; then - as_myself=$0 -fi -if test ! -f "$as_myself"; then - echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 - { (exit 1); exit 1; } -fi - -# Work around bugs in pre-3.0 UWIN ksh. -for as_var in ENV MAIL MAILPATH -do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var -done -PS1='$ ' -PS2='> ' -PS4='+ ' - -# NLS nuisances. -for as_var in \ - LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \ - LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \ - LC_TELEPHONE LC_TIME -do - if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then - eval $as_var=C; export $as_var - else - ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var - fi -done - -# Required to use basename. -if expr a : '\(a\)' >/dev/null 2>&1 && - test "X`expr 00001 : '.*\(...\)'`" = X001; then - as_expr=expr -else - as_expr=false -fi - -if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then - as_basename=basename -else - as_basename=false -fi - - -# Name of the executable. -as_me=`$as_basename -- "$0" || -$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ - X"$0" : 'X\(//\)$' \| \ - X"$0" : 'X\(/\)' \| . 2>/dev/null || -echo X/"$0" | - sed '/^.*\/\([^/][^/]*\)\/*$/{ - s//\1/ - q - } - /^X\/\(\/\/\)$/{ - s//\1/ - q - } - /^X\/\(\/\).*/{ - s//\1/ - q - } - s/.*/./; q'` - -# CDPATH. -$as_unset CDPATH - - - - as_lineno_1=$LINENO - as_lineno_2=$LINENO - test "x$as_lineno_1" != "x$as_lineno_2" && - test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2" || { - - # Create $as_me.lineno as a copy of $as_myself, but with $LINENO - # uniformly replaced by the line number. The first 'sed' inserts a - # line-number line after each line using $LINENO; the second 'sed' - # does the real work. The second script uses 'N' to pair each - # line-number line with the line containing $LINENO, and appends - # trailing '-' during substitution so that $LINENO is not a special - # case at line end. - # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the - # scripts with optimization help from Paolo Bonzini. Blame Lee - # E. McMahon (1931-1989) for sed's syntax. :-) - sed -n ' - p - /[$]LINENO/= - ' <$as_myself | - sed ' - s/[$]LINENO.*/&-/ - t lineno - b - :lineno - N - :loop - s/[$]LINENO\([^'$as_cr_alnum'_].*\n\)\(.*\)/\2\1\2/ - t loop - s/-\n.*// - ' >$as_me.lineno && - chmod +x "$as_me.lineno" || - { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2 - { (exit 1); exit 1; }; } - - # Don't try to exec as it changes $[0], causing all sort of problems - # (the dirname of $[0] is not the place where we might find the - # original and so on. Autoconf is especially sensitive to this). - . "./$as_me.lineno" - # Exit status is that of the last command. - exit -} - - -if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then - as_dirname=dirname -else - as_dirname=false -fi - -ECHO_C= ECHO_N= ECHO_T= -case `echo -n x` in --n*) - case `echo 'x\c'` in - *c*) ECHO_T=' ';; # ECHO_T is single tab character. - *) ECHO_C='\c';; - esac;; -*) - ECHO_N='-n';; -esac - -if expr a : '\(a\)' >/dev/null 2>&1 && - test "X`expr 00001 : '.*\(...\)'`" = X001; then - as_expr=expr -else - as_expr=false -fi - -rm -f conf$$ conf$$.exe conf$$.file -if test -d conf$$.dir; then - rm -f conf$$.dir/conf$$.file -else - rm -f conf$$.dir - mkdir conf$$.dir -fi -echo >conf$$.file -if ln -s conf$$.file conf$$ 2>/dev/null; then - as_ln_s='ln -s' - # ... but there are two gotchas: - # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. - # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. - # In both cases, we have to default to `cp -p'. - ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || - as_ln_s='cp -p' -elif ln conf$$.file conf$$ 2>/dev/null; then - as_ln_s=ln -else - as_ln_s='cp -p' -fi -rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file -rmdir conf$$.dir 2>/dev/null - -if mkdir -p . 2>/dev/null; then - as_mkdir_p=: -else - test -d ./-p && rmdir ./-p - as_mkdir_p=false -fi - -if test -x / >/dev/null 2>&1; then - as_test_x='test -x' -else - if ls -dL / >/dev/null 2>&1; then - as_ls_L_option=L - else - as_ls_L_option= - fi - as_test_x=' - eval sh -c '\'' - if test -d "$1"; then - test -d "$1/."; - else - case $1 in - -*)set "./$1";; - esac; - case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in - ???[sx]*):;;*)false;;esac;fi - '\'' sh - ' -fi -as_executable_p=$as_test_x - -# Sed expression to map a string onto a valid CPP name. -as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" - -# Sed expression to map a string onto a valid variable name. -as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'" - - -exec 6>&1 - -# Save the log message, to keep $[0] and so on meaningful, and to -# report actual input values of CONFIG_FILES etc. instead of their -# values after options handling. -ac_log=" -This file was extended by Rogue $as_me 5.4.4, which was -generated by GNU Autoconf 2.61. Invocation command line was - - CONFIG_FILES = $CONFIG_FILES - CONFIG_HEADERS = $CONFIG_HEADERS - CONFIG_LINKS = $CONFIG_LINKS - CONFIG_COMMANDS = $CONFIG_COMMANDS - $ $0 $@ - -on `(hostname || uname -n) 2>/dev/null | sed 1q` -" - -_ACEOF - -cat >>$CONFIG_STATUS <<_ACEOF -# Files that config.status was made for. -config_files="$ac_config_files" -config_headers="$ac_config_headers" - -_ACEOF - -cat >>$CONFIG_STATUS <<\_ACEOF -ac_cs_usage="\ -\`$as_me' instantiates files from templates according to the -current configuration. - -Usage: $0 [OPTIONS] [FILE]... - - -h, --help print this help, then exit - -V, --version print version number and configuration settings, then exit - -q, --quiet do not print progress messages - -d, --debug don't remove temporary files - --recheck update $as_me by reconfiguring in the same conditions - --file=FILE[:TEMPLATE] - instantiate the configuration file FILE - --header=FILE[:TEMPLATE] - instantiate the configuration header FILE - -Configuration files: -$config_files - -Configuration headers: -$config_headers - -Report bugs to ." - -_ACEOF -cat >>$CONFIG_STATUS <<_ACEOF -ac_cs_version="\\ -Rogue config.status 5.4.4 -configured by $0, generated by GNU Autoconf 2.61, - with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" - -Copyright (C) 2006 Free Software Foundation, Inc. -This config.status script is free software; the Free Software Foundation -gives unlimited permission to copy, distribute and modify it." - -ac_pwd='$ac_pwd' -srcdir='$srcdir' -_ACEOF - -cat >>$CONFIG_STATUS <<\_ACEOF -# If no file are specified by the user, then we need to provide default -# value. By we need to know if files were specified by the user. -ac_need_defaults=: -while test $# != 0 -do - case $1 in - --*=*) - ac_option=`expr "X$1" : 'X\([^=]*\)='` - ac_optarg=`expr "X$1" : 'X[^=]*=\(.*\)'` - ac_shift=: - ;; - *) - ac_option=$1 - ac_optarg=$2 - ac_shift=shift - ;; - esac - - case $ac_option in - # Handling of the options. - -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r) - ac_cs_recheck=: ;; - --version | --versio | --versi | --vers | --ver | --ve | --v | -V ) - echo "$ac_cs_version"; exit ;; - --debug | --debu | --deb | --de | --d | -d ) - debug=: ;; - --file | --fil | --fi | --f ) - $ac_shift - CONFIG_FILES="$CONFIG_FILES $ac_optarg" - ac_need_defaults=false;; - --header | --heade | --head | --hea ) - $ac_shift - CONFIG_HEADERS="$CONFIG_HEADERS $ac_optarg" - ac_need_defaults=false;; - --he | --h) - # Conflict between --help and --header - { echo "$as_me: error: ambiguous option: $1 -Try \`$0 --help' for more information." >&2 - { (exit 1); exit 1; }; };; - --help | --hel | -h ) - echo "$ac_cs_usage"; exit ;; - -q | -quiet | --quiet | --quie | --qui | --qu | --q \ - | -silent | --silent | --silen | --sile | --sil | --si | --s) - ac_cs_silent=: ;; - - # This is an error. - -*) { echo "$as_me: error: unrecognized option: $1 -Try \`$0 --help' for more information." >&2 - { (exit 1); exit 1; }; } ;; - - *) ac_config_targets="$ac_config_targets $1" - ac_need_defaults=false ;; - - esac - shift -done - -ac_configure_extra_args= - -if $ac_cs_silent; then - exec 6>/dev/null - ac_configure_extra_args="$ac_configure_extra_args --silent" -fi - -_ACEOF -cat >>$CONFIG_STATUS <<_ACEOF -if \$ac_cs_recheck; then - echo "running CONFIG_SHELL=$SHELL $SHELL $0 "$ac_configure_args \$ac_configure_extra_args " --no-create --no-recursion" >&6 - CONFIG_SHELL=$SHELL - export CONFIG_SHELL - exec $SHELL "$0"$ac_configure_args \$ac_configure_extra_args --no-create --no-recursion -fi - -_ACEOF -cat >>$CONFIG_STATUS <<\_ACEOF -exec 5>>config.log -{ - echo - sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX -## Running $as_me. ## -_ASBOX - echo "$ac_log" -} >&5 - -_ACEOF -cat >>$CONFIG_STATUS <<_ACEOF -_ACEOF - -cat >>$CONFIG_STATUS <<\_ACEOF - -# Handling of arguments. -for ac_config_target in $ac_config_targets -do - case $ac_config_target in - "config.h") CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;; - "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;; - "rogue.6") CONFIG_FILES="$CONFIG_FILES rogue.6" ;; - "rogue.cat") CONFIG_FILES="$CONFIG_FILES rogue.cat" ;; - "rogue.doc") CONFIG_FILES="$CONFIG_FILES rogue.doc" ;; - "rogue.html") CONFIG_FILES="$CONFIG_FILES rogue.html" ;; - "rogue.me") CONFIG_FILES="$CONFIG_FILES rogue.me" ;; - - *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5 -echo "$as_me: error: invalid argument: $ac_config_target" >&2;} - { (exit 1); exit 1; }; };; - esac -done - - -# If the user did not use the arguments to specify the items to instantiate, -# then the envvar interface is used. Set only those that are not. -# We use the long form for the default assignment because of an extremely -# bizarre bug on SunOS 4.1.3. -if $ac_need_defaults; then - test "${CONFIG_FILES+set}" = set || CONFIG_FILES=$config_files - test "${CONFIG_HEADERS+set}" = set || CONFIG_HEADERS=$config_headers -fi - -# Have a temporary directory for convenience. Make it in the build tree -# simply because there is no reason against having it here, and in addition, -# creating and moving files from /tmp can sometimes cause problems. -# Hook for its removal unless debugging. -# Note that there is a small window in which the directory will not be cleaned: -# after its creation but before its name has been assigned to `$tmp'. -$debug || -{ - tmp= - trap 'exit_status=$? - { test -z "$tmp" || test ! -d "$tmp" || rm -fr "$tmp"; } && exit $exit_status -' 0 - trap '{ (exit 1); exit 1; }' 1 2 13 15 -} -# Create a (secure) tmp directory for tmp files. - -{ - tmp=`(umask 077 && mktemp -d "./confXXXXXX") 2>/dev/null` && - test -n "$tmp" && test -d "$tmp" -} || -{ - tmp=./conf$$-$RANDOM - (umask 077 && mkdir "$tmp") -} || -{ - echo "$me: cannot create a temporary directory in ." >&2 - { (exit 1); exit 1; } -} - -# -# Set up the sed scripts for CONFIG_FILES section. -# - -# No need to generate the scripts if there are no CONFIG_FILES. -# This happens for instance when ./config.status config.h -if test -n "$CONFIG_FILES"; then - -_ACEOF - - - -ac_delim='%!_!# ' -for ac_last_try in false false false false false :; do - cat >conf$$subs.sed <<_ACEOF -SHELL!$SHELL$ac_delim -PATH_SEPARATOR!$PATH_SEPARATOR$ac_delim -PACKAGE_NAME!$PACKAGE_NAME$ac_delim -PACKAGE_TARNAME!$PACKAGE_TARNAME$ac_delim -PACKAGE_VERSION!$PACKAGE_VERSION$ac_delim -PACKAGE_STRING!$PACKAGE_STRING$ac_delim -PACKAGE_BUGREPORT!$PACKAGE_BUGREPORT$ac_delim -exec_prefix!$exec_prefix$ac_delim -prefix!$prefix$ac_delim -program_transform_name!$program_transform_name$ac_delim -bindir!$bindir$ac_delim -sbindir!$sbindir$ac_delim -libexecdir!$libexecdir$ac_delim -datarootdir!$datarootdir$ac_delim -datadir!$datadir$ac_delim -sysconfdir!$sysconfdir$ac_delim -sharedstatedir!$sharedstatedir$ac_delim -localstatedir!$localstatedir$ac_delim -includedir!$includedir$ac_delim -oldincludedir!$oldincludedir$ac_delim -docdir!$docdir$ac_delim -infodir!$infodir$ac_delim -htmldir!$htmldir$ac_delim -dvidir!$dvidir$ac_delim -pdfdir!$pdfdir$ac_delim -psdir!$psdir$ac_delim -libdir!$libdir$ac_delim -localedir!$localedir$ac_delim -mandir!$mandir$ac_delim -DEFS!$DEFS$ac_delim -ECHO_C!$ECHO_C$ac_delim -ECHO_N!$ECHO_N$ac_delim -ECHO_T!$ECHO_T$ac_delim -LIBS!$LIBS$ac_delim -build_alias!$build_alias$ac_delim -host_alias!$host_alias$ac_delim -target_alias!$target_alias$ac_delim -build!$build$ac_delim -build_cpu!$build_cpu$ac_delim -build_vendor!$build_vendor$ac_delim -build_os!$build_os$ac_delim -host!$host$ac_delim -host_cpu!$host_cpu$ac_delim -host_vendor!$host_vendor$ac_delim -host_os!$host_os$ac_delim -target!$target$ac_delim -target_cpu!$target_cpu$ac_delim -target_vendor!$target_vendor$ac_delim -target_os!$target_os$ac_delim -CC!$CC$ac_delim -CFLAGS!$CFLAGS$ac_delim -LDFLAGS!$LDFLAGS$ac_delim -CPPFLAGS!$CPPFLAGS$ac_delim -ac_ct_CC!$ac_ct_CC$ac_delim -EXEEXT!$EXEEXT$ac_delim -OBJEXT!$OBJEXT$ac_delim -CPP!$CPP$ac_delim -GREP!$GREP$ac_delim -EGREP!$EGREP$ac_delim -LIBOBJS!$LIBOBJS$ac_delim -NROFF!$NROFF$ac_delim -GROFF!$GROFF$ac_delim -COLCRT!$COLCRT$ac_delim -TBL!$TBL$ac_delim -SED!$SED$ac_delim -PROGRAM!$PROGRAM$ac_delim -GROUPOWNER!$GROUPOWNER$ac_delim -SCOREFILE!$SCOREFILE$ac_delim -LOCKFILE!$LOCKFILE$ac_delim -TARGET!$TARGET$ac_delim -LTLIBOBJS!$LTLIBOBJS$ac_delim -_ACEOF - - if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 71; then - break - elif $ac_last_try; then - { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 -echo "$as_me: error: could not make $CONFIG_STATUS" >&2;} - { (exit 1); exit 1; }; } - else - ac_delim="$ac_delim!$ac_delim _$ac_delim!! " - fi -done - -ac_eof=`sed -n '/^CEOF[0-9]*$/s/CEOF/0/p' conf$$subs.sed` -if test -n "$ac_eof"; then - ac_eof=`echo "$ac_eof" | sort -nru | sed 1q` - ac_eof=`expr $ac_eof + 1` -fi - -cat >>$CONFIG_STATUS <<_ACEOF -cat >"\$tmp/subs-1.sed" <<\CEOF$ac_eof -/@[a-zA-Z_][a-zA-Z_0-9]*@/!b end -_ACEOF -sed ' -s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g -s/^/s,@/; s/!/@,|#_!!_#|/ -:n -t n -s/'"$ac_delim"'$/,g/; t -s/$/\\/; p -N; s/^.*\n//; s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g; b n -' >>$CONFIG_STATUS >$CONFIG_STATUS <<_ACEOF -:end -s/|#_!!_#|//g -CEOF$ac_eof -_ACEOF - - -# VPATH may cause trouble with some makes, so we remove $(srcdir), -# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and -# trailing colons and then remove the whole line if VPATH becomes empty -# (actually we leave an empty line to preserve line numbers). -if test "x$srcdir" = x.; then - ac_vpsub='/^[ ]*VPATH[ ]*=/{ -s/:*\$(srcdir):*/:/ -s/:*\${srcdir}:*/:/ -s/:*@srcdir@:*/:/ -s/^\([^=]*=[ ]*\):*/\1/ -s/:*$// -s/^[^=]*=[ ]*$// -}' -fi - -cat >>$CONFIG_STATUS <<\_ACEOF -fi # test -n "$CONFIG_FILES" - - -for ac_tag in :F $CONFIG_FILES :H $CONFIG_HEADERS -do - case $ac_tag in - :[FHLC]) ac_mode=$ac_tag; continue;; - esac - case $ac_mode$ac_tag in - :[FHL]*:*);; - :L* | :C*:*) { { echo "$as_me:$LINENO: error: Invalid tag $ac_tag." >&5 -echo "$as_me: error: Invalid tag $ac_tag." >&2;} - { (exit 1); exit 1; }; };; - :[FH]-) ac_tag=-:-;; - :[FH]*) ac_tag=$ac_tag:$ac_tag.in;; - esac - ac_save_IFS=$IFS - IFS=: - set x $ac_tag - IFS=$ac_save_IFS - shift - ac_file=$1 - shift - - case $ac_mode in - :L) ac_source=$1;; - :[FH]) - ac_file_inputs= - for ac_f - do - case $ac_f in - -) ac_f="$tmp/stdin";; - *) # Look for the file first in the build tree, then in the source tree - # (if the path is not absolute). The absolute path cannot be DOS-style, - # because $ac_f cannot contain `:'. - test -f "$ac_f" || - case $ac_f in - [\\/$]*) false;; - *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";; - esac || - { { echo "$as_me:$LINENO: error: cannot find input file: $ac_f" >&5 -echo "$as_me: error: cannot find input file: $ac_f" >&2;} - { (exit 1); exit 1; }; };; - esac - ac_file_inputs="$ac_file_inputs $ac_f" - done - - # Let's still pretend it is `configure' which instantiates (i.e., don't - # use $as_me), people would be surprised to read: - # /* config.h. Generated by config.status. */ - configure_input="Generated from "`IFS=: - echo $* | sed 's|^[^:]*/||;s|:[^:]*/|, |g'`" by configure." - if test x"$ac_file" != x-; then - configure_input="$ac_file. $configure_input" - { echo "$as_me:$LINENO: creating $ac_file" >&5 -echo "$as_me: creating $ac_file" >&6;} - fi - - case $ac_tag in - *:-:* | *:-) cat >"$tmp/stdin";; - esac - ;; - esac - - ac_dir=`$as_dirname -- "$ac_file" || -$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X"$ac_file" : 'X\(//\)[^/]' \| \ - X"$ac_file" : 'X\(//\)$' \| \ - X"$ac_file" : 'X\(/\)' \| . 2>/dev/null || -echo X"$ac_file" | - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ - s//\1/ - q - } - /^X\(\/\/\)[^/].*/{ - s//\1/ - q - } - /^X\(\/\/\)$/{ - s//\1/ - q - } - /^X\(\/\).*/{ - s//\1/ - q - } - s/.*/./; q'` - { as_dir="$ac_dir" - case $as_dir in #( - -*) as_dir=./$as_dir;; - esac - test -d "$as_dir" || { $as_mkdir_p && mkdir -p "$as_dir"; } || { - as_dirs= - while :; do - case $as_dir in #( - *\'*) as_qdir=`echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #( - *) as_qdir=$as_dir;; - esac - as_dirs="'$as_qdir' $as_dirs" - as_dir=`$as_dirname -- "$as_dir" || -$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X"$as_dir" : 'X\(//\)[^/]' \| \ - X"$as_dir" : 'X\(//\)$' \| \ - X"$as_dir" : 'X\(/\)' \| . 2>/dev/null || -echo X"$as_dir" | - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ - s//\1/ - q - } - /^X\(\/\/\)[^/].*/{ - s//\1/ - q - } - /^X\(\/\/\)$/{ - s//\1/ - q - } - /^X\(\/\).*/{ - s//\1/ - q - } - s/.*/./; q'` - test -d "$as_dir" && break - done - test -z "$as_dirs" || eval "mkdir $as_dirs" - } || test -d "$as_dir" || { { echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5 -echo "$as_me: error: cannot create directory $as_dir" >&2;} - { (exit 1); exit 1; }; }; } - ac_builddir=. - -case "$ac_dir" in -.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;; -*) - ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'` - # A ".." for each directory in $ac_dir_suffix. - ac_top_builddir_sub=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,/..,g;s,/,,'` - case $ac_top_builddir_sub in - "") ac_top_builddir_sub=. ac_top_build_prefix= ;; - *) ac_top_build_prefix=$ac_top_builddir_sub/ ;; - esac ;; -esac -ac_abs_top_builddir=$ac_pwd -ac_abs_builddir=$ac_pwd$ac_dir_suffix -# for backward compatibility: -ac_top_builddir=$ac_top_build_prefix - -case $srcdir in - .) # We are building in place. - ac_srcdir=. - ac_top_srcdir=$ac_top_builddir_sub - ac_abs_top_srcdir=$ac_pwd ;; - [\\/]* | ?:[\\/]* ) # Absolute name. - ac_srcdir=$srcdir$ac_dir_suffix; - ac_top_srcdir=$srcdir - ac_abs_top_srcdir=$srcdir ;; - *) # Relative name. - ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix - ac_top_srcdir=$ac_top_build_prefix$srcdir - ac_abs_top_srcdir=$ac_pwd/$srcdir ;; -esac -ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix - - - case $ac_mode in - :F) - # - # CONFIG_FILE - # - -_ACEOF - -cat >>$CONFIG_STATUS <<\_ACEOF -# If the template does not know about datarootdir, expand it. -# FIXME: This hack should be removed a few years after 2.60. -ac_datarootdir_hack=; ac_datarootdir_seen= - -case `sed -n '/datarootdir/ { - p - q -} -/@datadir@/p -/@docdir@/p -/@infodir@/p -/@localedir@/p -/@mandir@/p -' $ac_file_inputs` in -*datarootdir*) ac_datarootdir_seen=yes;; -*@datadir@*|*@docdir@*|*@infodir@*|*@localedir@*|*@mandir@*) - { echo "$as_me:$LINENO: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5 -echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;} -_ACEOF -cat >>$CONFIG_STATUS <<_ACEOF - ac_datarootdir_hack=' - s&@datadir@&$datadir&g - s&@docdir@&$docdir&g - s&@infodir@&$infodir&g - s&@localedir@&$localedir&g - s&@mandir@&$mandir&g - s&\\\${datarootdir}&$datarootdir&g' ;; -esac -_ACEOF - -# Neutralize VPATH when `$srcdir' = `.'. -# Shell code in configure.ac might set extrasub. -# FIXME: do we really want to maintain this feature? -cat >>$CONFIG_STATUS <<_ACEOF - sed "$ac_vpsub -$extrasub -_ACEOF -cat >>$CONFIG_STATUS <<\_ACEOF -:t -/@[a-zA-Z_][a-zA-Z_0-9]*@/!b -s&@configure_input@&$configure_input&;t t -s&@top_builddir@&$ac_top_builddir_sub&;t t -s&@srcdir@&$ac_srcdir&;t t -s&@abs_srcdir@&$ac_abs_srcdir&;t t -s&@top_srcdir@&$ac_top_srcdir&;t t -s&@abs_top_srcdir@&$ac_abs_top_srcdir&;t t -s&@builddir@&$ac_builddir&;t t -s&@abs_builddir@&$ac_abs_builddir&;t t -s&@abs_top_builddir@&$ac_abs_top_builddir&;t t -$ac_datarootdir_hack -" $ac_file_inputs | sed -f "$tmp/subs-1.sed" >$tmp/out - -test -z "$ac_datarootdir_hack$ac_datarootdir_seen" && - { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } && - { ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } && - { echo "$as_me:$LINENO: WARNING: $ac_file contains a reference to the variable \`datarootdir' -which seems to be undefined. Please make sure it is defined." >&5 -echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir' -which seems to be undefined. Please make sure it is defined." >&2;} - - rm -f "$tmp/stdin" - case $ac_file in - -) cat "$tmp/out"; rm -f "$tmp/out";; - *) rm -f "$ac_file"; mv "$tmp/out" $ac_file;; - esac - ;; - :H) - # - # CONFIG_HEADER - # -_ACEOF - -# Transform confdefs.h into a sed script `conftest.defines', that -# substitutes the proper values into config.h.in to produce config.h. -rm -f conftest.defines conftest.tail -# First, append a space to every undef/define line, to ease matching. -echo 's/$/ /' >conftest.defines -# Then, protect against being on the right side of a sed subst, or in -# an unquoted here document, in config.status. If some macros were -# called several times there might be several #defines for the same -# symbol, which is useless. But do not sort them, since the last -# AC_DEFINE must be honored. -ac_word_re=[_$as_cr_Letters][_$as_cr_alnum]* -# These sed commands are passed to sed as "A NAME B PARAMS C VALUE D", where -# NAME is the cpp macro being defined, VALUE is the value it is being given. -# PARAMS is the parameter list in the macro definition--in most cases, it's -# just an empty string. -ac_dA='s,^\\([ #]*\\)[^ ]*\\([ ]*' -ac_dB='\\)[ (].*,\\1define\\2' -ac_dC=' ' -ac_dD=' ,' - -uniq confdefs.h | - sed -n ' - t rset - :rset - s/^[ ]*#[ ]*define[ ][ ]*// - t ok - d - :ok - s/[\\&,]/\\&/g - s/^\('"$ac_word_re"'\)\(([^()]*)\)[ ]*\(.*\)/ '"$ac_dA"'\1'"$ac_dB"'\2'"${ac_dC}"'\3'"$ac_dD"'/p - s/^\('"$ac_word_re"'\)[ ]*\(.*\)/'"$ac_dA"'\1'"$ac_dB$ac_dC"'\2'"$ac_dD"'/p - ' >>conftest.defines - -# Remove the space that was appended to ease matching. -# Then replace #undef with comments. This is necessary, for -# example, in the case of _POSIX_SOURCE, which is predefined and required -# on some systems where configure will not decide to define it. -# (The regexp can be short, since the line contains either #define or #undef.) -echo 's/ $// -s,^[ #]*u.*,/* & */,' >>conftest.defines - -# Break up conftest.defines: -ac_max_sed_lines=50 - -# First sed command is: sed -f defines.sed $ac_file_inputs >"$tmp/out1" -# Second one is: sed -f defines.sed "$tmp/out1" >"$tmp/out2" -# Third one will be: sed -f defines.sed "$tmp/out2" >"$tmp/out1" -# et cetera. -ac_in='$ac_file_inputs' -ac_out='"$tmp/out1"' -ac_nxt='"$tmp/out2"' - -while : -do - # Write a here document: - cat >>$CONFIG_STATUS <<_ACEOF - # First, check the format of the line: - cat >"\$tmp/defines.sed" <<\\CEOF -/^[ ]*#[ ]*undef[ ][ ]*$ac_word_re[ ]*\$/b def -/^[ ]*#[ ]*define[ ][ ]*$ac_word_re[( ]/b def -b -:def -_ACEOF - sed ${ac_max_sed_lines}q conftest.defines >>$CONFIG_STATUS - echo 'CEOF - sed -f "$tmp/defines.sed"' "$ac_in >$ac_out" >>$CONFIG_STATUS - ac_in=$ac_out; ac_out=$ac_nxt; ac_nxt=$ac_in - sed 1,${ac_max_sed_lines}d conftest.defines >conftest.tail - grep . conftest.tail >/dev/null || break - rm -f conftest.defines - mv conftest.tail conftest.defines -done -rm -f conftest.defines conftest.tail - -echo "ac_result=$ac_in" >>$CONFIG_STATUS -cat >>$CONFIG_STATUS <<\_ACEOF - if test x"$ac_file" != x-; then - echo "/* $configure_input */" >"$tmp/config.h" - cat "$ac_result" >>"$tmp/config.h" - if diff $ac_file "$tmp/config.h" >/dev/null 2>&1; then - { echo "$as_me:$LINENO: $ac_file is unchanged" >&5 -echo "$as_me: $ac_file is unchanged" >&6;} - else - rm -f $ac_file - mv "$tmp/config.h" $ac_file - fi - else - echo "/* $configure_input */" - cat "$ac_result" - fi - rm -f "$tmp/out12" - ;; - - - esac - -done # for ac_tag - - -{ (exit 0); exit 0; } -_ACEOF -chmod +x $CONFIG_STATUS -ac_clean_files=$ac_clean_files_save - - -# configure is writing to config.log, and then calls config.status. -# config.status does its own redirection, appending to config.log. -# Unfortunately, on DOS this fails, as config.log is still kept open -# by configure, so config.status won't be able to write to it; its -# output is simply discarded. So we exec the FD to /dev/null, -# effectively closing config.log, so it can be properly (re)opened and -# appended to by config.status. When coming back to configure, we -# need to make the FD available again. -if test "$no_create" != yes; then - ac_cs_success=: - ac_config_status_args= - test "$silent" = yes && - ac_config_status_args="$ac_config_status_args --quiet" - exec 5>/dev/null - $SHELL $CONFIG_STATUS $ac_config_status_args || ac_cs_success=false - exec 5>>config.log - # Use ||, not &&, to avoid exiting from the if with $? = 1, which - # would make configure fail if this is the last instruction. - $ac_cs_success || { (exit 1); exit 1; } -fi - diff --git a/src/cc/rogue/configure.ac b/src/cc/rogue/configure.ac deleted file mode 100644 index 15c9cc7e4..000000000 --- a/src/cc/rogue/configure.ac +++ /dev/null @@ -1,246 +0,0 @@ -# -*- Autoconf -*- -# Process this file with autoconf to produce a configure script. - -AC_PREREQ(2.56) -AC_INIT([Rogue],[5.4.4], [yendor@rogueforge.net]) -AC_CONFIG_SRCDIR([armor.c]) -AC_CONFIG_HEADER([config.h]) -AC_CONFIG_FILES([Makefile rogue.6 rogue.cat rogue.doc rogue.html rogue.me]) -AC_CANONICAL_SYSTEM([]) - -# Checks for programs. -AC_PROG_CC - -# Checks for libraries. - -# Checks for header files. -AC_HEADER_STDC -AC_CHECK_HEADERS([arpa/inet.h sys/utsname.h pwd.h fcntl.h limits.h nlist.h stdlib.h string.h sys/ioctl.h termios.h unistd.h utmp.h term.h ncurses/term.h process.h]) - -# Checks for typedefs, structures, and compiler characteristics. -AC_HEADER_STDBOOL -AC_C_CONST -AC_TYPE_UID_T -AC_TYPE_SIZE_T -AC_STRUCT_TM -MP_WITH_CURSES -# Checks for library functions. -AC_FUNC_FORK -AC_PROG_GCC_TRADITIONAL -AC_FUNC_LSTAT -AC_FUNC_LSTAT_FOLLOWS_SLASHED_SYMLINK -AC_TYPE_SIGNAL -AC_FUNC_STAT -AC_FUNC_VPRINTF -AC_CHECK_FUNCS([erasechar killchar alarm getpass memset setenv strchr nlist _spawnl spawnl getpwuid loadav getloadavg strerror setresgid setregid setgid setresuid setreuid setuid getuid getgid]) - -AC_CHECK_PROG([NROFF], [nroff], [nroff],) -AC_CHECK_PROG([GROFF], [groff], [groff],) -AC_CHECK_PROG([COLCRT], [colcrt], [colcrt],) -AC_CHECK_PROG([TBL], [tbl], [tbl],) -AC_CHECK_PROG([SED], [sed], [sed],) - -AC_ARG_WITH(program-name, AC_HELP_STRING([--with-program-name=NAME],[alternate executable name]),[progname="$withval" ], [progname="rogue"] ) -PROGRAM=$progname -AC_SUBST(PROGRAM) - -AC_ARG_ENABLE(setgid, AC_HELP_STRING([--enable-setgid=NAME],[install executable as setgid with group ownership of NAME @<:@default=no@:>@])],[],[]) -AC_MSG_CHECKING([if using setgid execute bit]) -if test "x$enable_setgid" = "xno" ; then -GROUPOWNER= -elif test "x$enable_setgid" = "xyes" ; then -GROUPOWNER=games -elif test "x$enable_setgid" = "x" ; then -GROUPOWNER= -else -GROUPOWNER=$enable_setgid -fi - -if test "x$GROUPOWNER" != "x" ; then -AC_DEFINE_UNQUOTED([GROUPOWNER],[$GROUPOWNER], [Define to group owner of setgid executable]) -AC_MSG_RESULT([$GROUPOWNER]) -else -AC_MSG_RESULT([no]) -fi - -AC_SUBST(GROUPOWNER) - -AC_ARG_ENABLE([scorefile],[AC_HELP_STRING([--enable-scorefile=SCOREFILE], [enable scoreboard with given filename])],[],[]) -AC_MSG_CHECKING([for scoreboard file]) -if test "x$enable_scorefile" = "xno" ; then -SCOREFILE= -elif test "x$enable_scorefile" = "xyes" ; then -SCOREFILE=$progname.scr -elif test "x$enable_scorefile" = "x" ; then -SCOREFILE=$progname.scr -else -SCOREFILE=$enable_scorefile -fi - -if test "x$SCOREFILE" != "x" ; then -AC_DEFINE_UNQUOTED([SCOREFILE], ["$SCOREFILE"], [Define to file to use for scoreboard]) -AC_MSG_RESULT([$SCOREFILE]) -else -AC_MSG_RESULT([disabled]) -fi - -AC_SUBST(SCOREFILE) - -AC_ARG_ENABLE([lockfile],[AC_HELP_STRING([--enable-lockfile=LOCKFILE], [enable scoreboard lockfile with given filename])],[],[]) -AC_MSG_CHECKING([for scoreboard lockfile file]) -if test "x$enable_lockfile" = "xno" ; then -LOCKFILE= -elif test "x$enable_lockfile" = "xyes" ; then -LOCKFILE=$progname.lck -elif test "x$enable_lockfile" = "x" ; then -LOCKFILE=$progname.lck -else -LOCKFILE=$enable_lockfile -fi - -if test "x$LOCKFILE" != "x" ; then -AC_DEFINE_UNQUOTED([LOCKFILE], ["$LOCKFILE"], [Define to file to use for scoreboard lockfile]) -AC_MSG_RESULT([$LOCKFILE]) -else -AC_MSG_RESULT([disabled]) -fi - -AC_SUBST(LOCKFILE) - -AC_ARG_ENABLE([wizardmode],[AC_HELP_STRING([--enable-wizardmode], [enable availability of wizard mode @<:@default=no@:>@])],[],[]) -AC_MSG_CHECKING([if wizard mode is enabled]) -if test "x$enable_wizardmode" = "xno" ; then -AC_MSG_RESULT([no]) -elif test "x$enable_wizardmode" = "x" ; then -AC_MSG_RESULT([no]) -else -AC_DEFINE([MASTER], [], [Define to include wizard mode]) -if test "x$enable_wizardmode" != "xyes" ; then -AC_DEFINE_UNQUOTED([PASSWD],[$enable_wizardmode], [Define crypt(3) wizard mode password]) -fi -AC_MSG_RESULT([yes]) -fi - -AC_ARG_ENABLE([allscores],[AC_HELP_STRING([--enable-allscores], [enable scoreboard to show top scores, not just top players @<:@default=yes@:>@])],[],[enable_allscores=yes]) -AC_MSG_CHECKING([if allscores is enabled]) -if test "x$enable_allscores" = "xyes" ; then -AC_DEFINE([ALLSCORES], [1], [Define if scorefile is top scores, not top players]) -AC_MSG_RESULT([yes]) -else -AC_MSG_RESULT([no]) -fi - -AC_ARG_ENABLE([checktime],[AC_HELP_STRING([--enable-checktime], [enable checktime @<:@default=no@:>@])],[],[]) -AC_MSG_CHECKING([if checktime is enabled]) -if test "x$enable_checktime" = "xyes" ; then -AC_DEFINE([CHECKTIME], [1], [Define if checktime feature should be enabled]) -AC_MSG_RESULT([yes]) -else -AC_MSG_RESULT([no]) -fi - -AC_ARG_ENABLE([maxload],[AC_HELP_STRING([--enable-maxload], [enable maxload @<:@default=no@:>@])],[],[]) -AC_MSG_CHECKING([runtime execution limit (maximum system load average)]) -if test "x$enable_maxload" = "xyes" ; then -AC_DEFINE([MAXLOAD], [100], [Define if maxload feature should be enabled]) -AC_MSG_RESULT([100]) -elif test "x$enable_maxload" = "x" ; then -AC_MSG_RESULT([unlimited]) -elif test "x$enable_maxload" = "xno" ; then -AC_MSG_RESULT([unlimited]) -else -AC_DEFINE_UNQUOTED([MAXLOAD], [$enable_maxload], [Define if maxload feature should be enabled]) -AC_MSG_RESULT([$enable_maxload]) -fi - -AC_ARG_ENABLE([maxusers],[AC_HELP_STRING([--enable-maxusers], [enable maxuser @<:@default=no@:>@])],[],[]) -AC_MSG_CHECKING([runtime execution limit (maximum online system users)]) -if test "x$enable_maxusers" = "xyes" ; then -AC_DEFINE([MAXUSERS], [100], [Define if maxusers feature should be enabled]) -AC_MSG_RESULT([100]) -elif test "x$enable_maxusers" = "x" ; then -AC_MSG_RESULT([unlimited]) -elif test "x$enable_maxload" = "xno" ; then -AC_MSG_RESULT([unlimited]) -else -AC_DEFINE_UNQUOTED([MAXLOAD], [$enable_maxusers], [Define if maxusers feature should be enabled]) -AC_MSG_RESULT([$enable_maxusers]) -fi - -AC_ARG_ENABLE([numscores],[AC_HELP_STRING([--enable-numscores], [number of scores to store in scoreboard @<:@default=10@:>@])],[],[]) -AC_MSG_CHECKING([what the number of scores to store in scoreboard is]) -if test "x$numscores" = "xyes" ; then -AC_DEFINE([NUMSCORES], [10], [number of scores to store in scoreboard]) -AC_MSG_RESULT([10]) -elif test "x$enable_numscores" = "x" ; then -AC_DEFINE([NUMSCORES], [10], [number of scores to store in scoreboard]) -AC_MSG_RESULT([10]) -elif test "x$enable_numscores" = "xno" ; then -AC_DEFINE([NUMSCORES], [10], [number of scores to store in scoreboard]) -AC_MSG_RESULT([10]) -else -AC_DEFINE_UNQUOTED([NUMSCORES], [$enable_numscores], [number of scores to store in scoreboard]) -AC_MSG_RESULT([$enable_numscores]) -fi - -AC_ARG_ENABLE([numname],[AC_HELP_STRING([--enable-numname], [word for number of scores to store in scoreboard @<:@default=Ten@:>@])],[],[]) -AC_MSG_CHECKING([word for the number of scores to store in scoreboard is]) -if test "x$enable_numname" = "xyes" ; then -AC_DEFINE([NUMNAME], ["Ten"], [word for the number of scores to store in scoreboard]) -AC_MSG_RESULT([Ten]) -elif test "x$enable_numname" = "x" ; then -AC_DEFINE([NUMNAME], ["Ten"], [word for the number of scores to store in scoreboard]) -AC_MSG_RESULT([Ten]) -elif test "x$enable_numname" = "xno" ; then -AC_DEFINE([NUMNAME], ["Ten"], [word for the number of scores to store in scoreboard]) -AC_MSG_RESULT([Ten]) -else -AC_DEFINE_UNQUOTED([NUMNAME], ["$enable_numname"], [word for the number of scores to store in scoreboard]) -AC_MSG_RESULT([$enable_numname]) -fi - -AC_ARG_ENABLE([loadav],[AC_HELP_STRING([--enable-loadav=NAMELIST], [use program's load average function (unlikely to work) @<:@default=no@:>@])],[],[]) -AC_MSG_CHECKING([whether to use program's built in load average function]) -if test "x$enable_loadav" = "xyes" ; then -AC_DEFINE([LOADAV], [], [define if we should use program's load average function instead of system]) -AC_DEFINE([NAMELIST], [/vmunix], [kernel file to pass to nlist() when reading load average (unlikely to work)]) -AC_MSG_RESULT([/vmunix]) -elif test "x$enable_loadav" = "x" ; then -AC_MSG_RESULT([no]) -elif test "x$enable_loadav" = "xno" ; then -AC_MSG_RESULT([no]) -else -AC_DEFINE([LOADAV], [], [define if we should use program's load average function instead of system]) -AC_DEFINE_UNQUOTED([NAMELIST], [$enable_loadav], [kernel file to pass to nlist() when reading load average (unlikely to work)]) -AC_MSG_RESULT([$enable_loadav]) -fi - -AC_ARG_ENABLE([ucount],[AC_HELP_STRING([--enable-ucount=UTMPFILE], [use program's own function to count users (unlikely to work) @<:@default=no@:>@])],[],[]) -AC_MSG_CHECKING([whether to use program's built in user counting function]) -if test "x$enable_ucount" = "xyes" ; then -AC_DEFINE([UCOUNT], [], [define if we should use program's user counting function instead of system's]) -AC_DEFINE([UTMP], [/etc/utmp], [utmp like file to pass to ucount() when counting online users (unlikely to work)]) -AC_MSG_RESULT([/etc/utmp]) -elif test "x$enable_ucount" = "x" ; then -AC_MSG_RESULT([no]) -elif test "x$enable_count" = "xno" ; then -AC_MSG_RESULT([no]) -else -AC_DEFINE([UCOUNT], [], [define if we should use program's user counting function instead of system's]) -AC_DEFINE_UNQUOTED([UTMP], [$enable_ucount], [utmp like file to pass to ucount() when counting online users (unlikely to work)]) -AC_MSG_RESULT([$enable_ucount]) -fi - -TARGET=$target -AC_SUBST(TARGET) - -AC_MSG_CHECKING([whether to docdir is defined]) -if test "x$docdir" = "x" ; then -AC_MSG_RESULT([docdir undefined]) -docdir=\${datadir}/doc/\${PACKAGE_TARNAME} -AC_SUBST(docdir) -else -AC_MSG_RESULT([docdir defined]) -fi - -AC_OUTPUT diff --git a/src/cc/rogue/cursesd.c b/src/cc/rogue/cursesd.c deleted file mode 100644 index b744e4015..000000000 --- a/src/cc/rogue/cursesd.c +++ /dev/null @@ -1,435 +0,0 @@ -// Copyright (c) 2016-2023 The Hush developers -// Distributed under the GPLv3 software license, see the accompanying -// file COPYING or https://www.gnu.org/licenses/gpl-3.0.en.html -/****************************************************************************** - * Copyright © 2014-2019 The SuperNET Developers. * - * * - * See the AUTHORS, DEVELOPER-AGREEMENT and LICENSE files at * - * the top-level directory of this distribution for the individual copyright * - * holder information and the developer policies on copyright and licensing. * - * * - * Unless otherwise agreed in a custom licensing agreement, no part of the * - * SuperNET software, including this file may be copied, modified, propagated * - * or distributed except according to the terms contained in the LICENSE file * - * * - * Removal or modification of this copyright notice is prohibited. * - * * - ******************************************************************************/ - -#include "cursesd.h" - -static int32_t endwinflag; -WINDOW *stdscr,*curscr; -int32_t ESCDELAY; - -WINDOW *newwin(int32_t nlines,int32_t ncols,int32_t begin_y,int32_t begin_x) -{ - WINDOW *scr = 0; - if ( nlines == LINES && ncols == COLS && begin_y == 0 && begin_x == 0 ) - scr = (WINDOW *)calloc(1,sizeof(*stdscr)); - curscr = scr; - return(scr); -} - -WINDOW *initscr() -{ - if ( stdscr == 0 ) - stdscr = newwin(LINES,COLS,0,0); - return(stdscr); -} - -int32_t delwin(WINDOW *win) -{ - free(win); - return(0); -} - -int32_t wmove(WINDOW *win, int32_t y, int32_t x) -{ - win->y = y; - win->x = x; - return(0); -} - -int32_t move(int32_t y, int32_t x) -{ - return(wmove(stdscr,y,x)); -} - -int32_t werase(WINDOW *win) -{ - memset(win->screen,' ',sizeof(win->screen)); - return(0); -} - -int32_t wclear(WINDOW *win) -{ - werase(win); - clearok(win,TRUE); - return(0); -} - -int32_t wclrtoeol(WINDOW *win) -{ - if ( win->x < COLS-1 ) - memset(&win->screen[win->y][win->x],' ',COLS - win->x); - return(0); -} - -int32_t wclrtobot(WINDOW *win) -{ - wclrtoeol(win); - if ( win->y < LINES-1 ) - memset(&win->screen[win->y+1][0],' ',COLS); - return(0); -} - -int32_t erase(void) -{ - return(werase(stdscr)); -} - -int32_t clear(void) -{ - return(wclear(stdscr)); -} - -int32_t clrtobot(void) -{ - return(wclrtobot(stdscr)); -} - -int32_t clrtoeol(void) -{ - return(wclrtoeol(stdscr)); -} - -int32_t waddch(WINDOW *win, chtype ch) -{ - int32_t i; - if ( ch == '\t' ) - { - for (i=0; i<8; i++) - { - if ( win->x >= COLS-1 ) - break; - win->x++; - if ( (win->x & 7) == 0 ) - break; - } - } - else if ( ch == '\n' ) - { - wclrtoeol(win); - win->x = 0; - win->y++; - if ( win->y >= LINES ) - win->y = 0; - } - else if ( ch == '\b' ) - { - if ( win->x > 0 ) - win->x--; - } - else - { - win->screen[win->y][win->x++] = ch; - if ( win->x >= COLS ) - { - win->x = 0; - win->y++; - if ( win->y >= LINES ) - win->y = 0; - } - } - return(0); -} - -int32_t mvwaddch(WINDOW *win, int32_t y, int32_t x, chtype ch) -{ - win->y = y; - win->x = x; - return(waddch(win,ch)); -} - -int32_t addch(chtype ch) -{ - return(waddch(stdscr,ch)); -} - -int32_t mvaddch(int32_t y, int32_t x, chtype ch) -{ - return(mvwaddch(stdscr,y,x,ch)); -} - -int32_t waddstr(WINDOW *win, const char *str) -{ - int32_t i; - //fprintf(stderr,"%s\n",str); - for (i=0; str[i]!=0; i++) - waddch(win,str[i]); - return(0); -} - -int32_t waddnstr(WINDOW *win, const char *str, int32_t n) -{ - int32_t i; - for (i=0; str[i]!=0 && iy = y; - win->x = x; - return(waddstr(win,str)); -} - -int32_t mvwaddnstr(WINDOW *win, int32_t y, int32_t x, const char *str, int32_t n) -{ - win->y = y; - win->x = x; - return(waddnstr(win,str,n)); -} - -int32_t addstr(const char *str) -{ - return(waddstr(stdscr,str)); -} - -int32_t addnstr(const char *str, int32_t n) -{ - return(waddnstr(stdscr,str,n)); -} - -int32_t mvaddstr(int32_t y, int32_t x, const char *str) -{ - stdscr->y = y; - stdscr->x = x; - return(waddstr(stdscr,str)); -} - -int32_t mvaddnstr(int32_t y, int32_t x, const char *str, int32_t n) -{ - stdscr->y = y; - stdscr->x = x; - return(waddnstr(stdscr,str,n)); -} - -int32_t printw(char *fmt,...) -{ - char str[512]; int32_t ret; va_list myargs; // Declare a va_list type variable - va_start(myargs,fmt); // Initialise the va_list variable with the ... after fmt - ret = vsprintf(str,fmt,myargs); // Forward the '...' to vsprintf - va_end(myargs); // Clean up the va_list - return(addstr(str)); -} - -int32_t wprintw(WINDOW *win,char *fmt,...) -{ - char str[512]; int32_t ret; va_list myargs; // Declare a va_list type variable - va_start(myargs,fmt); // Initialise the va_list variable with the ... after fmt - ret = vsprintf(str,fmt,myargs); // Forward the '...' to vsprintf - va_end(myargs); // Clean up the va_list - return(waddstr(win,str)); -} - -int32_t mvprintw(int32_t y,int32_t x,char *fmt,...) -{ - char str[512]; int32_t ret; va_list myargs; // Declare a va_list type variable - va_start(myargs,fmt); // Initialise the va_list variable with the ... after fmt - ret = vsprintf(str,fmt,myargs); // Forward the '...' to vsprintf - va_end(myargs); // Clean up the va_list - stdscr->y = y; - stdscr->x = x; - return(addstr(str)); -} - -int32_t mvwprintw(WINDOW *win,int32_t y,int32_t x,char *fmt,...) -{ - char str[512]; int32_t ret; va_list myargs; // Declare a va_list type variable - va_start(myargs,fmt); // Initialise the va_list variable with the ... after fmt - ret = vsprintf(str,fmt,myargs); // Forward the '...' to vsprintf - va_end(myargs); // Clean up the va_list - win->y = y; - win->x = x; - return(waddstr(win,str)); -} - -chtype winch(WINDOW *win) -{ - return(win->screen[win->y][win->x]); -} - -chtype inch(void) -{ - return(winch(stdscr)); -} - -chtype mvwinch(WINDOW *win, int32_t y, int32_t x) -{ - win->y = y; - win->x = x; - return(win->screen[win->y][win->x]); -} - -chtype mvinch(int32_t y, int32_t x) -{ - return(mvwinch(stdscr,y,x)); -} - -int32_t mvcur(int32_t oldrow, int32_t oldcol, int32_t newrow, int32_t newcol) -{ - stdscr->y = newrow; - stdscr->x = newcol; - return(0); -} - -int32_t endwin(void) -{ - if ( stdscr != 0 ) - free(stdscr), stdscr = 0; - endwinflag = 1; - return(0); -} - -int32_t isendwin(void) -{ - return(endwinflag); -} - -int32_t refresh(void) -{ - endwinflag = 0; - return(wrefresh(stdscr)); -} - -int32_t redrawwin(WINDOW *win) -{ - return(wrefresh(win)); -} - -int32_t wredrawln(WINDOW *win, int32_t beg_line, int32_t num_lines) -{ - return(wrefresh(win)); -} - -// functions with no data side effect -#ifdef they_are_macros -int32_t wrefresh(WINDOW *win) -{ - return(0); -} - -int32_t wnoutrefresh(WINDOW *win) -{ - return(0); -} - -int32_t doupdate(void) -{ - return(0); -} - -int32_t touchwin(WINDOW *win) -{ - return(0); -} - -int32_t standout(void) -{ - return(0); -} - -int32_t standend(void) -{ - return(0); -} - -int32_t raw(void) -{ - return(0); -} - -int32_t keypad(WINDOW *win, bool bf) -{ - return(0); -} - -int32_t noecho(void) -{ - return(0); -} - -int32_t flushinp(void) -{ - return(0); -} - -int32_t clearok(WINDOW *win, bool bf) -{ - return(0); -} - -int32_t idlok(WINDOW *win, bool bf) -{ - return(0); -} - -int32_t leaveok(WINDOW *win, bool bf) -{ - return(0); -} -#endif - -int32_t mvwin(WINDOW *win, int32_t y, int32_t x) // stub -{ - fprintf(stderr,"unexpected call to mvwin\n"); - return(0); -} - -WINDOW *subwin(WINDOW *orig, int32_t nlines, int32_t ncols, int32_t begin_y, int32_t begin_x) -{ - fprintf(stderr,"unexpected and unsupported call to subwin\n"); - return(0); -} - -char erasechar(void) -{ - fprintf(stderr,"unexpected and unsupported call to erasechar\n"); - return(8); -} - -char killchar(void) -{ - fprintf(stderr,"unexpected and unsupported call to erasechar\n"); - return(3); -} - -int32_t wgetnstr(WINDOW *win, char *str, int32_t n) // stub -{ - fprintf(stderr,"unexpected and unsupported call to mvgetnstr\n"); - return(0); -} - -#ifndef __MINGW32__ -int32_t getch(void) -{ - fprintf(stderr,"unexpected and unsupported call to getch\n"); - return(0); -} -#endif - -int32_t md_readchar(void) -{ - fprintf(stderr,"unexpected and unsupported call to md_readchar\n"); - return(0); -} - -char *unctrl(char c) -{ - static char ctrlstr[5]; - sprintf(ctrlstr,"^%%%02x",c); - return(ctrlstr); -} diff --git a/src/cc/rogue/cursesd.h b/src/cc/rogue/cursesd.h deleted file mode 100644 index 47615b752..000000000 --- a/src/cc/rogue/cursesd.h +++ /dev/null @@ -1,201 +0,0 @@ -// Copyright (c) 2016-2023 The Hush developers -// Distributed under the GPLv3 software license, see the accompanying -// file COPYING or https://www.gnu.org/licenses/gpl-3.0.en.html -/****************************************************************************** - * Copyright © 2014-2019 The SuperNET Developers. * - * * - * See the AUTHORS, DEVELOPER-AGREEMENT and LICENSE files at * - * the top-level directory of this distribution for the individual copyright * - * holder information and the developer policies on copyright and licensing. * - * * - * Unless otherwise agreed in a custom licensing agreement, no part of the * - * SuperNET software, including this file may be copied, modified, propagated * - * or distributed except according to the terms contained in the LICENSE file * - * * - * Removal or modification of this copyright notice is prohibited. * - * * - ******************************************************************************/ - -#ifndef H_CURSESD_H -#define H_CURSESD_H - -#define KEY_OFFSET 0x100 -#define KEY_DOWN (KEY_OFFSET + 0x02) /* Down arrow key */ -#define KEY_UP (KEY_OFFSET + 0x03) /* Up arrow key */ -#define KEY_LEFT (KEY_OFFSET + 0x04) /* Left arrow key */ -#define KEY_RIGHT (KEY_OFFSET + 0x05) /* Right arrow key */ - - -#define COLOR_BLACK 0 - -#ifdef PDC_RGB /* RGB */ -# define COLOR_RED 1 -# define COLOR_GREEN 2 -# define COLOR_BLUE 4 -#else /* BGR */ -# define COLOR_BLUE 1 -# define COLOR_GREEN 2 -# define COLOR_RED 4 -#endif - -#define COLOR_CYAN (COLOR_BLUE | COLOR_GREEN) -#define COLOR_MAGENTA (COLOR_RED | COLOR_BLUE) -#define COLOR_YELLOW (COLOR_RED | COLOR_GREEN) - -#define COLOR_WHITE 7 - -#define LINES 24 -#define COLS 80 - -#include -#include -#include -#include -#include -#include -#include /* we need va_list */ -#include /* we want wchar_t */ -#include -#include - -#include -#include -#include -#include -#include - -#define ERR (-1) - -struct cursesd_info -{ - uint8_t screen[LINES][COLS]; - int32_t x,y; -}; -typedef struct cursesd_info WINDOW; -extern WINDOW *stdscr,*curscr; -extern int32_t ESCDELAY; -typedef char chtype; - -#ifndef __MINGW32__ -int32_t getch(void); // stub -#endif - -int32_t md_readchar(void); // stub - -WINDOW *initscr(void); -int32_t endwin(void); -int32_t isendwin(void); -//SCREEN *newterm(const char *type, FILE *outfd, FILE *infd); -//SCREEN *set_term(SCREEN *new); -//void delscreen(SCREEN* sp); - -int32_t refresh(void); -int32_t wrefresh(WINDOW *win); -//int32_t wnoutrefresh(WINDOW *win); -//int32_t doupdate(void); -int32_t redrawwin(WINDOW *win); -int32_t wredrawln(WINDOW *win, int32_t beg_line, int32_t num_lines); - -int32_t erase(void); -int32_t werase(WINDOW *win); -int32_t clear(void); -int32_t wclear(WINDOW *win); -int32_t clrtobot(void); -int32_t wclrtobot(WINDOW *win); -int32_t clrtoeol(void); -int32_t wclrtoeol(WINDOW *win); - -int32_t standout(void); -int32_t standend(void); -int32_t raw(void); -int32_t noecho(void); -int32_t flushinp(void); -int32_t keypad(WINDOW *win, bool bf); - -int32_t clearok(WINDOW *win, bool bf); -int32_t idlok(WINDOW *win, bool bf); -int32_t leaveok(WINDOW *win, bool bf); - -WINDOW *newwin(int32_t nlines,int32_t ncols,int32_t begin_y,int32_t begin_x); // only LINES,COLS,0,0 -int32_t delwin(WINDOW *win); -int32_t touchwin(WINDOW *win); // stub -WINDOW *subwin(WINDOW *orig, int32_t nlines, int32_t ncols, int32_t begin_y, int32_t begin_x); // stub -int32_t mvwin(WINDOW *win, int32_t y, int32_t x); // stub -int32_t mvcur(int32_t oldrow, int32_t oldcol, int32_t newrow, int32_t newcol); - -char erasechar(void); // stub -char killchar(void); // stub - -int32_t move(int32_t y, int32_t x); -int32_t wmove(WINDOW *win, int32_t y, int32_t x); - -chtype inch(void); -chtype winch(WINDOW *win); -chtype mvinch(int32_t y, int32_t x); -chtype mvwinch(WINDOW *win, int32_t y, int32_t x); - -int32_t addch(chtype ch); -int32_t waddch(WINDOW *win, chtype ch); -int32_t mvaddch(int32_t y, int32_t x, chtype ch); -int32_t mvwaddch(WINDOW *win, int32_t y, int32_t x, chtype ch); - -int32_t addstr(const char *str); -int32_t addnstr(const char *str, int32_t n); -int32_t waddstr(WINDOW *win, const char *str); -int32_t waddnstr(WINDOW *win, const char *str, int32_t n); -int32_t mvaddstr(int32_t y, int32_t x, const char *str); -int32_t mvaddnstr(int32_t y, int32_t x, const char *str, int32_t n); -int32_t mvwaddstr(WINDOW *win, int32_t y, int32_t x, const char *str); -int32_t mvwaddnstr(WINDOW *win, int32_t y, int32_t x, const char *str, int32_t n); - -int32_t wgetnstr(WINDOW *win, char *str, int32_t n); // stub -int32_t printw(char *fmt,...); -int32_t wprintw(WINDOW *win,char *fmt,...); -int32_t mvprintw(int32_t y,int32_t x,char *fmt,...); -int32_t mvwprintw(WINDOW *win,int32_t y,int32_t x,char *fmt,...); - -char *unctrl(char c); - -#define A_CHARTEXT 0xff -#define baudrate() 9600 -#define getmaxx(a) COLS -#define getmaxy(a) LINES -#define getyx(win,_argfory,_argforx) _argfory = win->y, _argforx = win->x - -// functions with only visible effects -#define wrefresh(win) 0 -#define wnoutrefresh(win) 0 -#define doupdate() 0 -#define touchwin(win) 0 -#define standout() 0 -#define standend() 0 -#define raw() 0 -#define keypad(win,bf) 0 -#define noecho() 0 -#define flushinp() 0 -#define clearok(win,bf) 0 -#define idlok(win,bf) 0 -#define leaveok(win,bf) 0 -#define halfdelay(x) 0 -#define nocbreak() 0 -#define cbreak() 0 -#define curs_set(x) 0 - -// for tetris -#define init_pair(a,b,c) 0 -#define start_color() 0 -#define box(a,b,c) 0 -#define A_REVERSE 0 -#define COLOR_PAIR(a) 0 -#define timeout(x) 0 -// end for tetris - -#ifndef TRUE -#define TRUE 1 -#endif -#ifndef FALSE -#define FALSE 0 -#endif - -#endif - diff --git a/src/cc/rogue/daemon.c b/src/cc/rogue/daemon.c deleted file mode 100644 index fbed7c2c0..000000000 --- a/src/cc/rogue/daemon.c +++ /dev/null @@ -1,219 +0,0 @@ -// Copyright (c) 2016-2023 The Hush developers -// Distributed under the GPLv3 software license, see the accompanying -// file COPYING or https://www.gnu.org/licenses/gpl-3.0.en.html -/* - * Contains functions for dealing with things that happen in the - * future. - * - * @(#)daemon.c 4.7 (Berkeley) 02/05/99 - * - * Rogue: Exploring the Dungeons of Doom - * Copyright (C) 1980-1983, 1985, 1999 Michael Toy, Ken Arnold and Glenn Wichman - * All rights reserved. - * - * See the file LICENSE.TXT for full copyright and licensing information. - */ - -//#include -#include "rogue.h" - -#define EMPTY 0 -#define DAEMON -1 -#define MAXDAEMONS 20 - -#define _X_ { EMPTY } - -struct delayed_action d_list[MAXDAEMONS] = { - _X_, _X_, _X_, _X_, _X_, _X_, _X_, _X_, _X_, _X_, - _X_, _X_, _X_, _X_, _X_, _X_, _X_, _X_, _X_, _X_, -}; - -/* - * d_slot: - * Find an empty slot in the daemon/fuse list - */ -struct delayed_action * -d_slot() -{ - register struct delayed_action *dev; - - for (dev = d_list; dev <= &d_list[MAXDAEMONS-1]; dev++) - if (dev->d_type == EMPTY) - return dev; -#ifdef MASTER - debug("Ran out of fuse slots"); -#endif - return NULL; -} - -/* - * find_slot: - * Find a particular slot in the table - */ -struct delayed_action * -find_slot(void (*func)(struct rogue_state *rs,int)) -{ - register struct delayed_action *dev; - - for (dev = d_list; dev <= &d_list[MAXDAEMONS-1]; dev++) - if (dev->d_type != EMPTY && func == dev->d_func) - return dev; - return NULL; -} - -/* - * start_daemon: - * Start a daemon, takes a function. - */ -void -start_daemon(void (*func)(struct rogue_state *rs,int), int arg, int type) -{ - register struct delayed_action *dev; - - dev = d_slot(); - dev->d_type = type; - dev->d_func = func; - dev->d_arg = arg; - dev->d_time = DAEMON; -} - -/* - * kill_daemon: - * Remove a daemon from the list - */ -void -kill_daemon(void (*func)(struct rogue_state *rs,int)) -{ - register struct delayed_action *dev; - - if ((dev = find_slot(func)) == NULL) - return; - /* - * Take it out of the list - */ - dev->d_type = EMPTY; -} - -/* - * do_daemons: - * Run all the daemons that are active with the current flag, - * passing the argument to the function. - */ -void -do_daemons(struct rogue_state *rs,int flag) -{ - register struct delayed_action *dev; - - /* - * Loop through the devil list - */ - for (dev = d_list; dev <= &d_list[MAXDAEMONS-1]; dev++) - /* - * Executing each one, giving it the proper arguments - */ - if (dev->d_type == flag && dev->d_time == DAEMON) - (*dev->d_func)(rs,dev->d_arg); -} - -/* - * fuse: - * Start a fuse to go off in a certain number of turns - */ -void -fuse(void (*func)(struct rogue_state *rs,int), int arg, int time, int type) -{ - register struct delayed_action *wire; - - wire = d_slot(); - wire->d_type = type; - wire->d_func = func; - wire->d_arg = arg; - wire->d_time = time; -} - -/* - * lengthen: - * Increase the time until a fuse goes off - */ -void -lengthen(void (*func)(struct rogue_state *rs,int), int xtime) -{ - register struct delayed_action *wire; - - if ((wire = find_slot(func)) == NULL) - return; - wire->d_time += xtime; -} - -/* - * extinguish: - * Put out a fuse - */ -void -extinguish(void (*func)(struct rogue_state *rs,int)) -{ - register struct delayed_action *wire; - - if ((wire = find_slot(func)) == NULL) - return; - wire->d_type = EMPTY; -} - -/* - * do_fuses: - * Decrement counters and start needed fuses - */ - -/*char *actionfunc_str(char *str,void *ptr) -{ - if ( ptr == (void *)runners ) - strcpy(str,"runners"); - else if ( ptr == (void *)doctor ) - strcpy(str,"doctor"); - else if ( ptr == (void *)stomach ) - strcpy(str,"stomach"); - else if ( ptr == (void *)nohaste ) - strcpy(str,"nohaste"); - else if ( ptr == (void *)unconfuse ) - strcpy(str,"unconfuse"); - else if ( ptr == (void *)swander ) - strcpy(str,"swander"); - else if ( ptr == (void *)come_down ) - strcpy(str,"come_down"); - else if ( ptr == (void *)unsee ) - strcpy(str,"unsee"); - else if ( ptr == (void *)sight ) - strcpy(str,"sight"); - else if ( ptr == (void *)land ) - strcpy(str,"land"); - else if ( ptr == (void *)rollwand ) - strcpy(str,"rollwand"); - else if ( ptr == (void *)visuals ) - strcpy(str,"visuals"); - else if ( ptr == (void *)turn_see ) - strcpy(str,"turn_see"); - else strcpy(str,"no match"); - return(str); -}*/ - -void -do_fuses(struct rogue_state *rs,int flag) -{ - register struct delayed_action *wire; char str[64]; - - /* - * Step though the list - */ - for (wire = d_list; wire <= &d_list[MAXDAEMONS-1]; wire++) - /* - * Decrementing counters and starting things we want. We also need - * to remove the fuse from the list once it has gone off. - */ - if (flag == wire->d_type && wire->d_time > 0 && --wire->d_time == 0) - { - //if ( fp != 0 ) - // fprintf(fp,"t.%d %d %s, ",wire->d_type,wire->d_time,actionfunc_str(str,wire->d_func)); - wire->d_type = EMPTY; - (*wire->d_func)(rs,wire->d_arg); - } -} diff --git a/src/cc/rogue/daemons.c b/src/cc/rogue/daemons.c deleted file mode 100644 index c5fa67397..000000000 --- a/src/cc/rogue/daemons.c +++ /dev/null @@ -1,364 +0,0 @@ -// Copyright (c) 2016-2023 The Hush developers -// Distributed under the GPLv3 software license, see the accompanying -// file COPYING or https://www.gnu.org/licenses/gpl-3.0.en.html -/* - * All the daemon and fuse functions are in here - * - * @(#)daemons.c 4.24 (Berkeley) 02/05/99 - * - * Rogue: Exploring the Dungeons of Doom - * Copyright (C) 1980-1983, 1985, 1999 Michael Toy, Ken Arnold and Glenn Wichman - * All rights reserved. - * - * See the file LICENSE.TXT for full copyright and licensing information. - */ - -//#include -#include "rogue.h" - -/* - * doctor: - * A healing daemon that restors hit points after rest - */ -void -doctor(struct rogue_state *rs,int arg) -{ - register int lv, ohp; - if ( rs->logfp != 0 ) - fprintf(rs->logfp,"doctor\n"); - - lv = pstats.s_lvl; - ohp = pstats.s_hpt; - quiet++; - if (lv < 8) - { - if (quiet + (lv << 1) > 20) - pstats.s_hpt++; - } - else - if (quiet >= 3) - pstats.s_hpt += rnd(lv - 7) + 1; - if (ISRING(LEFT, R_REGEN)) - pstats.s_hpt++; - if (ISRING(RIGHT, R_REGEN)) - pstats.s_hpt++; - if (ohp != pstats.s_hpt) - { - if (pstats.s_hpt > max_hp) - pstats.s_hpt = max_hp; - quiet = 0; - } -} - -/* - * Swander: - * Called when it is time to start rolling for wandering monsters - */ -void -swander(struct rogue_state *rs,int arg) -{ - if ( rs->logfp != 0 ) - fprintf(rs->logfp,"swander\n"); - start_daemon(rollwand, 0, BEFORE); -} - -/* - * rollwand: - * Called to roll to see if a wandering monster starts up - */ -int between = 0; -void -rollwand(struct rogue_state *rs,int arg) -{ - if ( rs->logfp != 0 ) - fprintf(rs->logfp,"rollwand\n"); - if (++between >= 4) - { - if (roll(1, 6) == 4) - { - wanderer(rs); - kill_daemon(rollwand); - fuse(swander, 0, WANDERTIME, BEFORE); - } - between = 0; - } -} - -/* - * unconfuse: - * Release the poor player from his confusion - */ -void -unconfuse(struct rogue_state *rs,int arg) -{ - if ( rs->logfp != 0 ) - fprintf(rs->logfp,"unconfuse\n"); - player.t_flags &= ~ISHUH; - msg(rs,"you feel less %s now", choose_str("trippy", "confused")); -} - -/* - * unsee: - * Turn off the ability to see invisible - */ -void -unsee(struct rogue_state *rs,int arg) -{ - register THING *th; - if ( rs->logfp != 0 ) - fprintf(rs->logfp,"unsee\n"); - - for (th = mlist; th != NULL; th = next(th)) - if (on(*th, ISINVIS) && see_monst(th)) - mvaddch(th->t_pos.y, th->t_pos.x, th->t_oldch); - player.t_flags &= ~CANSEE; -} - -/* - * sight: - * He gets his sight back - */ -void -sight(struct rogue_state *rs,int arg) -{ - if ( rs->logfp != 0 ) - fprintf(rs->logfp,"sight\n"); - if (on(player, ISBLIND)) - { - extinguish(sight); - player.t_flags &= ~ISBLIND; - if (!(proom->r_flags & ISGONE)) - enter_room(rs,&hero); - msg(rs,choose_str("far out! Everything is all cosmic again", - "the veil of darkness lifts")); - } -} - -/* - * nohaste: - * End the hasting - */ -void -nohaste(struct rogue_state *rs,int arg) -{ - if ( rs->logfp != 0 ) - fprintf(rs->logfp,"nohaste\n"); - player.t_flags &= ~ISHASTE; - msg(rs,"you feel yourself slowing down"); -} - -/* - * stomach: - * Digest the hero's food - */ -void -stomach(struct rogue_state *rs,int arg) -{ - register int oldfood; - int orig_hungry = hungry_state; - if ( rs->logfp != 0 ) - fprintf(rs->logfp,"stomach\n"); - - if (food_left <= 0) - { - if (food_left-- < -STARVETIME) - death(rs,'s'); - /* - * the hero is fainting - */ - if (no_command || rnd(5) != 0) - return; - no_command += rnd(8) + 4; - hungry_state = 3; - if (!terse) - addmsg(rs,choose_str("the munchies overpower your motor capabilities. ", - "you feel too weak from lack of food. ")); - msg(rs,choose_str("You freak out", "You faint")); - } - else - { - oldfood = food_left; - food_left -= ring_eat(LEFT) + ring_eat(RIGHT) + 1 - amulet; - - if (food_left < MORETIME && oldfood >= MORETIME) - { - hungry_state = 2; - msg(rs,choose_str("the munchies are interfering with your motor capabilites", - "you are starting to feel weak")); - } - else if (food_left < 2 * MORETIME && oldfood >= 2 * MORETIME) - { - hungry_state = 1; - if (terse) - msg(rs,choose_str("getting the munchies", "getting hungry")); - else - msg(rs,choose_str("you are getting the munchies", - "you are starting to get hungry")); - } - } - if (hungry_state != orig_hungry) { - player.t_flags &= ~ISRUN; - running = FALSE; - to_death = FALSE; - count = 0; - } -} - -/* - * come_down: - * Take the hero down off her acid trip. - */ -void -come_down(struct rogue_state *rs,int arg) -{ - register THING *tp; - register bool seemonst; - - if ( rs->logfp != 0 ) - fprintf(rs->logfp,"come_down\n"); - if (!on(player, ISHALU)) - return; - - kill_daemon(visuals); - player.t_flags &= ~ISHALU; - - if (on(player, ISBLIND)) - return; - - /* - * undo the things - */ - for (tp = lvl_obj; tp != NULL; tp = next(tp)) - if (cansee(rs,tp->o_pos.y, tp->o_pos.x)) - mvaddch(tp->o_pos.y, tp->o_pos.x, tp->o_type); - - /* - * undo the monsters - */ - seemonst = on(player, SEEMONST); - for (tp = mlist; tp != NULL; tp = next(tp)) - { - move(tp->t_pos.y, tp->t_pos.x); - if (cansee(rs,tp->t_pos.y, tp->t_pos.x)) - if (!on(*tp, ISINVIS) || on(player, CANSEE)) - addch(tp->t_disguise); - else - addch(chat(tp->t_pos.y, tp->t_pos.x)); - else if (seemonst) - { - standout(); - addch(tp->t_type); - standend(); - } - } - msg(rs,"Everything looks SO boring now."); -} - -/* - * visuals: - * change the characters for the player - */ -void -visuals(struct rogue_state *rs,int arg) -{ - register THING *tp; - register bool seemonst; - - if (!after || (running && jump)) - return; - if ( rs->logfp != 0 ) - fprintf(rs->logfp,"visuals\n"); - /* - * change the things - */ - for (tp = lvl_obj; tp != NULL; tp = next(tp)) - if (cansee(rs,tp->o_pos.y, tp->o_pos.x)) - mvaddch(tp->o_pos.y, tp->o_pos.x, rnd_thing()); - - /* - * change the stairs - */ - if (!seenstairs && cansee(rs,stairs.y, stairs.x)) - mvaddch(stairs.y, stairs.x, rnd_thing()); - - /* - * change the monsters - */ - seemonst = on(player, SEEMONST); - for (tp = mlist; tp != NULL; tp = next(tp)) - { - move(tp->t_pos.y, tp->t_pos.x); - if (see_monst(tp)) - { - if (tp->t_type == 'X' && tp->t_disguise != 'X') - addch(rnd_thing()); - else - addch(rnd(26) + 'A'); - } - else if (seemonst) - { - standout(); - addch(rnd(26) + 'A'); - standend(); - } - } -} - -/* - * land: - * Land from a levitation potion - */ -void -land(struct rogue_state *rs,int arg) -{ - if ( rs->logfp != 0 ) - fprintf(rs->logfp,"land\n"); - player.t_flags &= ~ISLEVIT; - msg(rs,choose_str("bummer! You've hit the ground", - "you float gently to the ground")); -} - -/* - * turn_see: - * Put on or off seeing monsters on this level - */ -bool -turn_see(struct rogue_state *rs,bool turn_off) -{ - THING *mp; - bool can_see, add_new; - if ( rs->logfp != 0 ) - fprintf(rs->logfp,"turn_see\n"); - - add_new = FALSE; - for (mp = mlist; mp != NULL; mp = next(mp)) - { - move(mp->t_pos.y, mp->t_pos.x); - can_see = see_monst(mp); - if (turn_off) - { - if (!can_see) - addch(mp->t_oldch); - } - else - { - if (!can_see) - standout(); - if (!on(player, ISHALU)) - addch(mp->t_type); - else - addch(rnd(26) + 'A'); - if (!can_see) - { - standend(); - add_new ^= 1;//add_new++; - } - } - } - if (turn_off) - player.t_flags &= ~SEEMONST; - else - player.t_flags |= SEEMONST; - return add_new; -} - diff --git a/src/cc/rogue/extern.c b/src/cc/rogue/extern.c deleted file mode 100644 index 506768506..000000000 --- a/src/cc/rogue/extern.c +++ /dev/null @@ -1,519 +0,0 @@ -// Copyright (c) 2016-2023 The Hush developers -// Distributed under the GPLv3 software license, see the accompanying -// file COPYING or https://www.gnu.org/licenses/gpl-3.0.en.html -/* - * global variable initializaton - * - * @(#)extern.c 4.82 (Berkeley) 02/05/99 - * - * Rogue: Exploring the Dungeons of Doom - * Copyright (C) 1980-1983, 1985, 1999 Michael Toy, Ken Arnold and Glenn Wichman - * All rights reserved. - * - * See the file LICENSE.TXT for full copyright and licensing information. - */ - -//#include -#include "rogue.h" - - - -bool after; /* True if we want after daemons */ -bool again; /* Repeating the last command */ -int noscore; /* Was a wizard sometime */ -bool seenstairs; /* Have seen the stairs (for lsd) */ -bool amulet = FALSE; /* He found the amulet */ -bool door_stop = FALSE; /* Stop running when we pass a door */ -bool fight_flush = FALSE; /* True if toilet input */ -bool firstmove = FALSE; /* First move after setting door_stop */ -bool got_ltc = FALSE; /* We have gotten the local tty chars */ -bool has_hit = FALSE; /* Has a "hit" message pending in msg */ -bool in_shell = FALSE; /* True if executing a shell */ -bool inv_describe = TRUE; /* Say which way items are being used */ -bool jump = FALSE; /* Show running as series of jumps */ -bool kamikaze = FALSE; /* to_death really to DEATH */ -bool lower_msg = FALSE; /* Messages should start w/lower case */ -bool move_on = FALSE; /* Next move shouldn't pick up items */ -bool msg_esc = FALSE; /* Check for ESC from msg's --More-- */ -bool passgo = FALSE; /* Follow passages */ -bool playing = TRUE; /* True until he quits */ -bool q_comm = FALSE; /* Are we executing a 'Q' command? */ -bool running = FALSE; /* True if player is running */ -bool save_msg = TRUE; /* Remember last msg */ -bool see_floor = TRUE; /* Show the lamp illuminated floor */ -bool stat_msg = FALSE; /* Should status() print as a msg() */ -bool terse = FALSE; /* True if we should be short */ -bool to_death = FALSE; /* Fighting is to the death! */ -bool tombstone = TRUE; /* Print out tombstone at end */ -#ifdef MASTER -int wizard = FALSE; /* True if allows wizard commands */ -#endif -bool pack_used[26] = { /* Is the character used in the pack? */ - FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, - FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, - FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE -}; - -char dir_ch; /* Direction from last get_dir() call */ -char runch; /* Direction player is running */ -char take; /* Thing she is taking */ - -int orig_dsusp; /* Original dsusp char */ -char file_name[MAXSTR]; /* Save file name */ -char huh[MAXSTR]; /* The last message printed */ -char prbuf[2*MAXSTR]; /* buffer for sprintfs */ -char whoami[MAXSTR]; /* Name of player */ -char fruit[MAXSTR] = /* Favorite fruit */ - { 's', 'l', 'i', 'm', 'e', '-', 'm', 'o', 'l', 'd', '\0' }; -char home[MAXSTR] = { '\0' }; /* User's home directory */ -char l_last_comm = '\0'; /* Last last_comm */ -char l_last_dir = '\0'; /* Last last_dir */ -char last_comm = '\0'; /* Last command typed */ -char last_dir = '\0'; /* Last direction given */ - -int n_objs; /* # items listed in inventory() call */ -int ntraps; /* Number of traps on this level */ -int hungry_state = 0; /* How hungry is he */ -int inpack = 0; /* Number of things in pack */ -int inv_type = 0; /* Type of inventory to use */ -int level = 1; /* What level she is on */ -int max_hit; /* Max damage done to her in to_death */ -int max_level; /* Deepest player has gone */ -int mpos = 0; /* Where cursor is on top line */ -int no_food = 0; /* Number of levels without food */ - -int count = 0; /* Number of times to repeat command */ -int food_left; /* Amount of food in hero's stomach */ -int lastscore = -1; /* Score before this turn */ -int no_command = 0; /* Number of turns asleep */ -int no_move = 0; /* Number of turns held in place */ -int purse = 0; /* How much gold he has */ -int quiet = 0; /* Number of quiet turns */ -int vf_hit = 0; /* Number of time flytrap has hit */ - - -//int dnum; /* Dungeon number */ -uint64_t seed; /* Random number seed */ - -coord delta; /* Change indicated to get_dir() */ -coord oldpos; /* Position before last look() call */ -coord stairs; /* Location of staircase */ - -PLACE places[MAXLINES*MAXCOLS]; /* level map */ - -const char *p_colors[MAXPOTIONS]; /* Colors of the potions */ -const char *r_stones[MAXRINGS]; /* Stone settings of the rings */ -const char *ws_made[MAXSTICKS]; /* What sticks are made of */ -const char *ws_type[MAXSTICKS]; /* Is it a wand or a staff */ - -THING *cur_armor; /* What he is wearing */ -THING *cur_ring[2]; /* Which rings are being worn */ -THING *cur_weapon; /* Which weapon he is weilding */ -THING *l_last_pick = NULL; /* Last last_pick */ -THING *last_pick = NULL; /* Last object picked in get_item() */ -THING *lvl_obj = NULL; /* List of objects on this level */ -THING *mlist = NULL; /* List of monsters on the level */ -struct room *oldrp; /* Roomin(&oldpos) */ -THING player; /* His stats */ -WINDOW *hw = NULL; /* used as a scratch window */ -char *s_names[MAXSCROLLS]; /* Names of the scrolls */ -FILE *scoreboard = NULL; /* File descriptor for score file */ - -#define INIT_STATS { 16, 0, 1, 10, 12, "1x4", 12 } - -struct stats max_stats = INIT_STATS; /* The maximum for the player */ -struct stats orig_max_stats = INIT_STATS; - -struct monster monsters[26]; -struct room passages[MAXPASS],rooms[MAXROOMS]; /* One for each room -- A level */ -struct obj_info things[NUMTHINGS],ring_info[MAXRINGS],pot_info[MAXPOTIONS],arm_info[MAXARMORS],scr_info[MAXSCROLLS],weap_info[MAXWEAPONS + 1],ws_info[MAXSTICKS]; - -////////////// constants -#define ___ 1 -#define XX 10 - -const struct obj_info origthings[NUMTHINGS] = { - { 0, 26 }, /* potion */ - { 0, 36 }, /* scroll */ - { 0, 16 }, /* food */ - { 0, 7 }, /* weapon */ - { 0, 7 }, /* armor */ - { 0, 4 }, /* ring */ - { 0, 4 }, /* stick */ -}; - -const struct room origpassages[MAXPASS] = /* One for each passage */ -{ - { {0, 0}, {0, 0}, {0, 0}, 0, ISGONE|ISDARK, 0, {{0,0}} }, - { {0, 0}, {0, 0}, {0, 0}, 0, ISGONE|ISDARK, 0, {{0,0}} }, - { {0, 0}, {0, 0}, {0, 0}, 0, ISGONE|ISDARK, 0, {{0,0}} }, - { {0, 0}, {0, 0}, {0, 0}, 0, ISGONE|ISDARK, 0, {{0,0}} }, - { {0, 0}, {0, 0}, {0, 0}, 0, ISGONE|ISDARK, 0, {{0,0}} }, - { {0, 0}, {0, 0}, {0, 0}, 0, ISGONE|ISDARK, 0, {{0,0}} }, - { {0, 0}, {0, 0}, {0, 0}, 0, ISGONE|ISDARK, 0, {{0,0}} }, - { {0, 0}, {0, 0}, {0, 0}, 0, ISGONE|ISDARK, 0, {{0,0}} }, - { {0, 0}, {0, 0}, {0, 0}, 0, ISGONE|ISDARK, 0, {{0,0}} }, - { {0, 0}, {0, 0}, {0, 0}, 0, ISGONE|ISDARK, 0, {{0,0}} }, - { {0, 0}, {0, 0}, {0, 0}, 0, ISGONE|ISDARK, 0, {{0,0}} }, - { {0, 0}, {0, 0}, {0, 0}, 0, ISGONE|ISDARK, 0, {{0,0}} } -}; -const struct monster origmonsters[26] = - { -/* Name CARRY FLAG str, exp, lvl, amr, hpt, dmg */ -{ "aquator", 0, ISMEAN, { XX, 20, 5, 2, ___, "0x0/0x0" } }, -{ "bat", 0, ISFLY, { XX, 1, 1, 3, ___, "1x2" } }, -{ "centaur", 15, 0, { XX, 17, 4, 4, ___, "1x2/1x5/1x5" } }, -{ "dragon", 100, ISMEAN, { XX,5000, 10, -1, ___, "1x8/1x8/3x10" } }, -{ "emu", 0, ISMEAN, { XX, 2, 1, 7, ___, "1x2" } }, -{ "venus flytrap", 0, ISMEAN, { XX, 80, 8, 3, ___, "%%%x0" } }, - /* NOTE: the damage is %%% so that xstr won't merge this */ - /* string with others, since it is written on in the program */ -{ "griffin", 20, ISMEAN|ISFLY|ISREGEN, { XX,2000, 13, 2, ___, "4x3/3x5" } }, -{ "hobgoblin", 0, ISMEAN, { XX, 3, 1, 5, ___, "1x8" } }, -{ "ice monster", 0, 0, { XX, 5, 1, 9, ___, "0x0" } }, -{ "jabberwock", 70, 0, { XX,3000, 15, 6, ___, "2x12/2x4" } }, -{ "kestrel", 0, ISMEAN|ISFLY, { XX, 1, 1, 7, ___, "1x4" } }, -{ "leprechaun", 0, 0, { XX, 10, 3, 8, ___, "1x1" } }, -{ "medusa", 40, ISMEAN, { XX,200, 8, 2, ___, "3x4/3x4/2x5" } }, -{ "nymph", 100, 0, { XX, 37, 3, 9, ___, "0x0" } }, -{ "orc", 15, ISGREED,{ XX, 5, 1, 6, ___, "1x8" } }, -{ "phantom", 0, ISINVIS,{ XX,120, 8, 3, ___, "4x4" } }, -{ "quagga", 0, ISMEAN, { XX, 15, 3, 3, ___, "1x5/1x5" } }, -{ "rattlesnake", 0, ISMEAN, { XX, 9, 2, 3, ___, "1x6" } }, -{ "snake", 0, ISMEAN, { XX, 2, 1, 5, ___, "1x3" } }, -{ "troll", 50, ISREGEN|ISMEAN,{ XX, 120, 6, 4, ___, "1x8/1x8/2x6" } }, -{ "black unicorn", 0, ISMEAN, { XX,190, 7, -2, ___, "1x9/1x9/2x9" } }, -{ "vampire", 20, ISREGEN|ISMEAN,{ XX,350, 8, 1, ___, "1x10" } }, -{ "wraith", 0, 0, { XX, 55, 5, 4, ___, "1x6" } }, -{ "xeroc", 30, 0, { XX,100, 7, 7, ___, "4x4" } }, -{ "yeti", 30, 0, { XX, 50, 4, 6, ___, "1x6/1x6" } }, -{ "zombie", 0, ISMEAN, { XX, 6, 2, 8, ___, "1x8" } } - }; -#undef ___ -#undef XX - -const struct obj_info origarm_info[MAXARMORS] = { - { "leather armor", 20, 20, NULL, FALSE }, - { "ring mail", 15, 25, NULL, FALSE }, - { "studded leather armor", 15, 20, NULL, FALSE }, - { "scale mail", 13, 30, NULL, FALSE }, - { "chain mail", 12, 75, NULL, FALSE }, - { "splint mail", 10, 80, NULL, FALSE }, - { "banded mail", 10, 90, NULL, FALSE }, - { "plate mail", 5, 150, NULL, FALSE }, -}; -const struct obj_info origpot_info[MAXPOTIONS] = { - { "confusion", 7, 5, NULL, FALSE }, - { "hallucination", 8, 5, NULL, FALSE }, - { "poison", 8, 5, NULL, FALSE }, - { "gain strength", 13, 150, NULL, FALSE }, - { "see invisible", 3, 100, NULL, FALSE }, - { "healing", 13, 130, NULL, FALSE }, - { "monster detection", 6, 130, NULL, FALSE }, - { "magic detection", 6, 105, NULL, FALSE }, - { "raise level", 2, 250, NULL, FALSE }, - { "extra healing", 5, 200, NULL, FALSE }, - { "haste self", 5, 190, NULL, FALSE }, - { "restore strength", 13, 130, NULL, FALSE }, - { "blindness", 5, 5, NULL, FALSE }, - { "levitation", 6, 75, NULL, FALSE }, -}; -const struct obj_info origring_info[MAXRINGS] = { - { "protection", 9, 400, NULL, FALSE }, - { "add strength", 9, 400, NULL, FALSE }, - { "sustain strength", 5, 280, NULL, FALSE }, - { "searching", 10, 420, NULL, FALSE }, - { "see invisible", 10, 310, NULL, FALSE }, - { "adornment", 1, 10, NULL, FALSE }, - { "aggravate monster", 10, 10, NULL, FALSE }, - { "dexterity", 8, 440, NULL, FALSE }, - { "increase damage", 8, 400, NULL, FALSE }, - { "regeneration", 4, 460, NULL, FALSE }, - { "slow digestion", 9, 240, NULL, FALSE }, - { "teleportation", 5, 30, NULL, FALSE }, - { "stealth", 7, 470, NULL, FALSE }, - { "maintain armor", 5, 380, NULL, FALSE }, -}; -const struct obj_info origscr_info[MAXSCROLLS] = { - { "monster confusion", 7, 140, NULL, FALSE }, - { "magic mapping", 4, 150, NULL, FALSE }, - { "hold monster", 2, 180, NULL, FALSE }, - { "sleep", 3, 5, NULL, FALSE }, - { "enchant armor", 7, 160, NULL, FALSE }, - { "identify potion", 10, 80, NULL, FALSE }, - { "identify scroll", 10, 80, NULL, FALSE }, - { "identify weapon", 6, 80, NULL, FALSE }, - { "identify armor", 7, 100, NULL, FALSE }, - { "identify ring, wand or staff", 10, 115, NULL, FALSE }, - { "scare monster", 3, 200, NULL, FALSE }, - { "food detection", 2, 60, NULL, FALSE }, - { "teleportation", 5, 165, NULL, FALSE }, - { "enchant weapon", 8, 150, NULL, FALSE }, - { "create monster", 4, 75, NULL, FALSE }, - { "remove curse", 7, 105, NULL, FALSE }, - { "aggravate monsters", 3, 20, NULL, FALSE }, - { "protect armor", 2, 250, NULL, FALSE }, -}; -const struct obj_info origweap_info[MAXWEAPONS + 1] = { - { "mace", 11, 8, NULL, FALSE }, - { "long sword", 11, 15, NULL, FALSE }, - { "short bow", 12, 15, NULL, FALSE }, - { "arrow", 12, 1, NULL, FALSE }, - { "dagger", 8, 3, NULL, FALSE }, - { "two handed sword", 10, 75, NULL, FALSE }, - { "dart", 12, 2, NULL, FALSE }, - { "shuriken", 12, 5, NULL, FALSE }, - { "spear", 12, 5, NULL, FALSE }, - { NULL, 0 }, /* DO NOT REMOVE: fake entry for dragon's breath */ -}; -const struct obj_info origws_info[MAXSTICKS] = { - { "light", 12, 250, NULL, FALSE }, - { "invisibility", 6, 5, NULL, FALSE }, - { "lightning", 3, 330, NULL, FALSE }, - { "fire", 3, 330, NULL, FALSE }, - { "cold", 3, 330, NULL, FALSE }, - { "polymorph", 15, 310, NULL, FALSE }, - { "magic missile", 10, 170, NULL, FALSE }, - { "haste monster", 10, 5, NULL, FALSE }, - { "slow monster", 11, 350, NULL, FALSE }, - { "drain life", 9, 300, NULL, FALSE }, - { "nothing", 1, 5, NULL, FALSE }, - { "teleport away", 6, 340, NULL, FALSE }, - { "teleport to", 6, 50, NULL, FALSE }, - { "cancellation", 5, 280, NULL, FALSE }, -}; - -const struct h_list helpstr[] = { - {'?', " prints help", TRUE}, - {'/', " identify object", TRUE}, - {'h', " left", TRUE}, - {'j', " down", TRUE}, - {'k', " up", TRUE}, - {'l', " right", TRUE}, - {'y', " up & left", TRUE}, - {'u', " up & right", TRUE}, - {'b', " down & left", TRUE}, - {'n', " down & right", TRUE}, - {'H', " run left", FALSE}, - {'J', " run down", FALSE}, - {'K', " run up", FALSE}, - {'L', " run right", FALSE}, - {'Y', " run up & left", FALSE}, - {'U', " run up & right", FALSE}, - {'B', " run down & left", FALSE}, - {'N', " run down & right", FALSE}, - {CTRL('H'), " run left until adjacent", FALSE}, - {CTRL('J'), " run down until adjacent", FALSE}, - {CTRL('K'), " run up until adjacent", FALSE}, - {CTRL('L'), " run right until adjacent", FALSE}, - {CTRL('Y'), " run up & left until adjacent", FALSE}, - {CTRL('U'), " run up & right until adjacent", FALSE}, - {CTRL('B'), " run down & left until adjacent", FALSE}, - {CTRL('N'), " run down & right until adjacent", FALSE}, - {'\0', " : run that way", TRUE}, - {'\0', " : run till adjacent", TRUE}, - {'f', " fight till death or near death", TRUE}, - {'t', " throw something", TRUE}, - {'m', " move onto without picking up", TRUE}, - {'z', " zap a wand in a direction", TRUE}, - {'^', " identify trap type", TRUE}, - {'s', " search for trap/secret door", TRUE}, - {'>', " go down a staircase", TRUE}, - {'<', " go up a staircase", TRUE}, - {'.', " rest for a turn", TRUE}, - {',', " pick something up", TRUE}, - {'i', " inventory", TRUE}, - {'I', " inventory single item", TRUE}, - {'q', " quaff potion", TRUE}, - {'r', " read scroll", TRUE}, - {'e', " eat food", TRUE}, - {'w', " wield a weapon", TRUE}, - {'W', " wear armor", TRUE}, - {'T', " take armor off", TRUE}, - {'P', " put on ring", TRUE}, - {'R', " remove ring", TRUE}, - {'d', " drop object", TRUE}, - {'c', " call object", TRUE}, - {'a', " repeat last command", TRUE}, - {')', " print current weapon", TRUE}, - {']', " print current armor", TRUE}, - {'=', " print current rings", TRUE}, - {'@', " print current stats", TRUE}, - {'D', " recall what's been discovered", TRUE}, - {'o', " examine/set options", TRUE}, - {CTRL('R'), " redraw screen", TRUE}, - {CTRL('P'), " repeat last message", TRUE}, - {ESCAPE, " cancel command", TRUE}, - {'S', " save game", TRUE}, - {'Q', " quit", TRUE}, - {'!', " shell escape", TRUE}, - {'F', " fight till either of you dies", TRUE}, - {'v', " print version number", TRUE}, - {0, NULL } -}; - -const char *inv_t_name[] = { - "Overwrite", - "Slow", - "Clear" -}; - -const char *tr_name[] = { /* Names of the traps */ - "a trapdoor", - "an arrow trap", - "a sleeping gas trap", - "a beartrap", - "a teleport trap", - "a poison dart trap", - "a rust trap", - "a mysterious trap" -}; - -const int32_t a_class[MAXARMORS] = { /* Armor class for each armor type */ - 8, /* LEATHER */ - 7, /* RING_MAIL */ - 7, /* STUDDED_LEATHER */ - 6, /* SCALE_MAIL */ - 5, /* CHAIN_MAIL */ - 4, /* SPLINT_MAIL */ - 4, /* BANDED_MAIL */ - 3, /* PLATE_MAIL */ -}; - -const int32_t e_levels[] = { - 10L, - 20L, - 40L, - 80L, - 160L, - 320L, - 640L, - 1300L, - 2600L, - 5200L, - 13000L, - 26000L, - 50000L, - 100000L, - 200000L, - 400000L, - 800000L, - 2000000L, - 4000000L, - 8000000L, - 0L -}; - -#include -extern int between; -extern int group; -extern coord nh; - -void externs_clear() -{ - int i; - after = 0; /* True if we want after daemons */ - again = 0; /* Repeating the last command */ - noscore = 0; /* Was a wizard sometime */ - seenstairs = 0; /* Have seen the stairs (for lsd) */ - amulet = FALSE; /* He found the amulet */ - door_stop = FALSE; /* Stop running when we pass a door */ - fight_flush = FALSE; /* True if toilet input */ - firstmove = FALSE; /* First move after setting door_stop */ - got_ltc = FALSE; /* We have gotten the local tty chars */ - has_hit = FALSE; /* Has a "hit" message pending in msg */ - in_shell = FALSE; /* True if executing a shell */ - inv_describe = TRUE; /* Say which way items are being used */ - jump = FALSE; /* Show running as series of jumps */ - kamikaze = FALSE; /* to_death really to DEATH */ - lower_msg = FALSE; /* Messages should start w/lower case */ - move_on = FALSE; /* Next move shouldn't pick up items */ - msg_esc = FALSE; /* Check for ESC from msg's --More-- */ - passgo = FALSE; /* Follow passages */ - playing = TRUE; /* True until he quits */ - q_comm = FALSE; /* Are we executing a 'Q' command? */ - running = FALSE; /* True if player is running */ - save_msg = TRUE; /* Remember last msg */ - see_floor = TRUE; /* Show the lamp illuminated floor */ - stat_msg = FALSE; /* Should status() print as a msg() */ - terse = FALSE; /* True if we should be short */ - to_death = FALSE; /* Fighting is to the death! */ - tombstone = TRUE; /* Print out tombstone at end */ -#ifdef MASTER - int wizard = FALSE; /* True if allows wizard commands */ -#endif - for (i=0; i<26; i++) - pack_used[i] = FALSE; - for (i=0; i -#include - -#ifdef HAVE_CONFIG_H -#ifdef PDCURSES -#undef HAVE_UNISTD_H -#undef HAVE_LIMITS_H -#undef HAVE_MEMORY_H -#undef HAVE_STRING_H -#endif -#include -#include "config.h" -#elif defined(__DJGPP__) -#define HAVE_SYS_TYPES_H 1 -#define HAVE_PROCESS_H 1 -#define HAVE_PWD_H 1 -#define HAVE_TERMIOS_H 1 -#define HAVE_SETGID 1 -#define HAVE_GETGID 1 -#define HAVE_SETUID 1 -#define HAVE_GETUID 1 -#define HAVE_GETPASS 1 -#define HAVE_SPAWNL 1 -#define HAVE_ALARM 1 -#define HAVE_ERASECHAR 1 -#define HAVE_KILLCHAR 1 -#elif defined(_WIN32) -#define HAVE_CURSES_H -#define HAVE_TERM_H -#define HAVE__SPAWNL -#define HAVE_SYS_TYPES_H -#define HAVE_PROCESS_H -#define HAVE_ERASECHAR 1 -#define HAVE_KILLCHAR 1 -#elif defined(__CYGWIN__) -#define HAVE_SYS_TYPES_H 1 -#define HAVE_PWD_H 1 -#define HAVE_PWD_H 1 -#define HAVE_SYS_UTSNAME_H 1 -#define HAVE_ARPA_INET_H 1 -#define HAVE_UNISTD_H 1 -#define HAVE_TERMIOS_H 1 -#define HAVE_NCURSES_TERM_H 1 -#define HAVE_ESCDELAY -#define HAVE_SETGID 1 -#define HAVE_GETGID 1 -#define HAVE_SETUID 1 -#define HAVE_GETUID 1 -#define HAVE_GETPASS 1 -#define HAVE_GETPWUID 1 -#define HAVE_WORKING_FORK 1 -#define HAVE_ALARM 1 -#define HAVE_SPAWNL 1 -#define HAVE__SPAWNL 1 -#define HAVE_ERASECHAR 1 -#define HAVE_KILLCHAR 1 -#else /* POSIX */ -#define HAVE_SYS_TYPES_H 1 -#define HAVE_PWD_H 1 -#define HAVE_PWD_H 1 -#define HAVE_SYS_UTSNAME_H 1 -#define HAVE_ARPA_INET_H 1 -#define HAVE_UNISTD_H 1 -#define HAVE_TERMIOS_H 1 -#define HAVE_TERM_H 1 -#define HAVE_SETGID 1 -#define HAVE_GETGID 1 -#define HAVE_SETUID 1 -#define HAVE_GETUID 1 -#define HAVE_SETREUID 1 -#define HAVE_SETREGID 1 -#define HAVE_GETPASS 1 -#define HAVE_GETPWUID 1 -#define HAVE_WORKING_FORK 1 -#define HAVE_ERASECHAR 1 -#define HAVE_KILLCHAR 1 -#ifndef _AIX -#define HAVE_GETLOADAVG 1 -#endif -#define HAVE_ALARM 1 -#endif - -#ifdef __DJGPP__ -#undef HAVE_GETPWUID /* DJGPP's limited version doesn't even work as documented */ -#endif - -/* - * Don't change the constants, since they are used for sizes in many - * places in the program. - */ - -#include -#include - -#ifdef _WIN32 -#ifdef _MSC_VER -#include -#endif -#endif - -#undef SIGTSTP - -#define MAXSTR 1024 /* maximum length of strings */ -#define MAXLINES 32 /* maximum number of screen lines used */ -#define MAXCOLS 80 /* maximum number of screen columns used */ - -#define RN ((int32_t)((seed = seed*11109+13849) >> 16) & 0xffff) -#ifdef CTRL -#undef CTRL -#endif -#define CTRL(c) (c & 037) - -/* - * Now all the global variables - */ - -extern bool got_ltc, in_shell; -extern int wizard; -extern char fruit[], prbuf[], whoami[]; -extern int orig_dsusp; -extern FILE *scoreboard; - -/* - * Function types - */ -void externs_clear(); - -void auto_save(int); -void endit(int sig); -void fatal(char *); -void getltchars(void); -void leave(int); -void my_exit(int st); -void playltchars(void); -void quit(int); -int32_t _quit(); - -void resetltchars(void); -void set_order(int *order, int numthings); -void tstp(int ignored); - -char *killname(char monst, bool doart); -char *nothing(char type); -char *type_name(int type); - -#ifdef CHECKTIME -int checkout(void); -#endif - -int md_chmod(char *filename, int mode); -char *md_crypt(char *key, char *salt); -int md_dsuspchar(void); -int md_erasechar(void); -char *md_gethomedir(void); -char *md_getusername(void); -int md_getuid(void); -char *md_getpass(char *prompt); -int md_getpid(void); -char *md_getrealname(int uid); -void md_init(void); -int md_killchar(void); -void md_normaluser(void); -void md_raw_standout(void); -void md_raw_standend(void); -int md_readchar(void); -int md_setdsuspchar(int c); -int md_shellescape(void); -void md_sleep(int s); -int md_suspchar(void); -int md_hasclreol(void); -int md_unlink(char *file); -int md_unlink_open_file(char *file, FILE *inf); -void md_tstpsignal(void); -void md_tstphold(void); -void md_tstpresume(void); -void md_ignoreallsignals(void); -void md_onsignal_autosave(void); -void md_onsignal_exit(void); -void md_onsignal_default(void); -int md_issymlink(char *sp); - -int32_t decode_hex(uint8_t *bytes,int32_t n,char *hex); - -#endif - diff --git a/src/cc/rogue/fight.c b/src/cc/rogue/fight.c deleted file mode 100644 index 304c48288..000000000 --- a/src/cc/rogue/fight.c +++ /dev/null @@ -1,684 +0,0 @@ -// Copyright (c) 2016-2023 The Hush developers -// Distributed under the GPLv3 software license, see the accompanying -// file COPYING or https://www.gnu.org/licenses/gpl-3.0.en.html -/* - * All the fighting gets done here - * - * @(#)fight.c 4.67 (Berkeley) 09/06/83 - * - * Rogue: Exploring the Dungeons of Doom - * Copyright (C) 1980-1983, 1985, 1999 Michael Toy, Ken Arnold and Glenn Wichman - * All rights reserved. - * - * See the file LICENSE.TXT for full copyright and licensing information. - */ - -//#include -//#include -//#include -//#include -#include "rogue.h" - -//#define EQSTR(a, b) (strcmp(a, b) == 0) - -const char *h_names[] = { /* strings for hitting */ - " scored an excellent hit on ", - " hit ", - " have injured ", - " swing and hit ", - " scored an excellent hit on ", - " hit ", - " has injured ", - " swings and hits " -}; - -const char *m_names[] = { /* strings for missing */ - " miss", - " swing and miss", - " barely miss", - " don't hit", - " misses", - " swings and misses", - " barely misses", - " doesn't hit", -}; - -/* - * adjustments to hit probabilities due to strength - */ -static const int str_plus[] = { - -7, -6, -5, -4, -3, -2, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, - 1, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 3, -}; - -/* - * adjustments to damage done due to strength - */ -static const int add_dam[] = { - -7, -6, -5, -4, -3, -2, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 2, 3, - 3, 4, 5, 5, 5, 5, 5, 5, 5, 5, 5, 6 -}; - -/* - * fight: - * The player attacks the monster. - */ -int -fight(struct rogue_state *rs,coord *mp, THING *weap, bool thrown) -{ - register THING *tp; - register bool did_hit = TRUE; - register char *mname, ch; - - /* - * Find the monster we want to fight - */ -#ifdef MASTER - if ((tp = moat(mp->y, mp->x)) == NULL) - debug("Fight what @ %d,%d", mp->y, mp->x); -#else - tp = moat(mp->y, mp->x); -#endif - /* - * Since we are fighting, things are not quiet so no healing takes - * place. - */ - count = 0; - quiet = 0; - runto(rs,mp); - /* - * Let him know it was really a xeroc (if it was one). - */ - ch = '\0'; - if (tp->t_type == 'X' && tp->t_disguise != 'X' && !on(player, ISBLIND)) - { - tp->t_disguise = 'X'; - if (on(player, ISHALU)) { - ch = (char)(rnd(26) + 'A'); - mvaddch(tp->t_pos.y, tp->t_pos.x, ch); - } - msg(rs,choose_str("heavy! That's a nasty critter!", - "wait! That's a xeroc!")); - if (!thrown) - return FALSE; - } - mname = set_mname(tp); - did_hit = FALSE; - has_hit = (terse && !to_death); - if (roll_em(&player, tp, weap, thrown)) - { - did_hit = FALSE; - if (thrown) - thunk(rs,weap, mname, terse); - else - hit(rs,(char *) NULL, mname, terse); - if (on(player, CANHUH)) - { - did_hit = TRUE; - tp->t_flags |= ISHUH; - player.t_flags &= ~CANHUH; - endmsg(rs); - has_hit = FALSE; - msg(rs,"your hands stop glowing %s", pick_color("red")); - } - if (tp->t_stats.s_hpt <= 0) - killed(rs,tp, TRUE); - else if (did_hit && !on(player, ISBLIND)) - msg(rs,"%s appears confused", mname); - did_hit = TRUE; - } - else - if (thrown) - bounce(rs,weap, mname, terse); - else - miss(rs,(char *) NULL, mname, terse); - return did_hit; -} - -/* - * attack: - * The monster attacks the player - */ -int -attack(struct rogue_state *rs,THING *mp) -{ - register char *mname; - register int oldhp; - - /* - * Since this is an attack, stop running and any healing that was - * going on at the time. - */ - running = FALSE; - count = 0; - quiet = 0; - if (to_death && !on(*mp, ISTARGET)) - { - to_death = FALSE; - kamikaze = FALSE; - } - if (mp->t_type == 'X' && mp->t_disguise != 'X' && !on(player, ISBLIND)) - { - mp->t_disguise = 'X'; - if (on(player, ISHALU)) - mvaddch(mp->t_pos.y, mp->t_pos.x, rnd(26) + 'A'); - } - mname = set_mname(mp); - oldhp = pstats.s_hpt; - if (roll_em(mp, &player, (THING *) NULL, FALSE)) - { - if (mp->t_type != 'I') - { - if (has_hit) - addmsg(rs,". "); - hit(rs,mname, (char *) NULL, FALSE); - } - else - if (has_hit) - endmsg(rs); - has_hit = FALSE; - if (pstats.s_hpt <= 0) - death(rs,mp->t_type); /* Bye bye life ... */ - else if (!kamikaze) - { - oldhp -= pstats.s_hpt; - if (oldhp > max_hit) - max_hit = oldhp; - if (pstats.s_hpt <= max_hit) - to_death = FALSE; - } - if (!on(*mp, ISCANC)) - switch (mp->t_type) - { - case 'A': - /* - * If an aquator hits, you can lose armor class. - */ - rust_armor(rs,cur_armor); - when 'I': - /* - * The ice monster freezes you - */ - player.t_flags &= ~ISRUN; - if (!no_command) - { - addmsg(rs,"you are frozen"); - if (!terse) - addmsg(rs," by the %s", mname); - endmsg(rs); - } - no_command += rnd(2) + 2; - if (no_command > BORE_LEVEL) - death(rs,'h'); - when 'R': - /* - * Rattlesnakes have poisonous bites - */ - if (!save(VS_POISON)) - { - if (!ISWEARING(R_SUSTSTR)) - { - chg_str(-1); - if (!terse) - msg(rs,"you feel a bite in your leg and now feel weaker"); - else - msg(rs,"a bite has weakened you"); - } - else if (!to_death) - { - if (!terse) - msg(rs,"a bite momentarily weakens you"); - else - msg(rs,"bite has no effect"); - } - } - when 'W': - case 'V': - /* - * Wraiths might drain energy levels, and Vampires - * can steal max_hp - */ - if (rnd(100) < (mp->t_type == 'W' ? 15 : 30)) - { - register int fewer; - - if (mp->t_type == 'W') - { - if (pstats.s_exp == 0) - death(rs,'W'); /* All levels gone */ - if (--pstats.s_lvl == 0) - { - pstats.s_exp = 0; - pstats.s_lvl = 1; - } - else - pstats.s_exp = e_levels[pstats.s_lvl-1]+1; - fewer = roll(1, 10); - } - else - fewer = roll(1, 3); - pstats.s_hpt -= fewer; - max_hp -= fewer; - if (pstats.s_hpt <= 0) - pstats.s_hpt = 1; - if (max_hp <= 0) - death(rs,mp->t_type); - msg(rs,"you suddenly feel weaker"); - } - when 'F': - /* - * Venus Flytrap stops the poor guy from moving - */ - player.t_flags |= ISHELD; - sprintf(monsters['F'-'A'].m_stats.s_dmg,"%dx1", ++vf_hit); - if (--pstats.s_hpt <= 0) - death(rs,'F'); - when 'L': - { - /* - * Leperachaun steals some gold - */ - register int lastpurse; - - lastpurse = purse; - purse -= GOLDCALC; - if (!save(VS_MAGIC)) - purse -= GOLDCALC + GOLDCALC + GOLDCALC + GOLDCALC; - if (purse < 0) - purse = 0; - remove_mon(rs,&mp->t_pos, mp, FALSE); - mp=NULL; - if (purse != lastpurse) - msg(rs,"your purse feels lighter"); - } - when 'N': - { - THING *obj, *steal; int nobj; - - /* - * Nymph's steal a magic item, look through the pack - * and pick out one we like. - */ - steal = NULL; - for (nobj = 0, obj = pack; obj != NULL; obj = next(obj)) - if (obj != cur_armor && obj != cur_weapon - && obj != cur_ring[LEFT] && obj != cur_ring[RIGHT] - && is_magic(obj) && rnd(++nobj) == 0) - steal = obj; - if (steal != NULL) - { - remove_mon(rs,&mp->t_pos, moat(mp->t_pos.y, mp->t_pos.x), FALSE); - mp=NULL; - leave_pack(rs,steal, FALSE, FALSE); - msg(rs,"she stole %s!", inv_name(steal, TRUE)); - if ( steal->o_count <= 0 ) - discard(steal); - } - } - otherwise: - break; - } - } - else if (mp->t_type != 'I') - { - if (has_hit) - { - addmsg(rs,". "); - has_hit = FALSE; - } - if (mp->t_type == 'F') - { - pstats.s_hpt -= vf_hit; - if (pstats.s_hpt <= 0) - death(rs,mp->t_type); /* Bye bye life ... */ - } - miss(rs,mname, (char *) NULL, FALSE); - } - if (fight_flush && !to_death) - flush_type(); - count = 0; - status(rs); - if (mp == NULL) - return(-1); - else - return(0); -} - -/* - * set_mname: - * return the monster name for the given monster - */ -char * -set_mname(THING *tp) -{ - int ch; - char *mname; - static char tbuf[MAXSTR] = { 't', 'h', 'e', ' ' }; - - if (!see_monst(tp) && !on(player, SEEMONST)) - return (terse ? (char *)"it" : (char *)"something"); - else if (on(player, ISHALU)) - { - move(tp->t_pos.y, tp->t_pos.x); - ch = toascii(inch()); - if (!isupper(ch)) - ch = rnd(26); - else - ch -= 'A'; - mname = monsters[ch].m_name; - } - else - mname = monsters[tp->t_type - 'A'].m_name; - strcpy(&tbuf[4], mname); - return tbuf; -} - -/* - * swing: - * Returns true if the swing hits - */ -int -swing(int at_lvl, int op_arm, int wplus) -{ - int res = rnd(20); - int need = (20 - at_lvl) - op_arm; - - return (res + wplus >= need); -} - -/* - * roll_em: - * Roll several attacks - */ -bool -roll_em(THING *thatt, THING *thdef, THING *weap, bool hurl) -{ - register struct stats *att, *def; - register char *cp; - register int ndice, nsides, def_arm; - register bool did_hit = FALSE; - register int hplus; - register int dplus; - register int damage; - - att = &thatt->t_stats; - def = &thdef->t_stats; - if (weap == NULL) - { - cp = att->s_dmg; - dplus = 0; - hplus = 0; - } - else - { - hplus = (weap == NULL ? 0 : weap->o_hplus); - dplus = (weap == NULL ? 0 : weap->o_dplus); - if (weap == cur_weapon) - { - if (ISRING(LEFT, R_ADDDAM)) - dplus += cur_ring[LEFT]->o_arm; - else if (ISRING(LEFT, R_ADDHIT)) - hplus += cur_ring[LEFT]->o_arm; - if (ISRING(RIGHT, R_ADDDAM)) - dplus += cur_ring[RIGHT]->o_arm; - else if (ISRING(RIGHT, R_ADDHIT)) - hplus += cur_ring[RIGHT]->o_arm; - } - cp = weap->o_damage; - if (hurl) - { - if ((weap->o_flags&ISMISL) && cur_weapon != NULL && - cur_weapon->o_which == weap->o_launch) - { - cp = weap->o_hurldmg; - hplus += cur_weapon->o_hplus; - dplus += cur_weapon->o_dplus; - } - else if (weap->o_launch < 0) - cp = weap->o_hurldmg; - } - } - /* - * If the creature being attacked is not running (alseep or held) - * then the attacker gets a plus four bonus to hit. - */ - if (!on(*thdef, ISRUN)) - hplus += 4; - def_arm = def->s_arm; - if (def == &pstats) - { - if (cur_armor != NULL) - def_arm = cur_armor->o_arm; - if (ISRING(LEFT, R_PROTECT)) - def_arm -= cur_ring[LEFT]->o_arm; - if (ISRING(RIGHT, R_PROTECT)) - def_arm -= cur_ring[RIGHT]->o_arm; - } - while(cp != NULL && *cp != '\0') - { - ndice = atoi(cp); - if ((cp = strchr(cp, 'x')) == NULL) - break; - nsides = atoi(++cp); - if (swing(att->s_lvl, def_arm, hplus + str_plus[att->s_str])) - { - int proll; - - proll = roll(ndice, nsides); -#ifdef MASTER - if (ndice + nsides > 0 && proll <= 0) - debug("Damage for %dx%d came out %d, dplus = %d, add_dam = %d, def_arm = %d", ndice, nsides, proll, dplus, add_dam[att->s_str], def_arm); -#endif - damage = dplus + proll + add_dam[att->s_str]; - def->s_hpt -= max(0, damage); - did_hit = TRUE; - } - if ((cp = strchr(cp, '/')) == NULL) - break; - cp++; - } - return did_hit; -} - -/* - * prname: - * The print name of a combatant - */ -char * -prname(char *mname, bool upper) -{ - static char tbuf[MAXSTR]; - - *tbuf = '\0'; - if (mname == 0) - strcpy(tbuf, "you"); - else - strcpy(tbuf, mname); - if (upper) - *tbuf = (char) toupper(*tbuf); - return tbuf; -} - -/* - * thunk: - * A missile hits a monster - */ -void -thunk(struct rogue_state *rs,THING *weap, char *mname, bool noend) -{ - if (to_death) - return; - if (weap->o_type == WEAPON) - addmsg(rs,"the %s hits ", weap_info[weap->o_which].oi_name); - else - addmsg(rs,"you hit "); - addmsg(rs,"%s", mname); - if (!noend) - endmsg(rs); -} - -/* - * hit: - * Print a message to indicate a succesful hit - */ - -void -hit(struct rogue_state *rs,char *er, char *ee, bool noend) -{ - int32_t i; const char *s; - - if (to_death) - return; - addmsg(rs,prname(er, TRUE)); - if (terse) - s = " hit"; - else - { - i = rnd(4); - if (er != NULL) - i += 4; - s = h_names[i]; - } - addmsg(rs,(char *)s); - if (!terse) - addmsg(rs,prname(ee, FALSE)); - if (!noend) - endmsg(rs); -} - -/* - * miss: - * Print a message to indicate a poor swing - */ -void -miss(struct rogue_state *rs,char *er, char *ee, bool noend) -{ - int i; - - if (to_death) - return; - addmsg(rs,prname(er, TRUE)); - if (terse) - i = 0; - else - i = rnd(4); - if (er != NULL) - i += 4; - addmsg(rs,(char *)m_names[i]); - if (!terse) - addmsg(rs," %s", prname(ee, FALSE)); - if (!noend) - endmsg(rs); -} - -/* - * bounce: - * A missile misses a monster - */ -void -bounce(struct rogue_state *rs,THING *weap, char *mname, bool noend) -{ - if (to_death) - return; - if (weap->o_type == WEAPON) - addmsg(rs,"the %s misses ", weap_info[weap->o_which].oi_name); - else - addmsg(rs,"you missed "); - addmsg(rs,mname); - if (!noend) - endmsg(rs); -} - -/* - * remove_mon: - * Remove a monster from the screen - */ -void -remove_mon(struct rogue_state *rs,coord *mp, THING *tp, bool waskill) -{ - register THING *obj, *nexti; - for (obj = tp->t_pack; obj != NULL; obj = nexti) - { - nexti = next(obj); - obj->o_pos = tp->t_pos; - detach(tp->t_pack, obj); - if (waskill) - fall(rs,obj, FALSE); - else discard(obj); - } - moat(mp->y, mp->x) = NULL; - mvaddch(mp->y, mp->x, tp->t_oldch); - detach(mlist, tp); - if (on(*tp, ISTARGET)) - { - kamikaze = FALSE; - to_death = FALSE; - if (fight_flush) - flush_type(); - } - discard(tp); -} - -/* - * killed: - * Called to put a monster to death - */ -void -killed(struct rogue_state *rs,THING *tp, bool pr) -{ - char *mname; - - pstats.s_exp += tp->t_stats.s_exp; - - /* - * If the monster was a venus flytrap, un-hold him - */ - switch (tp->t_type) - { - case 'F': - player.t_flags &= ~ISHELD; - vf_hit = 0; - strcpy(monsters['F'-'A'].m_stats.s_dmg, "000x0"); - when 'L': - { - THING *gold; - - if (fallpos(&tp->t_pos, &tp->t_room->r_gold) && level >= max_level) - { - gold = new_item(); - gold->o_type = GOLD; - gold->o_goldval = GOLDCALC; - if (save(VS_MAGIC)) - gold->o_goldval += GOLDCALC + GOLDCALC - + GOLDCALC + GOLDCALC; - attach(tp->t_pack, gold); - } - } - } - /* - * Get rid of the monster. - */ - mname = set_mname(tp); - remove_mon(rs,&tp->t_pos, tp, TRUE); - if (pr) - { - if (has_hit) - { - addmsg(rs,". Defeated "); - has_hit = FALSE; - } - else - { - if (!terse) - addmsg(rs,"you have "); - addmsg(rs,"defeated "); - } - msg(rs,mname); - } - /* - * Do adjustments if he went up a level - */ - check_level(rs); - if (fight_flush) - flush_type(); -} diff --git a/src/cc/rogue/init.c b/src/cc/rogue/init.c deleted file mode 100644 index 18d5c3f7f..000000000 --- a/src/cc/rogue/init.c +++ /dev/null @@ -1,498 +0,0 @@ -// Copyright (c) 2016-2023 The Hush developers -// Distributed under the GPLv3 software license, see the accompanying -// file COPYING or https://www.gnu.org/licenses/gpl-3.0.en.html -/* - * global variable initializaton - * - * @(#)init.c 4.31 (Berkeley) 02/05/99 - * - * Rogue: Exploring the Dungeons of Doom - * Copyright (C) 1980-1983, 1985, 1999 Michael Toy, Ken Arnold and Glenn Wichman - * All rights reserved. - * - * See the file LICENSE.TXT for full copyright and licensing information. - */ - -//#include -//#include -//#include -//#include -#include "rogue.h" - -/* - * init_player: - * Roll her up - */ -void rogue_restoreobject(THING *o,struct rogue_packitem *item); - -int32_t rogue_total(THING *o) -{ - if ( (o->o_flags & ISMANY) != 0 ) - return(1); - else return(o->o_count); -} - -void restore_player(struct rogue_state *rs) -{ - int32_t i,total = 0; THING *obj; - //rs->P.gold = purse; - max_hp = rs->P.hitpoints; - //pstats.s_hpt = max_hp; - pstats.s_str = rs->P.strength & 0xffff; - if ( (max_stats.s_str= (rs->P.strength >> 16) & 0xffff) == 0 ) - max_stats.s_str = 16; - if ( pstats.s_str > max_stats.s_str ) - pstats.s_str = max_stats.s_str; - pstats.s_lvl = rs->P.level; - pstats.s_exp = rs->P.experience; - for (i=0; iP.packsize&&iP.roguepack[i]); - total += rogue_total(obj); - if ( total > ROGUE_MAXTOTAL ) - break; - add_pack(rs,obj,TRUE); - } -} - -void init_player(struct rogue_state *rs) -{ - register THING *obj; int32_t i; - pstats = max_stats; - food_left = HUNGERTIME; - - if ( rs->restoring != 0 ) - { - // duplicate rng usage of normal case - obj = new_item(); - init_weapon(obj, MACE); - free(obj); - obj = new_item(); - init_weapon(obj, BOW); - free(obj); - obj = new_item(); - init_weapon(obj, ARROW); - obj->o_count = rnd(15) + 25; - free(obj); - } - else - { - /* - * Give him some food - */ - obj = new_item(); - obj->o_type = FOOD; - obj->o_count = 1; - add_pack(rs,obj, TRUE); - /* - * And his suit of armor - */ - obj = new_item(); - obj->o_type = ARMOR; - obj->o_which = RING_MAIL; - obj->o_arm = a_class[RING_MAIL] - 1; - obj->o_flags |= ISKNOW; - obj->o_count = 1; - cur_armor = obj; - add_pack(rs,obj, TRUE); - /* - * Give him his weaponry. First a mace. - */ - obj = new_item(); - init_weapon(obj, MACE); - obj->o_hplus = 1; - obj->o_dplus = 1; - obj->o_flags |= ISKNOW; - add_pack(rs,obj, TRUE); - cur_weapon = obj; - /* - * Now a +1 bow - */ - obj = new_item(); - init_weapon(obj, BOW); - obj->o_hplus = 1; - obj->o_flags |= ISKNOW; - add_pack(rs,obj, TRUE); - /* - * Now some arrows - */ - obj = new_item(); - init_weapon(obj, ARROW); - obj->o_count = rnd(15) + 25; - obj->o_flags |= ISKNOW; - add_pack(rs,obj, TRUE); - //fprintf(stderr,"initial o_count.%d\n",obj->o_count); sleep(3); - } -} - -/* - * Contains defintions and functions for dealing with things like - * potions and scrolls - */ - -const char *rainbow[] = { - "amber", - "aquamarine", - "black", - "blue", - "brown", - "clear", - "crimson", - "cyan", - "ecru", - "gold", - "green", - "grey", - "magenta", - "orange", - "pink", - "plaid", - "purple", - "red", - "silver", - "tan", - "tangerine", - "topaz", - "turquoise", - "vermilion", - "violet", - "white", - "yellow", -}; - -#define NCOLORS (sizeof rainbow / sizeof (char *)) -int cNCOLORS = NCOLORS; - -static const char *sylls[] = { - "a", "ab", "ag", "aks", "ala", "an", "app", "arg", "arze", "ash", - "bek", "bie", "bit", "bjor", "blu", "bot", "bu", "byt", "comp", - "con", "cos", "cre", "dalf", "dan", "den", "do", "e", "eep", "el", - "eng", "er", "ere", "erk", "esh", "evs", "fa", "fid", "fri", "fu", - "gan", "gar", "glen", "gop", "gre", "ha", "hyd", "i", "ing", "ip", - "ish", "it", "ite", "iv", "jo", "kho", "kli", "klis", "la", "lech", - "mar", "me", "mi", "mic", "mik", "mon", "mung", "mur", "nej", - "nelg", "nep", "ner", "nes", "nes", "nih", "nin", "o", "od", "ood", - "org", "orn", "ox", "oxy", "pay", "ple", "plu", "po", "pot", - "prok", "re", "rea", "rhov", "ri", "ro", "rog", "rok", "rol", "sa", - "san", "sat", "sef", "seh", "shu", "ski", "sna", "sne", "snik", - "sno", "so", "sol", "sri", "sta", "sun", "ta", "tab", "tem", - "ther", "ti", "tox", "trol", "tue", "turs", "u", "ulk", "um", "un", - "uni", "ur", "val", "viv", "vly", "vom", "wah", "wed", "werg", - "wex", "whon", "wun", "xo", "y", "yot", "yu", "zant", "zeb", "zim", - "zok", "zon", "zum", -}; - -const STONE stones[] = { - { "agate", 25}, - { "alexandrite", 40}, - { "amethyst", 50}, - { "carnelian", 40}, - { "diamond", 300}, - { "emerald", 300}, - { "germanium", 225}, - { "granite", 5}, - { "garnet", 50}, - { "jade", 150}, - { "kryptonite", 300}, - { "lapis lazuli", 50}, - { "moonstone", 50}, - { "obsidian", 15}, - { "onyx", 60}, - { "opal", 200}, - { "pearl", 220}, - { "peridot", 63}, - { "ruby", 350}, - { "sapphire", 285}, - { "stibotantalite", 200}, - { "tiger eye", 50}, - { "topaz", 60}, - { "turquoise", 70}, - { "taaffeite", 300}, - { "zircon", 80}, -}; - -#define NSTONES (sizeof stones / sizeof (STONE)) -int cNSTONES = NSTONES; - -const char *wood[] = { - "avocado wood", - "balsa", - "bamboo", - "banyan", - "birch", - "cedar", - "cherry", - "cinnibar", - "cypress", - "dogwood", - "driftwood", - "ebony", - "elm", - "eucalyptus", - "fall", - "hemlock", - "holly", - "ironwood", - "kukui wood", - "mahogany", - "manzanita", - "maple", - "oaken", - "persimmon wood", - "pecan", - "pine", - "poplar", - "redwood", - "rosewood", - "spruce", - "teak", - "walnut", - "zebrawood", -}; - -#define NWOOD (sizeof wood / sizeof (char *)) -int cNWOOD = NWOOD; - -const char *metal[] = { - "aluminum", - "beryllium", - "bone", - "brass", - "bronze", - "copper", - "electrum", - "gold", - "iron", - "lead", - "magnesium", - "mercury", - "nickel", - "pewter", - "platinum", - "steel", - "silver", - "silicon", - "tin", - "titanium", - "tungsten", - "zinc", -}; - -#define NMETAL (sizeof metal / sizeof (char *)) -int cNMETAL = NMETAL; -#define MAX3(a,b,c) (a > b ? (a > c ? a : c) : (b > c ? b : c)) - -static bool used[MAX3(NCOLORS, NSTONES, NWOOD)]; - -/* - * init_colors: - * Initialize the potion color scheme for this time - */ -void -init_colors() -{ - register int i, j; - memset(used,0,sizeof(used)); - for (i = 0; i < NCOLORS; i++) - used[i] = FALSE; - for (i = 0; i < MAXPOTIONS; i++) - { - do - j = rnd(NCOLORS); - until (!used[j]); - used[j] = TRUE; - p_colors[i] = rainbow[j]; - } -} - -/* - * init_names: - * Generate the names of the various scrolls - */ -#define MAXNAME 40 /* Max number of characters in a name */ - -void -init_names() -{ - register int nsyl; - register char *cp; const char *sp; - register int i, nwords; - - for (i = 0; i < MAXSCROLLS; i++) - { - cp = prbuf; - nwords = rnd(3) + 2; - while (nwords--) - { - nsyl = rnd(3) + 1; - while (nsyl--) - { - sp = sylls[rnd((sizeof sylls) / (sizeof (char *)))]; - if (&cp[strlen(sp)] > &prbuf[MAXNAME]) - break; - while (*sp) - *cp++ = *sp++; - } - *cp++ = ' '; - } - *--cp = '\0'; - s_names[i] = (char *) malloc((unsigned) strlen(prbuf)+1); - strcpy(s_names[i], prbuf); - } -} - -/* - * init_stones: - * Initialize the ring stone setting scheme for this time - */ -void -init_stones() -{ - register int i, j; - for (i = 0; i < NSTONES; i++) - used[i] = FALSE; - for (i = 0; i < MAXRINGS; i++) - { - do - j = rnd(NSTONES); - until (!used[j]); - used[j] = TRUE; - r_stones[i] = stones[j].st_name; - ring_info[i].oi_worth += stones[j].st_value; - } -} - -/* - * init_materials: - * Initialize the construction materials for wands and staffs - */ -void -init_materials() -{ - register int i, j; - register const char *str; - static bool metused[NMETAL]; - memset(metused,0,sizeof(metused)); - for (i = 0; i < NWOOD; i++) - used[i] = FALSE; - for (i = 0; i < NMETAL; i++) - metused[i] = FALSE; - for (i = 0; i < MAXSTICKS; i++) - { - for (;;) - if (rnd(2) == 0) - { - j = rnd(NMETAL); - if (!metused[j]) - { - ws_type[i] = "wand"; - str = metal[j]; - metused[j] = TRUE; - break; - } - } - else - { - j = rnd(NWOOD); - if (!used[j]) - { - ws_type[i] = "staff"; - str = wood[j]; - used[j] = TRUE; - break; - } - } - ws_made[i] = str; - } -} - -#ifdef MASTER -# define NT NUMTHINGS, "things" -# define MP MAXPOTIONS, "potions" -# define MS MAXSCROLLS, "scrolls" -# define MR MAXRINGS, "rings" -# define MWS MAXSTICKS, "sticks" -# define MW MAXWEAPONS, "weapons" -# define MA MAXARMORS, "armor" -#else -# define NT NUMTHINGS -# define MP MAXPOTIONS -# define MS MAXSCROLLS -# define MR MAXRINGS -# define MWS MAXSTICKS -# define MW MAXWEAPONS -# define MA MAXARMORS -#endif - -/* - * sumprobs: - * Sum up the probabilities for items appearing - */ -void -sumprobs(struct obj_info *info, int bound -#ifdef MASTER - , char *name -#endif -) -{ -#ifdef MASTER - struct obj_info *start = info; -#endif - struct obj_info *endp; - endp = info + bound; - while (++info < endp) - info->oi_prob += (info - 1)->oi_prob; -#ifdef MASTER - badcheck(name, start, bound); -#endif -} - -/* - * init_probs: - * Initialize the probabilities for the various items - */ -void -init_probs() -{ - sumprobs(things, NT); - sumprobs(pot_info, MP); - sumprobs(scr_info, MS); - sumprobs(ring_info, MR); - sumprobs(ws_info, MWS); - sumprobs(weap_info, MW); - sumprobs(arm_info, MA); -} - -#ifdef MASTER -/* - * badcheck: - * Check to see if a series of probabilities sums to 100 - */ -void -badcheck(char *name, struct obj_info *info, int bound) -{ - register struct obj_info *end; - - if (info[bound - 1].oi_prob == 100) - return; - printf("\nBad percentages for %s (bound = %d):\n", name, bound); - for (end = &info[bound]; info < end; info++) - printf("%3d%% %s\n", info->oi_prob, info->oi_name); - printf("[hit RETURN to continue]"); - fflush(stdout); - while (getchar() != '\n') - continue; -} -#endif - -/* - * pick_color: - * If he is halucinating, pick a random color name and return it, - * otherwise return the given color. - */ -char * -pick_color(char *col) -{ - return (on(player, ISHALU) ? (char *)rainbow[rnd(NCOLORS)] : col); -} diff --git a/src/cc/rogue/install-sh b/src/cc/rogue/install-sh deleted file mode 100755 index 4d4a9519e..000000000 --- a/src/cc/rogue/install-sh +++ /dev/null @@ -1,323 +0,0 @@ -#!/bin/sh -# install - install a program, script, or datafile - -scriptversion=2005-05-14.22 - -# This originates from X11R5 (mit/util/scripts/install.sh), which was -# later released in X11R6 (xc/config/util/install.sh) with the -# following copyright and license. -# -# Copyright (C) 1994 X Consortium -# -# 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 -# X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN -# AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNEC- -# TION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -# -# Except as contained in this notice, the name of the X Consortium shall not -# be used in advertising or otherwise to promote the sale, use or other deal- -# ings in this Software without prior written authorization from the X Consor- -# tium. -# -# -# FSF changes to this file are in the public domain. -# -# Calling this script install-sh is preferred over install.sh, to prevent -# `make' implicit rules from creating a file called install from it -# when there is no Makefile. -# -# This script is compatible with the BSD install script, but was written -# from scratch. It can only install one file at a time, a restriction -# shared with many OS's install programs. - -# set DOITPROG to echo to test this script - -# Don't use :- since 4.3BSD and earlier shells don't like it. -doit="${DOITPROG-}" - -# put in absolute paths if you don't have them in your path; or use env. vars. - -mvprog="${MVPROG-mv}" -cpprog="${CPPROG-cp}" -chmodprog="${CHMODPROG-chmod}" -chownprog="${CHOWNPROG-chown}" -chgrpprog="${CHGRPPROG-chgrp}" -stripprog="${STRIPPROG-strip}" -rmprog="${RMPROG-rm}" -mkdirprog="${MKDIRPROG-mkdir}" - -chmodcmd="$chmodprog 0755" -chowncmd= -chgrpcmd= -stripcmd= -rmcmd="$rmprog -f" -mvcmd="$mvprog" -src= -dst= -dir_arg= -dstarg= -no_target_directory= - -usage="Usage: $0 [OPTION]... [-T] SRCFILE DSTFILE - or: $0 [OPTION]... SRCFILES... DIRECTORY - or: $0 [OPTION]... -t DIRECTORY SRCFILES... - or: $0 [OPTION]... -d DIRECTORIES... - -In the 1st form, copy SRCFILE to DSTFILE. -In the 2nd and 3rd, copy all SRCFILES to DIRECTORY. -In the 4th, create DIRECTORIES. - -Options: --c (ignored) --d create directories instead of installing files. --g GROUP $chgrpprog installed files to GROUP. --m MODE $chmodprog installed files to MODE. --o USER $chownprog installed files to USER. --s $stripprog installed files. --t DIRECTORY install into DIRECTORY. --T report an error if DSTFILE is a directory. ---help display this help and exit. ---version display version info and exit. - -Environment variables override the default commands: - CHGRPPROG CHMODPROG CHOWNPROG CPPROG MKDIRPROG MVPROG RMPROG STRIPPROG -" - -while test -n "$1"; do - case $1 in - -c) shift - continue;; - - -d) dir_arg=true - shift - continue;; - - -g) chgrpcmd="$chgrpprog $2" - shift - shift - continue;; - - --help) echo "$usage"; exit $?;; - - -m) chmodcmd="$chmodprog $2" - shift - shift - continue;; - - -o) chowncmd="$chownprog $2" - shift - shift - continue;; - - -s) stripcmd=$stripprog - shift - continue;; - - -t) dstarg=$2 - shift - shift - continue;; - - -T) no_target_directory=true - shift - continue;; - - --version) echo "$0 $scriptversion"; exit $?;; - - *) # When -d is used, all remaining arguments are directories to create. - # When -t is used, the destination is already specified. - test -n "$dir_arg$dstarg" && break - # Otherwise, the last argument is the destination. Remove it from $@. - for arg - do - if test -n "$dstarg"; then - # $@ is not empty: it contains at least $arg. - set fnord "$@" "$dstarg" - shift # fnord - fi - shift # arg - dstarg=$arg - done - break;; - esac -done - -if test -z "$1"; then - if test -z "$dir_arg"; then - echo "$0: no input file specified." >&2 - exit 1 - fi - # It's OK to call `install-sh -d' without argument. - # This can happen when creating conditional directories. - exit 0 -fi - -for src -do - # Protect names starting with `-'. - case $src in - -*) src=./$src ;; - esac - - if test -n "$dir_arg"; then - dst=$src - src= - - if test -d "$dst"; then - mkdircmd=: - chmodcmd= - else - mkdircmd=$mkdirprog - fi - else - # Waiting for this to be detected by the "$cpprog $src $dsttmp" command - # might cause directories to be created, which would be especially bad - # if $src (and thus $dsttmp) contains '*'. - if test ! -f "$src" && test ! -d "$src"; then - echo "$0: $src does not exist." >&2 - exit 1 - fi - - if test -z "$dstarg"; then - echo "$0: no destination specified." >&2 - exit 1 - fi - - dst=$dstarg - # Protect names starting with `-'. - case $dst in - -*) dst=./$dst ;; - esac - - # If destination is a directory, append the input filename; won't work - # if double slashes aren't ignored. - if test -d "$dst"; then - if test -n "$no_target_directory"; then - echo "$0: $dstarg: Is a directory" >&2 - exit 1 - fi - dst=$dst/`basename "$src"` - fi - fi - - # This sed command emulates the dirname command. - dstdir=`echo "$dst" | sed -e 's,/*$,,;s,[^/]*$,,;s,/*$,,;s,^$,.,'` - - # Make sure that the destination directory exists. - - # Skip lots of stat calls in the usual case. - if test ! -d "$dstdir"; then - defaultIFS=' - ' - IFS="${IFS-$defaultIFS}" - - oIFS=$IFS - # Some sh's can't handle IFS=/ for some reason. - IFS='%' - set x `echo "$dstdir" | sed -e 's@/@%@g' -e 's@^%@/@'` - shift - IFS=$oIFS - - pathcomp= - - while test $# -ne 0 ; do - pathcomp=$pathcomp$1 - shift - if test ! -d "$pathcomp"; then - $mkdirprog "$pathcomp" - # mkdir can fail with a `File exist' error in case several - # install-sh are creating the directory concurrently. This - # is OK. - test -d "$pathcomp" || exit - fi - pathcomp=$pathcomp/ - done - fi - - if test -n "$dir_arg"; then - $doit $mkdircmd "$dst" \ - && { test -z "$chowncmd" || $doit $chowncmd "$dst"; } \ - && { test -z "$chgrpcmd" || $doit $chgrpcmd "$dst"; } \ - && { test -z "$stripcmd" || $doit $stripcmd "$dst"; } \ - && { test -z "$chmodcmd" || $doit $chmodcmd "$dst"; } - - else - dstfile=`basename "$dst"` - - # Make a couple of temp file names in the proper directory. - dsttmp=$dstdir/_inst.$$_ - rmtmp=$dstdir/_rm.$$_ - - # Trap to clean up those temp files at exit. - trap 'ret=$?; rm -f "$dsttmp" "$rmtmp" && exit $ret' 0 - trap '(exit $?); exit' 1 2 13 15 - - # Copy the file name to the temp name. - $doit $cpprog "$src" "$dsttmp" && - - # and set any options; do chmod last to preserve setuid bits. - # - # If any of these fail, we abort the whole thing. If we want to - # ignore errors from any of these, just make sure not to ignore - # errors from the above "$doit $cpprog $src $dsttmp" command. - # - { test -z "$chowncmd" || $doit $chowncmd "$dsttmp"; } \ - && { test -z "$chgrpcmd" || $doit $chgrpcmd "$dsttmp"; } \ - && { test -z "$stripcmd" || $doit $stripcmd "$dsttmp"; } \ - && { test -z "$chmodcmd" || $doit $chmodcmd "$dsttmp"; } && - - # Now rename the file to the real destination. - { $doit $mvcmd -f "$dsttmp" "$dstdir/$dstfile" 2>/dev/null \ - || { - # The rename failed, perhaps because mv can't rename something else - # to itself, or perhaps because mv is so ancient that it does not - # support -f. - - # Now remove or move aside any old file at destination location. - # We try this two ways since rm can't unlink itself on some - # systems and the destination file might be busy for other - # reasons. In this case, the final cleanup might fail but the new - # file should still install successfully. - { - if test -f "$dstdir/$dstfile"; then - $doit $rmcmd -f "$dstdir/$dstfile" 2>/dev/null \ - || $doit $mvcmd -f "$dstdir/$dstfile" "$rmtmp" 2>/dev/null \ - || { - echo "$0: cannot unlink or rename $dstdir/$dstfile" >&2 - (exit 1); exit 1 - } - else - : - fi - } && - - # Now rename the file to the real destination. - $doit $mvcmd "$dsttmp" "$dstdir/$dstfile" - } - } - fi || { (exit 1); exit 1; } -done - -# The final little trick to "correctly" pass the exit status to the exit trap. -{ - (exit 0); exit 0 -} - -# Local variables: -# eval: (add-hook 'write-file-hooks 'time-stamp) -# time-stamp-start: "scriptversion=" -# time-stamp-format: "%:y-%02m-%02d.%02H" -# time-stamp-end: "$" -# End: diff --git a/src/cc/rogue/io.c b/src/cc/rogue/io.c deleted file mode 100644 index 1f6d737b6..000000000 --- a/src/cc/rogue/io.c +++ /dev/null @@ -1,340 +0,0 @@ -// Copyright (c) 2016-2023 The Hush developers -// Distributed under the GPLv3 software license, see the accompanying -// file COPYING or https://www.gnu.org/licenses/gpl-3.0.en.html -/* - * Various input/output functions - * - * @(#)io.c 4.32 (Berkeley) 02/05/99 - */ - -//#include -//#include -//#include -//#include - -#include "rogue.h" - -/* - * msg: - * Display a message at the top of the screen. - */ -#define MAXMSG (NUMCOLS - sizeof "--More--") - -static char msgbuf[2*MAXMSG+1]; -static int newpos = 0; - -/* VARARGS1 */ -int -msg(struct rogue_state *rs,char *fmt, ...) -{ - va_list args; - - /* - * if the string is "", just clear the line - */ - if (*fmt == '\0') - { - move(0, 0); - clrtoeol(); - mpos = 0; - return ~ESCAPE; - } - /* - * otherwise add to the message and flush it out - */ - va_start(args, fmt); - doadd(rs,fmt, args); - va_end(args); - return endmsg(rs); -} - -/* - * addmsg: - * Add things to the current message - */ -/* VARARGS1 */ -void -addmsg(struct rogue_state *rs,char *fmt, ...) -{ - va_list args; - - va_start(args, fmt); - doadd(rs,fmt, args); - va_end(args); -} - -/* - * endmsg: - * Display a new msg (giving him a chance to see the previous one - * if it is up there with the --More--) - */ -int -endmsg(struct rogue_state *rs) -{ - char ch; - - if (save_msg) - strcpy(huh, msgbuf); - if (mpos) - { - look(rs,FALSE); - mvaddstr(0, mpos, "--More--"); - if ( rs->sleeptime != 0 ) - refresh(); - if (!msg_esc) - wait_for(rs,' '); - else - { - while ((ch = readchar(rs)) != ' ') - if (ch == ESCAPE) - { - msgbuf[0] = '\0'; - mpos = 0; - newpos = 0; - msgbuf[0] = '\0'; - return ESCAPE; - } - } - } - /* - * All messages should start with uppercase, except ones that - * start with a pack addressing character - */ - if (islower(msgbuf[0]) && !lower_msg && msgbuf[1] != ')') - msgbuf[0] = (char) toupper(msgbuf[0]); - mvaddstr(0, 0, msgbuf); - clrtoeol(); - mpos = newpos; - newpos = 0; - msgbuf[0] = '\0'; - if ( rs->sleeptime != 0 ) - refresh(); - return ~ESCAPE; -} - -/* - * doadd: - * Perform an add onto the message buffer - */ -void -doadd(struct rogue_state *rs,char *fmt, va_list args) -{ - static char buf[MAXSTR]; - - /* - * Do the printf into buf - */ - vsprintf(buf, fmt, args); - if (strlen(buf) + newpos >= MAXMSG) - endmsg(rs); - strcat(msgbuf, buf); - newpos = (int) strlen(msgbuf); -} - -/* - * step_ok: - * Returns true if it is ok to step on ch - */ -int -step_ok(int ch) -{ - switch (ch) - { - case ' ': - case '|': - case '-': - return FALSE; - default: - return (!isalpha(ch)); - } -} - -/* - * readchar: - * Reads and returns a character, checking for gross input errors - */ -char -readchar(struct rogue_state *rs) -{ - char c,ch = -1; - if ( rs != 0 && rs->guiflag == 0 ) - { - static uint32_t counter; - if ( rs->ind < rs->numkeys ) - { - c = rs->keystrokes[rs->ind++]; - if ( 0 ) - { - static FILE *fp; static int32_t counter; - if ( fp == 0 ) - fp = fopen("log","wb"); - if ( fp != 0 ) - { - fprintf(fp,"%d: (%c) hp.%d num.%d gold.%d seed.%llu\n",counter,c,pstats.s_hpt,num_packitems(rs),purse,(long long)seed); - fflush(fp); - counter++; - } - } - while ( c == 'Q' && rs->ind < rs->numkeys ) - { - //fprintf(stderr,"Got 'Q' next (%c)\n",rs->keystrokes[rs->ind]); sleep(2); - if ( rs->keystrokes[rs->ind] == 'y' ) - return(c); - rs->ind++; - c = rs->keystrokes[rs->ind++]; - } - return(c); - } - if ( rs->replaydone != 0 && counter++ < 3 ) - fprintf(stderr,"replay finished but readchar called\n"); - rs->replaydone = (uint32_t)time(NULL); - if ( counter < 3 || (counter & 1) == 0 ) - return('y'); - else return(ESCAPE); - } - if ( rs == 0 || rs->guiflag != 0 ) - { - ch = (char) md_readchar(); - - if (ch == 3) - { - _quit(); - return(27); - } - if ( rs != 0 && rs->guiflag != 0 ) - { - if ( rs->num < sizeof(rs->buffered) ) - { - rs->buffered[rs->num++] = ch; - if ( rs->num > (sizeof(rs->buffered)*9)/10 && rs->needflush == 0 ) - { - rs->needflush = (uint32_t)time(NULL); - //fprintf(stderr,"needflush.%u %d of %d\n",rs->needflush,rs->num,(int32_t)sizeof(rs->buffered)); - //sleep(3); - } - } else fprintf(stderr,"buffer filled without flushed\n"); - } - } else fprintf(stderr,"readchar rs.%p non-gui error?\n",rs); - return(ch); -} - -/* - * status: - * Display the important stats line. Keep the cursor where it was. - */ -void -status(struct rogue_state *rs) -{ - register int oy, ox, temp; - static int hpwidth = 0; - static int s_hungry = 0; - static int s_lvl = 0; - static int s_pur = -1; - static int s_hp = 0; - static int s_arm = 0; - static str_t s_str = 0; - static int s_exp = 0; - static char *state_name[] = - { - "", "Hungry", "Weak", "Faint" - }; - - /* - * If nothing has changed since the last status, don't - * bother. - */ - temp = (cur_armor != NULL ? cur_armor->o_arm : pstats.s_arm); - if (s_hp == pstats.s_hpt && s_exp == pstats.s_exp && s_pur == purse - && s_arm == temp && s_str == pstats.s_str && s_lvl == level - && s_hungry == hungry_state - && !stat_msg - ) - return; - - s_arm = temp; - - getyx(stdscr, oy, ox); - if (s_hp != max_hp) - { - temp = max_hp; - s_hp = max_hp; - for (hpwidth = 0; temp; hpwidth++) - temp /= 10; - } - - /* - * Save current status - */ - s_lvl = level; - s_pur = purse; - s_hp = pstats.s_hpt; - s_str = pstats.s_str; - s_exp = pstats.s_exp; - s_hungry = hungry_state; - - if (stat_msg) - { - move(0, 0); - msg(rs,"Level: %d Gold: %-5d Hp: %*d(%*d) Str: %2d(%d) Arm: %-2d Exp: %d/%ld %s", - level, purse, hpwidth, pstats.s_hpt, hpwidth, max_hp, pstats.s_str, - max_stats.s_str, 10 - s_arm, pstats.s_lvl, pstats.s_exp, - state_name[hungry_state]); - } - else - { - move(STATLINE, 0); - - printw("Level: %d Gold: %-5d Hp: %*d(%*d) Str: %2d(%d) Arm: %-2d Exp: %d/%d %s", - level, purse, hpwidth, pstats.s_hpt, hpwidth, max_hp, pstats.s_str, - max_stats.s_str, 10 - s_arm, pstats.s_lvl, pstats.s_exp, - state_name[hungry_state]); - } - - clrtoeol(); - move(oy, ox); -} - -/* - * wait_for - * Sit around until the guy types the right key - */ -void -wait_for(struct rogue_state *rs,int ch) -{ - register char c; - - if (ch == '\n') - while ((c = readchar(rs)) != '\n' && c != '\r') - { - if ( rs->replaydone != 0 ) - return; - continue; - } - else - while (readchar(rs) != ch) - { - if ( rs->replaydone != 0 ) - return; - continue; - } -} - -/* - * show_win: - * Function used to display a window and wait before returning - */ -void -show_win(struct rogue_state *rs,char *message) -{ - WINDOW *win; - - win = hw; - wmove(win, 0, 0); - waddstr(win, message); - touchwin(win); - wmove(win, hero.y, hero.x); - wrefresh(win); - wait_for(rs,' '); - clearok(curscr, TRUE); - touchwin(stdscr); -} diff --git a/src/cc/rogue/list.c b/src/cc/rogue/list.c deleted file mode 100644 index 4fa1f9da8..000000000 --- a/src/cc/rogue/list.c +++ /dev/null @@ -1,182 +0,0 @@ -// Copyright (c) 2016-2023 The Hush developers -// Distributed under the GPLv3 software license, see the accompanying -// file COPYING or https://www.gnu.org/licenses/gpl-3.0.en.html -/* - * Functions for dealing with linked lists of goodies - * - * @(#)list.c 4.12 (Berkeley) 02/05/99 - * - * Rogue: Exploring the Dungeons of Doom - * Copyright (C) 1980-1983, 1985, 1999 Michael Toy, Ken Arnold and Glenn Wichman - * All rights reserved. - * - * See the file LICENSE.TXT for full copyright and licensing information. - */ - -//#include -//#include -//#include -#include "rogue.h" - -#ifdef MASTER -int total = 0; /* total dynamic memory bytes */ -#endif - -/* - * discard: - * Free up an item - */ - -//#define ENABLE_DEBUG -#define MAX_DEBUGPTRS 100000 - -int32_t itemcounter; -THING *thingptrs[MAX_DEBUGPTRS]; -int32_t numptrs; - -int32_t thing_find(THING *item) -{ -#ifdef ENABLE_DEBUG - int32_t i; - for (i=0; i_t._t_type,thingptrs[i]->o_type,thingptrs[i]->o_type); - free(thingptrs[i]); - } - memset(thingptrs,0,sizeof(thingptrs)); - numptrs = 0; -} - -/* - * detach: - * takes an item out of whatever linked list it might be in - */ - -void -_detach(THING **list, THING *item) -{ - if (*list == item) - *list = next(item); - if (prev(item) != NULL) - item->l_prev->l_next = next(item); - if (next(item) != NULL) - item->l_next->l_prev = prev(item); - item->l_next = NULL; - item->l_prev = NULL; -} - -/* - * _attach: - * add an item to the head of a list - */ - -void -_attach(THING **list, THING *item) -{ - if (*list != NULL) - { - item->l_next = *list; - (*list)->l_prev = item; - item->l_prev = NULL; - } - else - { - item->l_next = NULL; - item->l_prev = NULL; - } - *list = item; -} - -/* - * _free_list: - * Throw the whole blamed thing away - */ - -void -_free_list(THING **ptr) -{ - THING *item; - while (*ptr != NULL) - { - item = *ptr; - *ptr = next(item); - discard(item); - } -} - -/* - * new_item - * Get a new item with a specified size - */ - -THING * -new_item(void) -{ - THING *item; - -#ifdef MASTER - if ((item = (THING *)calloc(1, sizeof *item)) == NULL) - msg(rs,"ran out of memory after %d items", total); - else - total++; -#else - item = (THING *)calloc(1, sizeof *item); -#endif -#ifdef ENABLE_DEBUG - if ( numptrs < MAX_DEBUGPTRS ) - { - thingptrs[numptrs++] = item; - if ( (++itemcounter % 100) == 0 ) - fprintf(stderr,"itemcounter.%d\n",itemcounter); - } -#endif - item->l_next = NULL; - item->l_prev = NULL; - return item; -} diff --git a/src/cc/rogue/mach_dep.c b/src/cc/rogue/mach_dep.c deleted file mode 100644 index 36daf97ab..000000000 --- a/src/cc/rogue/mach_dep.c +++ /dev/null @@ -1,462 +0,0 @@ -// Copyright (c) 2016-2023 The Hush developers -// Distributed under the GPLv3 software license, see the accompanying -// file COPYING or https://www.gnu.org/licenses/gpl-3.0.en.html -/* - * Various installation dependent routines - * - * @(#)mach_dep.c 4.37 (Berkeley) 05/23/83 - * - * Rogue: Exploring the Dungeons of Doom - * Copyright (C) 1980-1983, 1985, 1999 Michael Toy, Ken Arnold and Glenn Wichman - * All rights reserved. - * - * See the file LICENSE.TXT for full copyright and licensing information. - */ - -/* - * The various tuneable defines are: - * - * SCOREFILE Where/if the score file should live. - * ALLSCORES Score file is top ten scores, not top ten - * players. This is only useful when only a few - * people will be playing; otherwise the score file - * gets hogged by just a few people. - * NUMSCORES Number of scores in the score file (default 10). - * NUMNAME String version of NUMSCORES (first character - * should be capitalized) (default "Ten"). - * MAXLOAD What (if any) the maximum load average should be - * when people are playing. Since it is divided - * by 10, to specify a load limit of 4.0, MAXLOAD - * should be "40". If defined, then - * LOADAV Should it use it's own routine to get - * the load average? - * NAMELIST If so, where does the system namelist - * hide? - * MAXUSERS What (if any) the maximum user count should be - * when people are playing. If defined, then - * UCOUNT Should it use it's own routine to count - * users? - * UTMP If so, where does the user list hide? - * CHECKTIME How often/if it should check during the game - * for high load average. - */ - -#include -#include -#include -#include -#include -#include -#include -#include -//#include -#include "rogue.h" -#include "extern.h" - -#define NOOP(x) (x += 0) - -# ifndef NUMSCORES -# define NUMSCORES 10 -# define NUMNAME "Ten" -# endif - -unsigned int numscores = NUMSCORES; -char *Numname = NUMNAME; - -# ifdef ALLSCORES -bool allscore = TRUE; -# else /* ALLSCORES */ -bool allscore = FALSE; -# endif /* ALLSCORES */ - -#ifdef CHECKTIME -static int num_checks; /* times we've gone over in checkout() */ -#endif /* CHECKTIME */ - -/* - * init_check: - * Check out too see if it is proper to play the game now - */ - -void -init_check() -{ -#if defined(MAXLOAD) || defined(MAXUSERS) - if (too_much()) - { - printf("Sorry, %s, but the system is too loaded now.\n", whoami); - printf("Try again later. Meanwhile, why not enjoy a%s %s?\n", - vowelstr(fruit), fruit); - if (author()) - printf("However, since you're a good guy, it's up to you\n"); - else - exit(1); - } -#endif -} - -/* - * open_score: - * Open up the score file for future use - */ - -void -open_score() -{ -#ifdef SCOREFILE - char *scorefile = SCOREFILE; - /* - * We drop setgid privileges after opening the score file, so subsequent - * open()'s will fail. Just reuse the earlier filehandle. - */ - - if (scoreboard != NULL) { - rewind(scoreboard); - return; - } - - scoreboard = fopen(scorefile, "r+"); - - if ((scoreboard == NULL) && (errno == ENOENT)) - { - scoreboard = fopen(scorefile, "w+"); - md_chmod(scorefile,0664); - } - - if (scoreboard == NULL) { - fprintf(stderr, "Could not open %s for writing: %s\n", scorefile, strerror(errno)); - fflush(stderr); - } -#else - scoreboard = NULL; -#endif -} - -/* - * setup: - * Get starting setup for all games - */ - -void -setup() -{ -#ifdef CHECKTIME - int checkout(); -#endif - -#ifdef DUMP - md_onsignal_autosave(); -#else - md_onsignal_default(); -#endif - -#ifdef CHECKTIME - md_start_checkout_timer(CHECKTIME*60); - num_checks = 0; -#endif - - raw(); /* Raw mode */ - noecho(); /* Echo off */ - keypad(stdscr,1); - getltchars(); /* get the local tty chars */ -} - -/* - * getltchars: - * Get the local tty chars for later use - */ - -void -getltchars() -{ - got_ltc = TRUE; - orig_dsusp = md_dsuspchar(); - md_setdsuspchar( md_suspchar() ); -} - -/* - * resetltchars: - * Reset the local tty chars to original values. - */ -void -resetltchars(void) -{ - if (got_ltc) { - md_setdsuspchar(orig_dsusp); - } -} - -/* - * playltchars: - * Set local tty chars to the values we use when playing. - */ -void -playltchars(void) -{ - if (got_ltc) { - md_setdsuspchar( md_suspchar() ); - } -} - -/* - * start_score: - * Start the scoring sequence - */ - -void -start_score() -{ -#ifdef CHECKTIME - md_stop_checkout_timer(); -#endif -} - -/* - * is_symlink: - * See if the file has a symbolic link - */ -bool -is_symlink(char *sp) -{ -#ifdef S_IFLNK - struct stat sbuf2; - - if (lstat(sp, &sbuf2) < 0) - return FALSE; - else - return ((sbuf2.st_mode & S_IFMT) != S_IFREG); -#else - NOOP(sp); - return FALSE; -#endif -} - -#if defined(MAXLOAD) || defined(MAXUSERS) -/* - * too_much: - * See if the system is being used too much for this game - */ -bool -too_much() -{ -#ifdef MAXLOAD - double avec[3]; -#else - int cnt; -#endif - -#ifdef MAXLOAD - md_loadav(avec); - if (avec[1] > (MAXLOAD / 10.0)) - return TRUE; -#endif -#ifdef MAXUSERS - if (ucount() > MAXUSERS) - return TRUE; -#endif - return FALSE; -} - -/* - * author: - * See if a user is an author of the program - */ -bool -author() -{ -#ifdef MASTER - if (wizard) - return TRUE; -#endif - switch (md_getuid()) - { - case -1: - return TRUE; - default: - return FALSE; - } -} -#endif - -#ifdef CHECKTIME -/* - * checkout: - * Check each CHECKTIME seconds to see if the load is too high - */ - -checkout(struct rogue_state *rs,int sig) -{ - static char *msgs[] = { - "The load is too high to be playing. Please leave in %0.1f minutes", - "Please save your game. You have %0.1f minutes", - "Last warning. You have %0.1f minutes to leave", - }; - int checktime; - - if (too_much()) - { - if (author()) - { - num_checks = 1; - chmsg(rs,"The load is rather high, O exaulted one"); - } - else if (num_checks++ == 3) - fatal("Sorry. You took too long. You are dead\n"); - checktime = (CHECKTIME * 60) / num_checks; - chmsg(rs,msgs[num_checks - 1], ((double) checktime / 60.0)); - } - else - { - if (num_checks) - { - num_checks = 0; - chmsg(rs,"The load has dropped back down. You have a reprieve"); - } - checktime = (CHECKTIME * 60); - } - - md_start_checkout_timer(checktime); -} - -/* - * chmsg: - * checkout()'s version of msg. If we are in the middle of a - * shell, do a printf instead of a msg to a the refresh. - */ -/* VARARGS1 */ - -chmsg(struct rogue_state *rs,char *fmt, int arg) -{ - if (!in_shell) - msg(rs,fmt, arg); - else - { - printf(fmt, arg); - putchar('\n'); - fflush(stdout); - } -} -#endif - -#ifdef UCOUNT -/* - * ucount: - * count number of users on the system - */ -#include - -struct utmp buf; - -int -ucount() -{ - struct utmp *up; - FILE *utmp; - int count; - - if ((utmp = fopen(UTMP, "r")) == NULL) - return 0; - - up = &buf; - count = 0; - - while (fread(up, 1, sizeof (*up), utmp) > 0) - if (buf.ut_name[0] != '\0') - count++; - fclose(utmp); - return count; -} -#endif - -/* - * lock_sc: - * lock the score file. If it takes too long, ask the user if - * they care to wait. Return TRUE if the lock is successful. - */ -static FILE *lfd = NULL; -bool -lock_sc() -{ -#if defined(SCOREFILE) && defined(LOCKFILE) - int cnt; - static struct stat sbuf; - char *lockfile = LOCKFILE; - -over: - if ((lfd=fopen(lockfile, "w+")) != NULL) - return TRUE; - for (cnt = 0; cnt < 5; cnt++) - { - md_sleep(1); - if ((lfd=fopen(lockfile, "w+")) != NULL) - return TRUE; - } - if (stat(lockfile, &sbuf) < 0) - { - lfd=fopen(lockfile, "w+"); - return TRUE; - } - if (time(NULL) - sbuf.st_mtime > 10) - { - if (md_unlink(lockfile) < 0) - return FALSE; - goto over; - } - else - { - printf("The score file is very busy. Do you want to wait longer\n"); - printf("for it to become free so your score can get posted?\n"); - printf("If so, type \"y\"\n"); - if (fgets(prbuf, MAXSTR, stdin) != 0 ) - ; - if (prbuf[0] == 'y') - for (;;) - { - if ((lfd=fopen(lockfile, "w+")) != 0) - return TRUE; - if (stat(lockfile, &sbuf) < 0) - { - lfd=fopen(lockfile, "w+"); - return TRUE; - } - if (time(NULL) - sbuf.st_mtime > 10) - { - if (md_unlink(lockfile) < 0) - return FALSE; - } - md_sleep(1); - } - else - return FALSE; - } -#else - return TRUE; -#endif -} - -/* - * unlock_sc: - * Unlock the score file - */ - -void -unlock_sc() -{ -#if defined(SCOREFILE) && defined(LOCKFILE) - if (lfd != NULL) - fclose(lfd); - lfd = NULL; - md_unlink(LOCKFILE); -#endif -} - -/* - * flush_type: - * Flush typeahead for traps, etc. - */ - -void -flush_type() -{ - flushinp(); -} diff --git a/src/cc/rogue/main.c b/src/cc/rogue/main.c deleted file mode 100644 index 4186812f3..000000000 --- a/src/cc/rogue/main.c +++ /dev/null @@ -1,1000 +0,0 @@ -// Copyright (c) 2016-2023 The Hush developers -// Distributed under the GPLv3 software license, see the accompanying -// file COPYING or https://www.gnu.org/licenses/gpl-3.0.en.html -/****************************************************************************** - * Copyright © 2014-2019 The SuperNET Developers. * - * * - * See the AUTHORS, DEVELOPER-AGREEMENT and LICENSE files at * - * the top-level directory of this distribution for the individual copyright * - * holder information and the developer policies on copyright and licensing. * - * * - * Unless otherwise agreed in a custom licensing agreement, no part of the * - * SuperNET software, including this file may be copied, modified, propagated * - * or distributed except according to the terms contained in the LICENSE file * - * * - * Removal or modification of this copyright notice is prohibited. * - * * - ******************************************************************************/ -#include -#include -#include -#include -#include -#include -#include -#include - -char USERPASS[8192]; uint16_t ROGUE_PORT; -extern char Gametxidstr[67]; - -#define SMALLVAL 0.000000000000001 -#define SATOSHIDEN ((uint64_t)100000000L) -#define dstr(x) ((double)(x) / SATOSHIDEN) -#define HUSH_SMART_CHAIN_MAXLEN 65 -char ASSETCHAINS_SYMBOL[HUSH_SMART_CHAIN_MAXLEN],IPADDRESS[100]; - -#ifndef _BITS256 -#define _BITS256 -union _bits256 { uint8_t bytes[32]; uint16_t ushorts[16]; uint32_t uints[8]; uint64_t ulongs[4]; uint64_t txid; }; -typedef union _bits256 bits256; -#endif - -#ifdef _WIN32 -#ifdef _MSC_VER -int gettimeofday(struct timeval * tp, struct timezone * tzp) -{ - // Note: some broken versions only have 8 trailing zero's, the correct epoch has 9 trailing zero's - static const uint64_t EPOCH = ((uint64_t)116444736000000000ULL); - - SYSTEMTIME system_time; - FILETIME file_time; - uint64_t time; - - GetSystemTime(&system_time); - SystemTimeToFileTime(&system_time, &file_time); - time = ((uint64_t)file_time.dwLowDateTime); - time += ((uint64_t)file_time.dwHighDateTime) << 32; - - tp->tv_sec = (long)((time - EPOCH) / 10000000L); - tp->tv_usec = (long)(system_time.wMilliseconds * 1000); - return 0; -} -#endif // _MSC_VER -#endif - - - -double OS_milliseconds() -{ - struct timeval tv; double millis; - #ifdef __MINGW32__ - mingw_gettimeofday(&tv,NULL); - #else - gettimeofday(&tv,NULL); - #endif - millis = ((double)tv.tv_sec * 1000. + (double)tv.tv_usec / 1000.); - //printf("tv_sec.%ld usec.%d %f\n",tv.tv_sec,tv.tv_usec,millis); - return(millis); -} - -int32_t _unhex(char c) -{ - if ( c >= '0' && c <= '9' ) - return(c - '0'); - else if ( c >= 'a' && c <= 'f' ) - return(c - 'a' + 10); - else if ( c >= 'A' && c <= 'F' ) - return(c - 'A' + 10); - return(-1); -} - -int32_t is_hexstr(char *str,int32_t n) -{ - int32_t i; - if ( str == 0 || str[0] == 0 ) - return(0); - for (i=0; str[i]!=0; i++) - { - if ( n > 0 && i >= n ) - break; - if ( _unhex(str[i]) < 0 ) - break; - } - if ( n == 0 ) - return(i); - return(i == n); -} - -int32_t unhex(char c) -{ - int32_t hex; - if ( (hex= _unhex(c)) < 0 ) - { - //printf("unhex: illegal hexchar.(%c)\n",c); - } - return(hex); -} - -unsigned char _decode_hex(char *hex) { return((unhex(hex[0])<<4) | unhex(hex[1])); } - -int32_t decode_hex(uint8_t *bytes,int32_t n,char *hex) -{ - int32_t adjust,i = 0; - //printf("decode.(%s)\n",hex); - if ( is_hexstr(hex,n) <= 0 ) - { - memset(bytes,0,n); - return(n); - } - if ( hex[n-1] == '\n' || hex[n-1] == '\r' ) - hex[--n] = 0; - if ( n == 0 || (hex[n*2+1] == 0 && hex[n*2] != 0) ) - { - if ( n > 0 ) - { - bytes[0] = unhex(hex[0]); - printf("decode_hex n.%d hex[0] (%c) -> %d hex.(%s) [n*2+1: %d] [n*2: %d %c] len.%ld\n",n,hex[0],bytes[0],hex,hex[n*2+1],hex[n*2],hex[n*2],(long)strlen(hex)); - } - bytes++; - hex++; - adjust = 1; - } else adjust = 0; - if ( n > 0 ) - { - for (i=0; i>4) & 0xf); - hexbytes[i*2 + 1] = hexbyte(message[i] & 0xf); - //printf("i.%d (%02x) [%c%c]\n",i,message[i],hexbytes[i*2],hexbytes[i*2+1]); - } - hexbytes[len*2] = 0; - //printf("len.%ld\n",len*2+1); - return((int32_t)len*2+1); -} - -char *bits256_str(char hexstr[65],bits256 x) -{ - init_hexbytes_noT(hexstr,x.bytes,sizeof(x)); - return(hexstr); -} - -long _stripwhite(char *buf,int accept) -{ - int32_t i,j,c; - if ( buf == 0 || buf[0] == 0 ) - return(0); - for (i=j=0; buf[i]!=0; i++) - { - buf[j] = c = buf[i]; - if ( c == accept || (c != ' ' && c != '\n' && c != '\r' && c != '\t' && c != '\b') ) - j++; - } - buf[j] = 0; - return(j); -} - -char *clonestr(char *str) -{ - char *clone; - if ( str == 0 || str[0] == 0 ) - { - printf("warning cloning nullstr.%p\n",str); -#ifdef __APPLE__ - while ( 1 ) sleep(1); -#endif - str = (char *)""; - } - clone = (char *)malloc(strlen(str)+16); - strcpy(clone,str); - return(clone); -} - -char *parse_conf_line(char *line,char *field) -{ - line += strlen(field); - for (; *line!='='&&*line!=0; line++) - break; - if ( *line == 0 ) - return(0); - if ( *line == '=' ) - line++; - while ( line[strlen(line)-1] == '\r' || line[strlen(line)-1] == '\n' || line[strlen(line)-1] == ' ' ) - line[strlen(line)-1] = 0; - //printf("LINE.(%s)\n",line); - _stripwhite(line,0); - return(clonestr(line)); -} - -int32_t safecopy(char *dest,char *src,long len) -{ - int32_t i = -1; - if ( src != 0 && dest != 0 && src != dest ) - { - if ( dest != 0 ) - memset(dest,0,len); - for (i=0; i buflen ) - { - *allocsizep = filesize; - *bufp = buf = (uint8_t *)realloc(buf,(long)*allocsizep+64); - } - rewind(fp); - if ( buf == 0 ) - printf("Null buf ???\n"); - else - { - if ( fread(buf,1,(long)filesize,fp) != (unsigned long)filesize ) - printf("error reading filesize.%ld\n",(long)filesize); - buf[filesize] = 0; - } - fclose(fp); - *lenp = filesize; - //printf("loaded.(%s)\n",buf); - } //else printf("OS_loadfile couldnt load.(%s)\n",fname); - return(buf); -} - -uint8_t *OS_fileptr(long *allocsizep,char *fname) -{ - long filesize = 0; uint8_t *buf = 0; void *retptr; - *allocsizep = 0; - retptr = OS_loadfile(fname,&buf,&filesize,allocsizep); - return((uint8_t *)retptr); -} - -struct MemoryStruct { char *memory; size_t size; }; -struct return_string { char *ptr; size_t len; }; - -// return data from the server -#define CURL_GLOBAL_ALL (CURL_GLOBAL_SSL|CURL_GLOBAL_WIN32) -#define CURL_GLOBAL_SSL (1<<0) -#define CURL_GLOBAL_WIN32 (1<<1) - - -/************************************************************************ - * - * Initialize the string handler so that it is thread safe - * - ************************************************************************/ - -void init_string(struct return_string *s) -{ - s->len = 0; - s->ptr = (char *)calloc(1,s->len+1); - if ( s->ptr == NULL ) - { - fprintf(stderr,"init_string malloc() failed\n"); - exit(-1); - } - s->ptr[0] = '\0'; -} - -/************************************************************************ - * - * Use the "writer" to accumulate text until done - * - ************************************************************************/ - -size_t accumulatebytes(void *ptr,size_t size,size_t nmemb,struct return_string *s) -{ - size_t new_len = s->len + size*nmemb; - s->ptr = (char *)realloc(s->ptr,new_len+1); - if ( s->ptr == NULL ) - { - fprintf(stderr, "accumulate realloc() failed\n"); - exit(-1); - } - memcpy(s->ptr+s->len,ptr,size*nmemb); - s->ptr[new_len] = '\0'; - s->len = new_len; - return(size * nmemb); -} - -/************************************************************************ - * - * return the current system time in milliseconds - * - ************************************************************************/ - -#define EXTRACT_BITCOIND_RESULT // if defined, ensures error is null and returns the "result" field -#ifdef EXTRACT_BITCOIND_RESULT - -/************************************************************************ - * - * perform post processing of the results - * - ************************************************************************/ - -char *post_process_bitcoind_RPC(char *debugstr,char *command,char *rpcstr,char *params) -{ - long i,j,len; char *retstr = 0; cJSON *json,*result,*error; - //printf("<<<<<<<<<<< bitcoind_RPC: %s post_process_bitcoind_RPC.%s.[%s]\n",debugstr,command,rpcstr); - if ( command == 0 || rpcstr == 0 || rpcstr[0] == 0 ) - { - if ( strcmp(command,"signrawtransaction") != 0 ) - printf("<<<<<<<<<<< bitcoind_RPC: %s post_process_bitcoind_RPC.%s.[%s]\n",debugstr,command,rpcstr); - return(rpcstr); - } - json = cJSON_Parse(rpcstr); - if ( json == 0 ) - { - printf("<<<<<<<<<<< bitcoind_RPC: %s post_process_bitcoind_RPC.%s can't parse.(%s) params.(%s)\n",debugstr,command,rpcstr,params); - free(rpcstr); - return(0); - } - result = cJSON_GetObjectItem(json,"result"); - error = cJSON_GetObjectItem(json,"error"); - if ( error != 0 && result != 0 ) - { - if ( (error->type&0xff) == cJSON_NULL && (result->type&0xff) != cJSON_NULL ) - { - retstr = cJSON_Print(result); - len = strlen(retstr); - if ( retstr[0] == '"' && retstr[len-1] == '"' ) - { - for (i=1,j=0; itype&0xff) != cJSON_NULL || (result->type&0xff) != cJSON_NULL ) - { - if ( strcmp(command,"signrawtransaction") != 0 ) - printf("<<<<<<<<<<< bitcoind_RPC: %s post_process_bitcoind_RPC (%s) error.%s\n",debugstr,command,rpcstr); - } - free(rpcstr); - } else retstr = rpcstr; - free_json(json); - //fprintf(stderr,"<<<<<<<<<<< bitcoind_RPC: postprocess returns.(%s)\n",retstr); - return(retstr); -} -#endif - -#ifdef _WIN32 -#ifdef _MSC_VER -#define sleep(x) Sleep(1000*(x)) -#endif -#endif - -/************************************************************************ - * - * perform the query - * - ************************************************************************/ - -char *bitcoind_RPC(char **retstrp,char *debugstr,char *url,char *userpass,char *command,char *params) -{ - static int didinit,count,count2; static double elapsedsum,elapsedsum2; - struct curl_slist *headers = NULL; struct return_string s; CURLcode res; CURL *curl_handle; - char *bracket0,*bracket1,*databuf = 0; long len; int32_t specialcase,numretries; double starttime; - if ( didinit == 0 ) - { - didinit = 1; - curl_global_init(CURL_GLOBAL_ALL); //init the curl session - } - numretries = 0; - if ( debugstr != 0 && strcmp(debugstr,"BTCD") == 0 && command != 0 && strcmp(command,"SuperNET") == 0 ) - specialcase = 1; - else specialcase = 0; - if ( url[0] == 0 ) - strcpy(url,"http://127.0.0.1:7876/nxt"); - if ( specialcase != 0 && 0 ) - printf("<<<<<<<<<<< bitcoind_RPC: debug.(%s) url.(%s) command.(%s) params.(%s)\n",debugstr,url,command,params); -try_again: - if ( retstrp != 0 ) - *retstrp = 0; - starttime = OS_milliseconds(); - curl_handle = curl_easy_init(); - init_string(&s); - headers = curl_slist_append(0,"Expect:"); - - curl_easy_setopt(curl_handle,CURLOPT_USERAGENT,"mozilla/4.0");//"Mozilla/4.0 (compatible; )"); - curl_easy_setopt(curl_handle,CURLOPT_HTTPHEADER, headers); - curl_easy_setopt(curl_handle,CURLOPT_URL, url); - curl_easy_setopt(curl_handle,CURLOPT_WRITEFUNCTION, (void *)accumulatebytes); // send all data to this function - curl_easy_setopt(curl_handle,CURLOPT_WRITEDATA, &s); // we pass our 's' struct to the callback - curl_easy_setopt(curl_handle,CURLOPT_NOSIGNAL, 1L); // supposed to fix "Alarm clock" and long jump crash - curl_easy_setopt(curl_handle,CURLOPT_NOPROGRESS, 1L); // no progress callback - if ( strncmp(url,"https",5) == 0 ) - { - curl_easy_setopt(curl_handle,CURLOPT_SSL_VERIFYPEER,0); - curl_easy_setopt(curl_handle,CURLOPT_SSL_VERIFYHOST,0); - } - if ( userpass != 0 ) - curl_easy_setopt(curl_handle,CURLOPT_USERPWD, userpass); - databuf = 0; - if ( params != 0 ) - { - if ( command != 0 && specialcase == 0 ) - { - len = strlen(params); - if ( len > 0 && params[0] == '[' && params[len-1] == ']' ) { - bracket0 = bracket1 = (char *)""; - } - else - { - bracket0 = (char *)"["; - bracket1 = (char *)"]"; - } - - databuf = (char *)malloc(256 + strlen(command) + strlen(params)); - sprintf(databuf,"{\"id\":\"jl777\",\"method\":\"%s\",\"params\":%s%s%s}",command,bracket0,params,bracket1); - //printf("url.(%s) userpass.(%s) databuf.(%s)\n",url,userpass,databuf); - // - } //else if ( specialcase != 0 ) fprintf(stderr,"databuf.(%s)\n",params); - curl_easy_setopt(curl_handle,CURLOPT_POST,1L); - if ( databuf != 0 ) - curl_easy_setopt(curl_handle,CURLOPT_POSTFIELDS,databuf); - else curl_easy_setopt(curl_handle,CURLOPT_POSTFIELDS,params); - } - //laststart = milliseconds(); - res = curl_easy_perform(curl_handle); - curl_slist_free_all(headers); - curl_easy_cleanup(curl_handle); - if ( databuf != 0 ) // clean up temporary buffer - { - free(databuf); - databuf = 0; - } - if ( res != CURLE_OK ) - { - numretries++; - if ( specialcase != 0 ) - { - printf("<<<<<<<<<<< bitcoind_RPC.(%s): BTCD.%s timeout params.(%s) s.ptr.(%s) err.%d\n",url,command,params,s.ptr,res); - free(s.ptr); - return(0); - } - else if ( numretries >= 1 ) - { - //printf("Maximum number of retries exceeded!\n"); - free(s.ptr); - return(0); - } - if ( (rand() % 1000) == 0 ) - printf( "curl_easy_perform() failed: %s %s.(%s %s), retries: %d\n",curl_easy_strerror(res),debugstr,url,command,numretries); - free(s.ptr); - sleep((1< (%s)\n",params,s.ptr); - count2++; - elapsedsum2 += (OS_milliseconds() - starttime); - if ( (count2 % 10000) == 0) - printf("%d: ave %9.6f | elapsed %.3f millis | NXT calls.(%s) cmd.(%s)\n",count2,elapsedsum2/count2,(double)(OS_milliseconds() - starttime),url,command); - return(s.ptr); - } - } - printf("bitcoind_RPC: impossible case\n"); - free(s.ptr); - return(0); -} - -static size_t WriteMemoryCallback(void *ptr,size_t size,size_t nmemb,void *data) -{ - size_t realsize = (size * nmemb); - struct MemoryStruct *mem = (struct MemoryStruct *)data; - mem->memory = (char *)((ptr != 0) ? realloc(mem->memory,mem->size + realsize + 1) : malloc(mem->size + realsize + 1)); - if ( mem->memory != 0 ) - { - if ( ptr != 0 ) - memcpy(&(mem->memory[mem->size]),ptr,realsize); - mem->size += realsize; - mem->memory[mem->size] = 0; - } - //printf("got %d bytes\n",(int32_t)(size*nmemb)); - return(realsize); -} - -char *curl_post(CURL **cHandlep,char *url,char *userpass,char *postfields,char *hdr0,char *hdr1,char *hdr2,char *hdr3) -{ - struct MemoryStruct chunk; CURL *cHandle; long code; struct curl_slist *headers = 0; - if ( (cHandle= *cHandlep) == NULL ) - *cHandlep = cHandle = curl_easy_init(); - else curl_easy_reset(cHandle); - //#ifdef DEBUG - //curl_easy_setopt(cHandle,CURLOPT_VERBOSE, 1); - //#endif - curl_easy_setopt(cHandle,CURLOPT_USERAGENT,"mozilla/4.0");//"Mozilla/4.0 (compatible; )"); - curl_easy_setopt(cHandle,CURLOPT_SSL_VERIFYPEER,0); - //curl_easy_setopt(cHandle,CURLOPT_SSLVERSION,1); - curl_easy_setopt(cHandle,CURLOPT_URL,url); - curl_easy_setopt(cHandle,CURLOPT_CONNECTTIMEOUT,10); - if ( userpass != 0 && userpass[0] != 0 ) - curl_easy_setopt(cHandle,CURLOPT_USERPWD,userpass); - if ( postfields != 0 && postfields[0] != 0 ) - { - curl_easy_setopt(cHandle,CURLOPT_POST,1); - curl_easy_setopt(cHandle,CURLOPT_POSTFIELDS,postfields); - } - if ( hdr0 != NULL && hdr0[0] != 0 ) - { - //printf("HDR0.(%s) HDR1.(%s) HDR2.(%s) HDR3.(%s)\n",hdr0!=0?hdr0:"",hdr1!=0?hdr1:"",hdr2!=0?hdr2:"",hdr3!=0?hdr3:""); - headers = curl_slist_append(headers,hdr0); - if ( hdr1 != 0 && hdr1[0] != 0 ) - headers = curl_slist_append(headers,hdr1); - if ( hdr2 != 0 && hdr2[0] != 0 ) - headers = curl_slist_append(headers,hdr2); - if ( hdr3 != 0 && hdr3[0] != 0 ) - headers = curl_slist_append(headers,hdr3); - } //headers = curl_slist_append(0,"Expect:"); - if ( headers != 0 ) - curl_easy_setopt(cHandle,CURLOPT_HTTPHEADER,headers); - //res = curl_easy_perform(cHandle); - memset(&chunk,0,sizeof(chunk)); - curl_easy_setopt(cHandle,CURLOPT_WRITEFUNCTION,WriteMemoryCallback); - curl_easy_setopt(cHandle,CURLOPT_WRITEDATA,(void *)&chunk); - curl_easy_perform(cHandle); - curl_easy_getinfo(cHandle,CURLINFO_RESPONSE_CODE,&code); - if ( headers != 0 ) - curl_slist_free_all(headers); - if ( code != 200 ) - printf("(%s) server responded with code %ld (%s)\n",url,code,chunk.memory); - return(chunk.memory); -} - -uint16_t _hush_userpass(char *username, char *password, FILE *fp) -{ - char *rpcuser,*rpcpassword,*str,*ipaddress,line[8192]; uint16_t port = 0; - rpcuser = rpcpassword = 0; - username[0] = password[0] = 0; - while ( fgets(line,sizeof(line),fp) != 0 ) - { - if ( line[0] == '#' ) - continue; - //printf("line.(%s) %p %p\n",line,strstr(line,(char *)"rpcuser"),strstr(line,(char *)"rpcpassword")); - if ( (str= strstr(line,(char *)"rpcuser")) != 0 ) - rpcuser = parse_conf_line(str,(char *)"rpcuser"); - else if ( (str= strstr(line,(char *)"rpcpassword")) != 0 ) - rpcpassword = parse_conf_line(str,(char *)"rpcpassword"); - else if ( (str= strstr(line,(char *)"rpcport")) != 0 ) - { - port = atoi(parse_conf_line(str,(char *)"rpcport")); - //fprintf(stderr,"rpcport.%u in file\n",port); - } - else if ( (str= strstr(line,(char *)"ipaddress")) != 0 ) - { - ipaddress = parse_conf_line(str,(char *)"ipaddress"); - strcpy(IPADDRESS,ipaddress); - } - } - if ( rpcuser != 0 && rpcpassword != 0 ) - { - strcpy(username,rpcuser); - strcpy(password,rpcpassword); - } - //printf("rpcuser.(%s) rpcpassword.(%s) %u ipaddress.%s\n",rpcuser,rpcpassword,port,ipaddress); - if ( rpcuser != 0 ) - free(rpcuser); - if ( rpcpassword != 0 ) - free(rpcpassword); - return(port); -} - -uint16_t hush_userpass(char *userpass,char *symbol) -{ - FILE *fp; uint16_t port = 0; char fname[512],username[512],password[512],confname[HUSH_SMART_CHAIN_MAXLEN]; - userpass[0] = 0; - - sprintf(confname,"%s.conf",symbol); - - //hush_statefname(fname,symbol,confname); - if ( (fp= fopen(confname,"rb")) != 0 ) - { - port = _hush_userpass(username,password,fp); - sprintf(userpass,"%s:%s",username,password); - if ( strcmp(symbol,ASSETCHAINS_SYMBOL) == 0 ) - strcpy(USERPASS,userpass); - fclose(fp); - } - return(port); -} - -#define is_cJSON_True(json) ((json) != 0 && ((json)->type & 0xff) == cJSON_True) - -char *hush_issuemethod(char *userpass,char *method,char *params,uint16_t port) -{ - //static void *cHandle; - char url[512],*retstr=0,*retstr2=0,postdata[8192]; - if ( params == 0 || params[0] == 0 ) - params = (char *)"[]"; - if ( strlen(params) < sizeof(postdata)-128 ) - { - sprintf(url,(char *)"http://%s:%u",IPADDRESS,port); - sprintf(postdata,"{\"method\":\"%s\",\"params\":%s}",method,params); - //printf("[%s] (%s) postdata.(%s) params.(%s) USERPASS.(%s)\n",ASSETCHAINS_SYMBOL,url,postdata,params,USERPASS); - retstr2 = bitcoind_RPC(&retstr,(char *)"debug",url,userpass,method,params); - //retstr = curl_post(&cHandle,url,USERPASS,postdata,0,0,0,0); - } - return(retstr2); -} - -#include "rogue.h" - -int32_t rogue_sendrawtransaction(char *rawtx) -{ - char *params,*retstr,*hexstr; cJSON *retjson,*resobj; int32_t retval = -1; - params = (char *)malloc(strlen(rawtx) + 16); - sprintf(params,"[\"%s\"]",rawtx); - if ( (retstr= hush_issuemethod(USERPASS,"sendrawtransaction",params,ROGUE_PORT)) != 0 ) - { - if ( 0 ) // causes 4th level crash - { - static FILE *fp; - if ( fp == 0 ) - fp = fopen("rogue.sendlog","wb"); - if ( fp != 0 ) - { - fprintf(fp,"%s\n",retstr); - fflush(fp); - } - } - if ( (retjson= cJSON_Parse(retstr)) != 0 ) - { - if ( (resobj= jobj(retjson,"result")) != 0 ) - { - if ( (hexstr= jstr(resobj,0)) != 0 && is_hexstr(hexstr,64) == 64 ) - retval = 0; - } - free_json(retjson); - } - - /* log sendrawtx result in file */ - - /* - FILE *debug_file; - debug_file = fopen("tx_debug.log", "a"); - fprintf(debug_file, "%s\n", retstr); - fflush(debug_file); - fclose(debug_file); - */ - - free(retstr); - } - free(params); - return(retval); -} - -int32_t rogue_progress(struct rogue_state *rs,int32_t waitflag,uint64_t seed,char *keystrokes,int32_t num) -{ - char cmd[16384],hexstr[16384],params[32768],*retstr,*errstr,*rawtx,*pastkeys,*pastcmp,*keys; int32_t i,len,numpastkeys,retflag = -1; cJSON *retjson,*resobj; - //fprintf(stderr,"rogue_progress num.%d\n",num); - if ( rs->guiflag != 0 && Gametxidstr[0] != 0 ) - { - if ( rs->keystrokeshex != 0 ) - { - if ( rogue_sendrawtransaction(rs->keystrokeshex) == 0 ) - { - if ( waitflag == 0 ) - return(0); - else if ( 0 ) - { - while ( rogue_sendrawtransaction(rs->keystrokeshex) == 0 ) - { - //fprintf(stderr,"pre-rebroadcast\n"); - sleep(10); - } - } - } - free(rs->keystrokeshex), rs->keystrokeshex = 0; - } - if ( 0 && (pastkeys= rogue_keystrokesload(&numpastkeys,seed,1)) != 0 ) - { - sprintf(params,"[\"extract\",\"17\",\"[%%22%s%%22]\"]",Gametxidstr); - if ( (retstr= hush_issuemethod(USERPASS,"cclib",params,ROGUE_PORT)) != 0 ) - { - if ( (retjson= cJSON_Parse(retstr)) != 0 ) - { - if ( (resobj= jobj(retjson,"result")) != 0 && (keys= jstr(resobj,"keystrokes")) != 0 ) - { - len = strlen(keys) / 2; - pastcmp = (char *)malloc(len + 1); - decode_hex(pastcmp,len,keys); - fprintf(stderr,"keystrokes.(%s) vs pastkeys\n",keys); - for (i=0; i> keystrokes.log",Gametxidstr,hexstr); - if ( system(cmd) != 0 ) - fprintf(stderr,"error issuing (%s)\n",cmd); - } - else - { - static FILE *fp; - if ( fp == 0 ) - fp = fopen("keystrokes.log","a"); - sprintf(params,"[\"keystrokes\",\"17\",\"[%%22%s%%22,%%22%s%%22]\"]",Gametxidstr,hexstr); - if ( (retstr= hush_issuemethod(USERPASS,"cclib",params,ROGUE_PORT)) != 0 ) - { - if ( fp != 0 ) - { - fprintf(fp,"%s\n",params); - fprintf(fp,"%s\n",retstr); - fflush(fp); - } - if ( (retjson= cJSON_Parse(retstr)) != 0 ) - { - if ( (resobj= jobj(retjson,"result")) != 0 && (rawtx= jstr(resobj,"hex")) != 0 ) - { - if ( rs->keystrokeshex != 0 ) - free(rs->keystrokeshex); - if ( (errstr= jstr(resobj,"error")) == 0 ) - { - rs->keystrokeshex = (char *)malloc(strlen(rawtx)+1); - strcpy(rs->keystrokeshex,rawtx); - retflag = 1; - } else fprintf(stderr,"error sending keystrokes tx\n"), sleep(1); -//fprintf(stderr,"set keystrokestx <- %s\n",rs->keystrokeshex); - } - free_json(retjson); - } - free(retstr); - } - if ( 0 && waitflag != 0 && rs->keystrokeshex != 0 ) - { - while ( rogue_sendrawtransaction(rs->keystrokeshex) == 0 ) - { - //fprintf(stderr,"post-rebroadcast\n"); - sleep(3); - } - free(rs->keystrokeshex), rs->keystrokeshex = 0; - } - } - } - return(retflag); -} - -int32_t rogue_setplayerdata(struct rogue_state *rs,char *gametxidstr) -{ - char cmd[32768]; int32_t i,n,retval=-1; char params[1024],*filestr=0,*pname,*statusstr,*datastr,fname[128]; long allocsize; cJSON *retjson,*array,*item,*resultjson; - if ( rs->guiflag == 0 ) - return(-1); - if ( gametxidstr == 0 || *gametxidstr == 0 ) - return(retval); - if ( 0 ) - { - sprintf(fname,"%s.gameinfo",gametxidstr); - sprintf(cmd,"./hush-cli -ac_name=ROGUE cclib gameinfo 17 \\\"[%%22%s%%22]\\\" > %s",gametxidstr,fname); - if ( system(cmd) != 0 ) - fprintf(stderr,"error issuing (%s)\n",cmd); - else filestr = (char *)OS_fileptr(&allocsize,fname); - } - else - { - sprintf(params,"[\"gameinfo\",\"17\",\"[%%22%s%%22]\"]",gametxidstr); - filestr = hush_issuemethod(USERPASS,"cclib",params,ROGUE_PORT); - } - if ( filestr != 0 ) - { - if ( (retjson= cJSON_Parse(filestr)) != 0 && (resultjson= jobj(retjson,"result")) != 0 ) - { - //fprintf(stderr,"gameinfo.(%s)\n",jprint(resultjson,0)); - if ( (array= jarray(&n,resultjson,"players")) != 0 ) - { - for (i=0; iP,(int32_t)strlen(datastr)/2,datastr); - fprintf(stderr,"set pname[%s] %s\n",pname==0?"":pname,jprint(item,0)); - rs->restoring = 1; - } - } - } - } - } - free_json(retjson); - } - free(filestr); - } - return(retval); -} - -#ifdef _WIN32 -#ifdef _MSC_VER -__inline int msver(void) { - switch (_MSC_VER) { - case 1500: return 2008; - case 1600: return 2010; - case 1700: return 2012; - case 1800: return 2013; - case 1900: return 2015; - //case 1910: return 2017; - default: return (_MSC_VER / 100); - } -} - -static inline bool is_x64(void) { -#if defined(__x86_64__) || defined(_WIN64) || defined(__aarch64__) - return 1; -#elif defined(__amd64__) || defined(__amd64) || defined(_M_X64) || defined(_M_IA64) - return 1; -#else - return 0; -#endif -} - -#define BUILD_DATE __DATE__ " " __TIME__ -#endif // _WIN32 -#endif // _MSC_VER - -int main(int argc, char **argv, char **envp) -{ - uint64_t seed; FILE *fp = 0; int32_t i,j,c; char userpass[8192]; - - #ifdef _WIN32 - #ifdef _MSC_VER - printf("*** rogue for Windows [ Build %s ] ***\n", BUILD_DATE); - const char* arch = is_x64() ? "64-bits" : "32-bits"; - printf(" Built with VC++ %d (%ld) %s\n\n", msver(), _MSC_FULL_VER, arch); - #endif - #endif - - for (i=j=0; argv[0][i]!=0&&j -#include - -#if defined(_WIN32) -#include -#include -#include -#include -#pragma warning( disable: 4201 ) -#include -#pragma warning( default: 4201 ) -#include -#undef MOUSE_MOVED -#endif - -//#include -#include "extern.h" - -#if defined(HAVE_SYS_TYPES) -#include -#endif - -#if defined(HAVE_PROCESS_H) -#include -#endif - -#if defined(HAVE_PWD_H) -#include -#endif - -#if defined(HAVE_SYS_UTSNAME) -#include -#endif - -#if defined(HAVE_ARPA_INET_H) -#include /* Solaris 2.8 required this for htonl() and ntohl() */ -#endif - -#if defined(HAVE_TERMIOS_H) -#include -#endif - -#if defined(HAVE_UNISTD_H) -#ifndef __USE_GNU -#define __USE_GNU -#include -#undef __USE_GNU -#else -#include -#endif -#endif - -#ifndef BUILD_ROGUE -#include /* AIX requires curses.h be included before term.h */ -#else -#include "cursesd.h" -#endif - - -#if defined(HAVE_TERM_H) -#include -#elif defined(HAVE_NCURSES_TERM_H) -#include -#endif - -#if defined(HAVE_WORKING_FORK) -#include -#endif - -#include -#include -#include -#include -#include -#include "extern.h" - -#if !defined(PATH_MAX) && defined(_MAX_PATH) -#define PATH_MAX _MAX_PATH -#endif - -#if !defined(PATH_MAX) && defined(_PATH_MAX) -#define PATH_MAX _PATH_MAX -#endif - -#define NOOP(x) (x += 0) - -void -md_init() -{ -#if defined(__INTERIX) - char *term; - - term = getenv("TERM"); - - if (term == NULL) - setenv("TERM","interix"); -#elif defined(__DJGPP__) - _fmode = _O_BINARY; -#elif defined(_WIN32) - _fmode = _O_BINARY; -#endif - -#if defined(HAVE_ESCDELAY) || defined(NCURSES_VERSION) - ESCDELAY=64; -#endif - -#if defined(DUMP) - md_onsignal_default(); -#else - md_onsignal_exit(); -#endif -} - -void -md_onsignal_default() -{ -#ifdef SIGHUP - signal(SIGHUP, SIG_DFL); -#endif -#ifdef SIGQUIT - signal(SIGQUIT, SIG_DFL); -#endif -#ifdef SIGILL - signal(SIGILL, SIG_DFL); -#endif -#ifdef SIGTRAP - signal(SIGTRAP, SIG_DFL); -#endif -#ifdef SIGIOT - signal(SIGIOT, SIG_DFL); -#endif -#ifdef SIGEMT - signal(SIGEMT, SIG_DFL); -#endif -#ifdef SIGFPE - signal(SIGFPE, SIG_DFL); -#endif -#ifdef SIGBUS - signal(SIGBUS, SIG_DFL); -#endif -#ifdef SIGSEGV - signal(SIGSEGV, SIG_DFL); -#endif -#ifdef SIGSYS - signal(SIGSYS, SIG_DFL); -#endif -#ifdef SIGTERM - signal(SIGTERM, SIG_DFL); -#endif -} - -void -md_onsignal_exit() -{ -#ifdef SIGHUP - signal(SIGHUP, SIG_DFL); -#endif -#ifdef SIGQUIT - signal(SIGQUIT, exit); -#endif -#ifdef SIGILL - signal(SIGILL, exit); -#endif -#ifdef SIGTRAP - signal(SIGTRAP, exit); -#endif -#ifdef SIGIOT - signal(SIGIOT, exit); -#endif -#ifdef SIGEMT - signal(SIGEMT, exit); -#endif -#ifdef SIGFPE - signal(SIGFPE, exit); -#endif -#ifdef SIGBUS - signal(SIGBUS, exit); -#endif -#ifdef SIGSEGV - signal(SIGSEGV, exit); -#endif -#ifdef SIGSYS - signal(SIGSYS, exit); -#endif -#ifdef SIGTERM - signal(SIGTERM, exit); -#endif -} - -void -md_onsignal_autosave() -{ -#ifdef SIGHUP - signal(SIGHUP, auto_save); -#endif -#ifdef SIGQUIT - signal(SIGQUIT, endit); -#endif -#ifdef SIGILL - signal(SIGILL, auto_save); -#endif -#ifdef SIGTRAP - signal(SIGTRAP, auto_save); -#endif -#ifdef SIGIOT - signal(SIGIOT, auto_save); -#endif -#ifdef SIGEMT - signal(SIGEMT, auto_save); -#endif -#ifdef SIGFPE - signal(SIGFPE, auto_save); -#endif -#ifdef SIGBUS - signal(SIGBUS, auto_save); -#endif -#ifdef SIGSEGV - signal(SIGSEGV, auto_save); -#endif -#ifdef SIGSYS - signal(SIGSYS, auto_save); -#endif -#ifdef SIGTERM - signal(SIGTERM, auto_save); -#endif -#ifdef SIGINT - signal(SIGINT, quit); -#endif -} - -int -md_hasclreol() -{ -/*#if defined(clr_eol) -#ifdef NCURSES_VERSION - if (cur_term == NULL) - return(0); - //if (cur_term->type.Strings == NULL) - return(0); -#endif - return((clr_eol != NULL) && (*clr_eol != 0)); -#elif defined(__PDCURSES__) - return(TRUE); -#else - return((CE != NULL) && (*CE != 0)); -#endif*/ - return(0); -} - -void -md_putchar(int c) -{ - putchar(c); -} - -#ifdef _WIN32 -static int md_standout_mode = 0; -#endif - -void -md_raw_standout() -{ -#ifdef _WIN32 - CONSOLE_SCREEN_BUFFER_INFO csbiInfo; - HANDLE hStdout; - WORD fgattr,bgattr; - - if (md_standout_mode == 0) - { - hStdout = GetStdHandle(STD_OUTPUT_HANDLE); - GetConsoleScreenBufferInfo(hStdout, &csbiInfo); - fgattr = (csbiInfo.wAttributes & 0xF); - bgattr = (csbiInfo.wAttributes & 0xF0); - SetConsoleTextAttribute(hStdout,(fgattr << 4) | (bgattr >> 4)); - md_standout_mode = 1; - } -#elif defined(SO) - tputs(SO,0,md_putchar); - fflush(stdout); -#endif -} - -void -md_raw_standend() -{ -#ifdef _WIN32 - CONSOLE_SCREEN_BUFFER_INFO csbiInfo; - HANDLE hStdout; - WORD fgattr,bgattr; - - if (md_standout_mode == 1) - { - hStdout = GetStdHandle(STD_OUTPUT_HANDLE); - GetConsoleScreenBufferInfo(hStdout, &csbiInfo); - fgattr = (csbiInfo.wAttributes & 0xF); - bgattr = (csbiInfo.wAttributes & 0xF0); - SetConsoleTextAttribute(hStdout,(fgattr << 4) | (bgattr >> 4)); - md_standout_mode = 0; - } -#elif defined(SE) - tputs(SE,0,md_putchar); - fflush(stdout); -#endif -} - -int -md_unlink_open_file(char *file, FILE *inf) -{ -#ifdef _WIN32 - fclose(inf); - _chmod(file, 0600); - return( _unlink(file) ); -#else - return(unlink(file)); -#endif -} - -int -md_unlink(char *file) -{ -#ifdef _WIN32 - _chmod(file, 0600); - return( _unlink(file) ); -#else - return(unlink(file)); -#endif -} - -int -md_chmod(char *filename, int mode) -{ -#ifdef _WIN32 - return( _chmod(filename, mode) ); -#else - return( chmod(filename, mode) ); -#endif -} - -void -md_normaluser() -{ -#if defined(HAVE_GETGID) && defined(HAVE_GETUID) - gid_t realgid = getgid(); - uid_t realuid = getuid(); - -#if defined(HAVE_SETRESGID) - if (setresgid(-1, realgid, realgid) != 0) { -#elif defined (HAVE_SETREGID) - if (setregid(realgid, realgid) != 0) { -#elif defined (HAVE_SETGID) - if (setgid(realgid) != 0) { -#else - if (0) { -#endif - perror("Could not drop setgid privileges. Aborting."); - exit(1); - } - -#if defined(HAVE_SETRESUID) - if (setresuid(-1, realuid, realuid) != 0) { -#elif defined(HAVE_SETREUID) - if (setreuid(realuid, realuid) != 0) { -#elif defined(HAVE_SETUID) - if (setuid(realuid) != 0) { -#else - if (0) { -#endif - perror("Could not drop setuid privileges. Aborting."); - exit(1); - } -#endif -} - -int -md_getuid() -{ -#ifdef HAVE_GETUID - return( getuid() ); -#else - return(42); -#endif -} - -int -md_getpid() -{ -#ifdef _WIN32 - return( _getpid() ); -#else - return( getpid() ); -#endif -} - -char * -md_getusername() -{ - static char login[80]; - char *l = NULL; -#ifdef _WIN32 - LPSTR mybuffer; - DWORD size = UNLEN + 1; - TCHAR buffer[UNLEN + 1]; - - mybuffer = buffer; - GetUserName(mybuffer,&size); - l = mybuffer; -#elif defined(HAVE_GETPWUID)&& !defined(__DJGPP__) - struct passwd *pw; - - pw = getpwuid(getuid()); - - l = pw->pw_name; -#endif - - if ((l == NULL) || (*l == '\0')) - if ( (l = getenv("USERNAME")) == NULL ) - if ( (l = getenv("LOGNAME")) == NULL ) - if ( (l = getenv("USER")) == NULL ) - l = "nobody"; - - strncpy(login,l,80); - login[79] = 0; - - return(login); -} - -char * -md_gethomedir() -{ - static char homedir[PATH_MAX]; - char *h = NULL; - size_t len; -#if defined(_WIN32) - TCHAR szPath[PATH_MAX]; -#endif -#if defined(_WIN32) || defined(DJGPP) - char slash = '\\'; -#else - char slash = '/'; - struct passwd *pw; - pw = getpwuid(getuid()); - - h = pw->pw_dir; - - if (strcmp(h,"/") == 0) - h = NULL; -#endif - homedir[0] = 0; -#ifdef _WIN32 - if(SUCCEEDED(SHGetFolderPath(NULL, CSIDL_PERSONAL, NULL, 0, szPath))) - h = szPath; -#endif - - if ( (h == NULL) || (*h == '\0') ) - { - if ( (h = getenv("HOME")) == NULL ) - { - if ( (h = getenv("HOMEDRIVE")) == NULL) - h = ""; - else - { - strncpy(homedir,h,PATH_MAX-1); - homedir[PATH_MAX-1] = 0; - - if ( (h = getenv("HOMEPATH")) == NULL) - h = ""; - } - } - } - - - len = strlen(homedir); - strncat(homedir,h,PATH_MAX-len-1); - len = strlen(homedir); - - if ((len > 0) && (homedir[len-1] != slash)) { - homedir[len] = slash; - homedir[len+1] = 0; - } - - return(homedir); -} - -void -md_sleep(int s) -{ -#ifdef _WIN32 - Sleep(s); -#else - sleep(s); -#endif -} - -char * -md_getshell() -{ - static char shell[PATH_MAX]; - char *s = NULL; -#ifdef _WIN32 - char *def = "C:\\WINDOWS\\SYSTEM32\\CMD.EXE"; -#elif defined(__DJGPP__) - char *def = "C:\\COMMAND.COM"; -#else - char *def = "/bin/sh"; - struct passwd *pw; - pw = getpwuid(getuid()); - s = pw->pw_shell; -#endif - if ((s == NULL) || (*s == '\0')) - if ( (s = getenv("COMSPEC")) == NULL) - if ( (s = getenv("SHELL")) == NULL) - if ( (s = getenv("SystemRoot")) == NULL) - s = def; - - strncpy(shell,s,PATH_MAX); - shell[PATH_MAX-1] = 0; - - return(shell); -} - -int -md_shellescape() -{ -#if defined(HAVE_WORKING_FORK) - int ret_status; - int pid; - void (*myquit)(int); - void (*myend)(int); - char *sh; - - sh = md_getshell(); - - while((pid = fork()) < 0) - sleep(1); - - if (pid == 0) /* Shell Process */ - { - /* - * Set back to original user, just in case - */ - md_normaluser(); - execl(sh == NULL ? "/bin/sh" : sh, "shell", "-i", NULL); - perror("No shelly"); - _exit(-1); - } - else /* Application */ - { - myend = signal(SIGINT, SIG_IGN); -#ifdef SIGQUIT - myquit = signal(SIGQUIT, SIG_IGN); -#endif - while (wait(&ret_status) != pid) - continue; - - signal(SIGINT, myquit); -#ifdef SIGQUIT - signal(SIGQUIT, myend); -#endif - } - return(ret_status); -#elif defined(HAVE__SPAWNL) - return((int)_spawnl(_P_WAIT,md_getshell(),"shell",NULL,0)); -#elif defined(HAVE_SPAWNL) - return ( spawnl(P_WAIT,md_getshell(),"shell",NULL,0) ); -#else - return(0); -#endif -} - -int -directory_exists(char *dirname) -{ - struct stat sb; - - if (stat(dirname, &sb) == 0) /* path exists */ - return (sb.st_mode & S_IFDIR); - - return(0); -} - -char * -md_getrealname(int uid) -{ - static char uidstr[20]; -#if !defined(_WIN32) && !defined(DJGPP) - struct passwd *pp; - - if ((pp = getpwuid(uid)) == NULL) - { - sprintf(uidstr,"%d", uid); - return(uidstr); - } - else - return(pp->pw_name); -#else - sprintf(uidstr,"%d", uid); - return(uidstr); -#endif -} - -extern char *xcrypt(char *key, char *salt); - -char * -md_crypt(char *key, char *salt) -{ - return( xcrypt(key,salt) ); -} - -char * -md_getpass(char *prompt) -{ -#ifndef HAVE_GETPASS - static char password_buffer[9]; - char *p = password_buffer; - int c, count = 0; - int max_length = 9; - - fflush(stdout); - /* If we can't prompt, abort */ - if (fputs(prompt, stderr) < 0) - { - *p = '\0'; - return NULL; - } - - for(;;) - { - /* Get a character with no echo */ - c = _getch(); - - /* Exit on interrupt (^c or ^break) */ - if (c == '\003' || c == 0x100) - exit(1); - - /* Terminate on end of line or file (^j, ^m, ^d, ^z) */ - if (c == '\r' || c == '\n' || c == '\004' || c == '\032') - break; - - /* Back up on backspace */ - if (c == '\b') - { - if (count) - count--; - else if (p > password_buffer) - p--; - continue; - } - - /* Ignore DOS extended characters */ - if ((c & 0xff) != c) - continue; - - /* Add to password if it isn't full */ - if (p < password_buffer + max_length - 1) - *p++ = (char) c; - else - count++; - } - *p = '\0'; - - fputc('\n', stderr); - - return password_buffer; -#else - return( (char *) getpass(prompt) ); -#endif -} - -int -md_erasechar() -{ -#ifdef HAVE_ERASECHAR - return( erasechar() ); /* process erase character */ -#elif defined(VERASE) - return(_tty.c_cc[VERASE]); /* process erase character */ -#else - #ifndef __MINGW32__ - return(_tty.sg_erase); /* process erase character */ - #endif -#endif -} - -int -md_killchar() -{ -#ifdef HAVE_KILLCHAR - return( killchar() ); -#elif defined(VKILL) - return(_tty.c_cc[VKILL]); -#else - #ifndef __MINGW32__ - return(_tty.sg_kill); - #endif -#endif -} - -int -md_dsuspchar() -{ -#if defined(VDSUSP) /* POSIX has priority */ - struct termios attr; - tcgetattr(STDIN_FILENO, &attr); - return( attr.c_cc[VDSUSP] ); -#elif defined(TIOCGLTC) - struct ltchars ltc; - ioctl(1, TIOCGLTC, <c); - return(ltc.t_dsuspc); -#elif defined(_POSIX_VDISABLE) - return(_POSIX_VDISABLE); -#else - return(0); -#endif -} - -int -md_setdsuspchar(int c) -{ -#if defined(VDSUSP) /* POSIX has priority */ - struct termios attr; - tcgetattr(STDIN_FILENO, &attr); - attr.c_cc[VDSUSP] = c; - tcgetattr(STDIN_FILENO, &attr); -#elif defined(TIOCSLTC) - struct ltchars ltc; - ioctl(1, TIOCGLTC, <c); - ltc.t_dsuspc = c; - ioctl(1, TIOCSLTC, <c); -#else - NOOP(c); -#endif - return(0); -} - -int -md_suspchar() -{ -#if defined(VSUSP) /* POSIX has priority */ - struct termios attr; - tcgetattr(STDIN_FILENO, &attr); - return( attr.c_cc[VSUSP] ); -#elif defined(TIOCGLTC) - struct ltchars ltc; - ioctl(1, TIOCGLTC, <c); - return(ltc.t_suspc); -#elif defined(_POSIX_VDISABLE) - return(_POSIX_VDISABLE); -#else - return(0); -#endif -} - -int -md_setsuspchar(int c) -{ -#if defined(VSUSP) /* POSIX has priority */ - struct termios attr; - tcgetattr(STDIN_FILENO, &attr); - attr.c_cc[VSUSP] = c; - tcgetattr(STDIN_FILENO, &attr); -#elif defined(TIOCSLTC) - struct ltchars ltc; - ioctl(1, TIOCGLTC, <c); - ltc.t_suspc = c; - ioctl(1, TIOCSLTC, <c); -#else - NOOP(c); -#endif - - return(0); -} - -/* - Cursor/Keypad Support - - Sadly Cursor/Keypad support is less straightforward than it should be. - - The various terminal emulators/consoles choose to differentiate the - cursor and keypad keys (with modifiers) in different ways (if at all!). - Furthermore they use different code set sequences for each key only - a subset of which the various curses libraries recognize. Partly due - to incomplete termcap/terminfo entries and partly due to inherent - limitations of those terminal capability databases. - - I give curses first crack at decoding the sequences. If it fails to decode - it we check for common ESC-prefixed sequences. - - All cursor/keypad results are translated into standard rogue movement - commands. - - Unmodified keys are translated to walk commands: hjklyubn - Modified (shift,control,alt) are translated to run commands: HJKLYUBN - - Console and supported (differentiated) keys - Interix: Cursor Keys, Keypad, Ctl-Keypad - Cygwin: Cursor Keys, Keypad, Alt-Cursor Keys - MSYS: Cursor Keys, Keypad, Ctl-Cursor Keys, Ctl-Keypad - Win32: Cursor Keys, Keypad, Ctl/Shift/Alt-Cursor Keys, Ctl/Alt-Keypad - DJGPP: Cursor Keys, Keypad, Ctl/Shift/Alt-Cursor Keys, Ctl/Alt-Keypad - - Interix Console (raw, ncurses) - ============================== - normal shift ctrl alt - ESC [D, ESC F^, ESC [D, ESC [D /# Left #/ - ESC [C, ESC F$, ESC [C, ESC [C /# Right #/ - ESC [A, ESC F-, local win, ESC [A /# Up #/ - ESC [B, ESC F+, local win, ESC [B /# Down #/ - ESC [H, ESC [H, ESC [H, ESC [H /# Home #/ - ESC [S, local win, ESC [S, ESC [S /# Page Up #/ - ESC [T, local win, ESC [T, ESC [T /# Page Down #/ - ESC [U, ESC [U, ESC [U, ESC [U /# End #/ - ESC [D, ESC F^, ESC [D, O /# Keypad Left #/ - ESC [C, ESC F$, ESC [C, O /# Keypad Right #/ - ESC [A, ESC [A, ESC [-1, O /# Keypad Up #/ - ESC [B, ESC [B, ESC [-2, O /# Keypad Down #/ - ESC [H, ESC [H, ESC [-263, O /# Keypad Home #/ - ESC [S, ESC [S, ESC [-19, O /# Keypad PgUp #/ - ESC [T, ESC [T, ESC [-20, O /# Keypad PgDn #/ - ESC [U, ESC [U, ESC [-21, O /# Keypad End #/ - nothing, nothing, nothing, O /# Kaypad 5 #/ - - Interix Console (term=interix, ncurses) - ============================== - KEY_LEFT, ESC F^, KEY_LEFT, KEY_LEFT /# Left #/ - KEY_RIGHT, ESC F$, KEY_RIGHT, KEY_RIGHT /# Right #/ - KEY_UP, 0x146, local win, KEY_UP /# Up #/ - KEY_DOWN, 0x145, local win, KEY_DOWN /# Down #/ - ESC [H, ESC [H, ESC [H, ESC [H /# Home #/ - KEY_PPAGE, local win, KEY_PPAGE, KEY_PPAGE /# Page Up #/ - KEY_NPAGE, local win, KEY_NPAGE, KEY_NPAGE /# Page Down #/ - KEY_LL, KEY_LL, KEY_LL, KEY_LL /# End #/ - KEY_LEFT, ESC F^, ESC [-4, O /# Keypad Left #/ - KEY_RIGHT, ESC F$, ESC [-3, O /# Keypad Right #/ - KEY_UP, KEY_UP, ESC [-1, O /# Keypad Up #/ - KEY_DOWN, KEY_DOWN, ESC [-2, O /# Keypad Down #/ - ESC [H, ESC [H, ESC [-263, O /# Keypad Home #/ - KEY_PPAGE, KEY_PPAGE, ESC [-19, O /# Keypad PgUp #/ - KEY_NPAGE, KEY_NPAGE, ESC [-20, O /# Keypad PgDn #/ - KEY_LL, KEY_LL, ESC [-21, O /# Keypad End #/ - nothing, nothing, nothing, O /# Keypad 5 #/ - - Cygwin Console (raw, ncurses) - ============================== - normal shift ctrl alt - ESC [D, ESC [D, ESC [D, ESC ESC [D /# Left #/ - ESC [C, ESC [C, ESC [C, ESC ESC [C /# Rght #/ - ESC [A, ESC [A, ESC [A, ESC ESC [A /# Up #/ - ESC [B, ESC [B, ESC [B, ESC ESC [B /# Down #/ - ESC [1~, ESC [1~, ESC [1~, ESC ESC [1~ /# Home #/ - ESC [5~, ESC [5~, ESC [5~, ESC ESC [5~ /# Page Up #/ - ESC [6~, ESC [6~, ESC [6~, ESC ESC [6~ /# Page Down #/ - ESC [4~, ESC [4~, ESC [4~, ESC ESC [4~ /# End #/ - ESC [D, ESC [D, ESC [D, ESC ESC [D,O /# Keypad Left #/ - ESC [C, ESC [C, ESC [C, ESC ESC [C,O /# Keypad Right #/ - ESC [A, ESC [A, ESC [A, ESC ESC [A,O /# Keypad Up #/ - ESC [B, ESC [B, ESC [B, ESC ESC [B,O /# Keypad Down #/ - ESC [1~, ESC [1~, ESC [1~, ESC ESC [1~,O /# Keypad Home #/ - ESC [5~, ESC [5~, ESC [5~, ESC ESC [5~,O /# Keypad PgUp #/ - ESC [6~, ESC [6~, ESC [6~, ESC ESC [6~,O /# Keypad PgDn #/ - ESC [4~, ESC [4~, ESC [4~, ESC ESC [4~,O /# Keypad End #/ - ESC [-71, nothing, nothing, O /# Keypad 5 #/ - - Cygwin Console (term=cygwin, ncurses) - ============================== - KEY_LEFT, KEY_LEFT, KEY_LEFT, ESC-260 /# Left #/ - KEY_RIGHT, KEY_RIGHT, KEY_RIGHT, ESC-261 /# Rght #/ - KEY_UP, KEY_UP, KEY_UP, ESC-259 /# Up #/ - KEY_DOWN, KEY_DOWN, KEY_DOWN, ESC-258 /# Down #/ - KEY_HOME, KEY_HOME, KEY_HOME, ESC-262 /# Home #/ - KEY_PPAGE, KEY_PPAGE, KEY_PPAGE, ESC-339 /# Page Up #/ - KEY_NPAGE, KEY_NPAGE, KEY_NPAGE, ESC-338 /# Page Down #/ - KEY_END, KEY_END, KEY_END, ESC-360 /# End #/ - KEY_LEFT, KEY_LEFT, KEY_LEFT, ESC-260,O /# Keypad Left #/ - KEY_RIGHT, KEY_RIGHT, KEY_RIGHT, ESC-261,O /# Keypad Right #/ - KEY_UP, KEY_UP, KEY_UP, ESC-259,O /# Keypad Up #/ - KEY_DOWN, KEY_DOWN, KEY_DOWN, ESC-258,O /# Keypad Down #/ - KEY_HOME, KEY_HOME, KEY_HOME, ESC-262,O /# Keypad Home #/ - KEY_PPAGE, KEY_PPAGE, KEY_PPAGE, ESC-339,O /# Keypad PgUp #/ - KEY_NPAGE, KEY_NPAGE, KEY_NPAGE, ESC-338,O /# Keypad PgDn #/ - KEY_END, KEY_END, KEY_END, ESC-360,O /# Keypad End #/ - ESC [G, nothing, nothing, O /# Keypad 5 #/ - - MSYS Console (raw, ncurses) - ============================== - normal shift ctrl alt - ESC OD, ESC [d, ESC Od nothing /# Left #/ - ESC OE, ESC [e, ESC Oe, nothing /# Right #/ - ESC OA, ESC [a, ESC Oa, nothing /# Up #/ - ESC OB, ESC [b, ESC Ob, nothing /# Down #/ - ESC [7~, ESC [7$, ESC [7^, nothing /# Home #/ - ESC [5~, local window, ESC [5^, nothing /# Page Up #/ - ESC [6~, local window, ESC [6^, nothing /# Page Down #/ - ESC [8~, ESC [8$, ESC [8^, nothing /# End #/ - ESC OD, ESC [d, ESC Od O /# Keypad Left #/ - ESC OE, ESC [c, ESC Oc, O /# Keypad Right #/ - ESC OA, ESC [a, ESC Oa, O /# Keypad Up #/ - ESC OB, ESC [b, ESC Ob, O /# Keypad Down #/ - ESC [7~, ESC [7$, ESC [7^, O /# Keypad Home #/ - ESC [5~, local window, ESC [5^, O /# Keypad PgUp #/ - ESC [6~, local window, ESC [6^, O /# Keypad PgDn #/ - ESC [8~, ESC [8$, ESC [8^, O /# Keypad End #/ - 11, 11, 11, O /# Keypad 5 #/ - - MSYS Console (term=rxvt, ncurses) - ============================== - normal shift ctrl alt - KEY_LEFT, KEY_SLEFT, 514 nothing /# Left #/ - KEY_RIGHT, KEY_SRIGHT, 516, nothing /# Right #/ - KEY_UP, 518, 519, nothing /# Up #/ - KEY_DOWN, 511, 512, nothing /# Down #/ - KEY_HOME, KEY_SHOME, ESC [7^, nothing /# Home #/ - KEY_PPAGE, local window, ESC [5^, nothing /# Page Up #/ - KEY_NPAGE, local window, ESC [6^, nothing /# Page Down #/ - KEY_END, KEY_SEND, KEY_EOL, nothing /# End #/ - KEY_LEFT, KEY_SLEFT, 514 O /# Keypad Left #/ - KEY_RIGHT, KEY_SRIGHT, 516, O /# Keypad Right #/ - KEY_UP, 518, 519, O /# Keypad Up #/ - KEY_DOWN, 511, 512, O /# Keypad Down #/ - KEY_HOME, KEY_SHOME, ESC [7^, O /# Keypad Home #/ - KEY_PPAGE, local window, ESC [5^, O /# Keypad PgUp #/ - KEY_NPAGE, local window, ESC [6^, O /# Keypad PgDn #/ - KEY_END, KEY_SEND, KEY_EOL, O /# Keypad End #/ - 11, 11, 11, O /# Keypad 5 #/ - - Win32 Console (raw, pdcurses) - DJGPP Console (raw, pdcurses) - ============================== - normal shift ctrl alt - 260, 391, 443, 493 /# Left #/ - 261, 400, 444, 492 /# Right #/ - 259, 547, 480, 490 /# Up #/ - 258, 548, 481, 491 /# Down #/ - 262, 388, 447, 524 /# Home #/ - 339, 396, 445, 526 /# Page Up #/ - 338, 394, 446, 520 /# Page Down #/ - 358, 384, 448, 518 /# End #/ - 452, 52('4'), 511, 521 /# Keypad Left #/ - 454, 54('6'), 513, 523 /# Keypad Right #/ - 450, 56('8'), 515, 525 /# Keypad Up #/ - 456, 50('2'), 509, 519 /# Keypad Down #/ - 449, 55('7'), 514, 524 /# Keypad Home #/ - 451, 57('9'), 516, 526 /# Keypad PgUp #/ - 457, 51('3'), 510, 520 /# Keypad PgDn #/ - 455, 49('1'), 508, 518 /# Keypad End #/ - 453, 53('5'), 512, 522 /# Keypad 5 #/ - - Win32 Console (pdcurses, MSVC/MingW32) - DJGPP Console (pdcurses) - ============================== - normal shift ctrl alt - KEY_LEFT, KEY_SLEFT, CTL_LEFT, ALT_LEFT /# Left #/ - KEY_RIGHT, KEY_SRIGHT, CTL_RIGHT, ALT_RIGHT /# Right #/ - KEY_UP, KEY_SUP, CTL_UP, ALT_UP /# Up #/ - KEY_DOWN, KEY_SDOWN, CTL_DOWN, ALT_DOWN /# Down #/ - KEY_HOME, KEY_SHOME, CTL_HOME, ALT_HOME /# Home #/ - KEY_PPAGE, KEY_SPREVIOUS, CTL_PGUP, ALT_PGUP /# Page Up #/ - KEY_NPAGE, KEY_SNEXTE, CTL_PGDN, ALT_PGDN /# Page Down #/ - KEY_END, KEY_SEND, CTL_END, ALT_END /# End #/ - KEY_B1, 52('4'), CTL_PAD4, ALT_PAD4 /# Keypad Left #/ - KEY_B3, 54('6'), CTL_PAD6, ALT_PAD6 /# Keypad Right #/ - KEY_A2, 56('8'), CTL_PAD8, ALT_PAD8 /# Keypad Up #/ - KEY_C2, 50('2'), CTL_PAD2, ALT_PAD2 /# Keypad Down #/ - KEY_A1, 55('7'), CTL_PAD7, ALT_PAD7 /# Keypad Home #/ - KEY_A3, 57('9'), CTL_PAD9, ALT_PAD9 /# Keypad PgUp #/ - KEY_C3, 51('3'), CTL_PAD3, ALT_PAD3 /# Keypad PgDn #/ - KEY_C1, 49('1'), CTL_PAD1, ALT_PAD1 /# Keypad End #/ - KEY_B2, 53('5'), CTL_PAD5, ALT_PAD5 /# Keypad 5 #/ - - Windows Telnet (raw) - ============================== - normal shift ctrl alt - ESC [D, ESC [D, ESC [D, ESC [D /# Left #/ - ESC [C, ESC [C, ESC [C, ESC [C /# Right #/ - ESC [A, ESC [A, ESC [A, ESC [A /# Up #/ - ESC [B, ESC [B, ESC [B, ESC [B /# Down #/ - ESC [1~, ESC [1~, ESC [1~, ESC [1~ /# Home #/ - ESC [5~, ESC [5~, ESC [5~, ESC [5~ /# Page Up #/ - ESC [6~, ESC [6~, ESC [6~, ESC [6~ /# Page Down #/ - ESC [4~, ESC [4~, ESC [4~, ESC [4~ /# End #/ - ESC [D, ESC [D, ESC [D, ESC [D /# Keypad Left #/ - ESC [C, ESC [C, ESC [C, ESC [C /# Keypad Right #/ - ESC [A, ESC [A, ESC [A, ESC [A /# Keypad Up #/ - ESC [B, ESC [B, ESC [B, ESC [B /# Keypad Down #/ - ESC [1~, ESC [1~, ESC [1~, ESC [1~ /# Keypad Home #/ - ESC [5~, ESC [5~, ESC [5~, ESC [5~ /# Keypad PgUp #/ - ESC [6~, ESC [6~, ESC [6~, ESC [6~ /# Keypad PgDn #/ - ESC [4~, ESC [4~, ESC [4~, ESC [4~ /# Keypad End #/ - nothing, nothing, nothing, nothing /# Keypad 5 #/ - - Windows Telnet (term=xterm) - ============================== - normal shift ctrl alt - KEY_LEFT, KEY_LEFT, KEY_LEFT, KEY_LEFT /# Left #/ - KEY_RIGHT, KEY_RIGHT, KEY_RIGHT, KEY_RIGHT /# Right #/ - KEY_UP, KEY_UP, KEY_UP, KEY_UP /# Up #/ - KEY_DOWN, KEY_DOWN, KEY_DOWN, KEY_DOWN /# Down #/ - ESC [1~, ESC [1~, ESC [1~, ESC [1~ /# Home #/ - KEY_PPAGE, KEY_PPAGE, KEY_PPAGE, KEY_PPAGE /# Page Up #/ - KEY_NPAGE, KEY_NPAGE, KEY_NPAGE, KEY_NPAGE /# Page Down #/ - ESC [4~, ESC [4~, ESC [4~, ESC [4~ /# End #/ - KEY_LEFT, KEY_LEFT, KEY_LEFT, O /# Keypad Left #/ - KEY_RIGHT, KEY_RIGHT, KEY_RIGHT, O /# Keypad Right #/ - KEY_UP, KEY_UP, KEY_UP, O /# Keypad Up #/ - KEY_DOWN, KEY_DOWN, KEY_DOWN, O /# Keypad Down #/ - ESC [1~, ESC [1~, ESC [1~, ESC [1~ /# Keypad Home #/ - KEY_PPAGE, KEY_PPAGE, KEY_PPAGE, KEY_PPAGE /# Keypad PgUp #/ - KEY_NPAGE, KEY_NPAGE, KEY_NPAGE, KEY_NPAGE /# Keypad PgDn #/ - ESC [4~, ESC [4~, ESC [4~, O /# Keypad End #/ - ESC [-71, nothing, nothing, O /# Keypad 5 #/ - - PuTTY - ============================== - normal shift ctrl alt - ESC [D, ESC [D, ESC OD, ESC [D /# Left #/ - ESC [C, ESC [C, ESC OC, ESC [C /# Right #/ - ESC [A, ESC [A, ESC OA, ESC [A /# Up #/ - ESC [B, ESC [B, ESC OB, ESC [B /# Down #/ - ESC [1~, ESC [1~, local win, ESC [1~ /# Home #/ - ESC [5~, local win, local win, ESC [5~ /# Page Up #/ - ESC [6~, local win, local win, ESC [6~ /# Page Down #/ - ESC [4~, ESC [4~, local win, ESC [4~ /# End #/ - ESC [D, ESC [D, ESC [D, O /# Keypad Left #/ - ESC [C, ESC [C, ESC [C, O /# Keypad Right #/ - ESC [A, ESC [A, ESC [A, O /# Keypad Up #/ - ESC [B, ESC [B, ESC [B, O /# Keypad Down #/ - ESC [1~, ESC [1~, ESC [1~, O /# Keypad Home #/ - ESC [5~, ESC [5~, ESC [5~, O /# Keypad PgUp #/ - ESC [6~, ESC [6~, ESC [6~, O /# Keypad PgDn #/ - ESC [4~, ESC [4~, ESC [4~, O /# Keypad End #/ - nothing, nothing, nothing, O /# Keypad 5 #/ - - PuTTY - ============================== - normal shift ctrl alt - KEY_LEFT, KEY_LEFT, ESC OD, ESC KEY_LEFT /# Left #/ - KEY_RIGHT KEY_RIGHT, ESC OC, ESC KEY_RIGHT /# Right #/ - KEY_UP, KEY_UP, ESC OA, ESC KEY_UP /# Up #/ - KEY_DOWN, KEY_DOWN, ESC OB, ESC KEY_DOWN /# Down #/ - ESC [1~, ESC [1~, local win, ESC ESC [1~ /# Home #/ - KEY_PPAGE local win, local win, ESC KEY_PPAGE /# Page Up #/ - KEY_NPAGE local win, local win, ESC KEY_NPAGE /# Page Down #/ - ESC [4~, ESC [4~, local win, ESC ESC [4~ /# End #/ - ESC Ot, ESC Ot, ESC Ot, O /# Keypad Left #/ - ESC Ov, ESC Ov, ESC Ov, O /# Keypad Right #/ - ESC Ox, ESC Ox, ESC Ox, O /# Keypad Up #/ - ESC Or, ESC Or, ESC Or, O /# Keypad Down #/ - ESC Ow, ESC Ow, ESC Ow, O /# Keypad Home #/ - ESC Oy, ESC Oy, ESC Oy, O /# Keypad PgUp #/ - ESC Os, ESC Os, ESC Os, O /# Keypad PgDn #/ - ESC Oq, ESC Oq, ESC Oq, O /# Keypad End #/ - ESC Ou, ESC Ou, ESC Ou, O /# Keypad 5 #/ -*/ - -#define M_NORMAL 0 -#define M_ESC 1 -#define M_KEYPAD 2 -#define M_TRAIL 3 - -#ifndef BUILD_ROGUE -int -md_readchar() -{ - int ch = 0; - int lastch = 0; - int mode = M_NORMAL; - int mode2 = M_NORMAL; - - for(;;) - { - ch = getch(); - - if (ch == ERR) /* timed out waiting for valid sequence */ - { /* flush input so far and start over */ - mode = M_NORMAL; - nocbreak(); - raw(); - ch = 27; - break; - } - - if (mode == M_TRAIL) - { - if (ch == '^') /* msys console : 7,5,6,8: modified*/ - ch = CTRL( toupper(lastch) ); - - if (ch == '~') /* cygwin console: 1,5,6,4: normal */ - ch = tolower(lastch); /* windows telnet: 1,5,6,4: normal */ - /* msys console : 7,5,6,8: normal */ - - if (mode2 == M_ESC) /* cygwin console: 1,5,6,4: modified*/ - ch = CTRL( toupper(ch) ); - - break; - } - - if (mode == M_ESC) - { - if (ch == 27) - { - mode2 = M_ESC; - continue; - } - - if ((ch == 'F') || (ch == 'O') || (ch == '[')) - { - mode = M_KEYPAD; - continue; - } - - - switch(ch) - { - /* Cygwin Console */ - /* PuTTY */ - case KEY_LEFT : ch = CTRL('H'); break; - case KEY_RIGHT: ch = CTRL('L'); break; - case KEY_UP : ch = CTRL('K'); break; - case KEY_DOWN : ch = CTRL('J'); break; - case KEY_HOME : ch = CTRL('Y'); break; - case KEY_PPAGE: ch = CTRL('U'); break; - case KEY_NPAGE: ch = CTRL('N'); break; - case KEY_END : ch = CTRL('B'); break; - - default: break; - } - - break; - } - - if (mode == M_KEYPAD) - { - switch(ch) - { - /* ESC F - Interix Console codes */ - case '^': ch = CTRL('H'); break; /* Shift-Left */ - case '$': ch = CTRL('L'); break; /* Shift-Right */ - - /* ESC [ - Interix Console codes */ - case 'H': ch = 'y'; break; /* Home */ - case 1: ch = CTRL('K'); break; /* Ctl-Keypad Up */ - case 2: ch = CTRL('J'); break; /* Ctl-Keypad Down */ - case 3: ch = CTRL('L'); break; /* Ctl-Keypad Right */ - case 4: ch = CTRL('H'); break; /* Ctl-Keypad Left */ - case 263: ch = CTRL('Y'); break; /* Ctl-Keypad Home */ - case 19: ch = CTRL('U'); break; /* Ctl-Keypad PgUp */ - case 20: ch = CTRL('N'); break; /* Ctl-Keypad PgDn */ - case 21: ch = CTRL('B'); break; /* Ctl-Keypad End */ - - /* ESC [ - Cygwin Console codes */ - case 'G': ch = '.'; break; /* Keypad 5 */ - case '7': lastch = 'Y'; mode=M_TRAIL; break; /* Ctl-Home */ - case '5': lastch = 'U'; mode=M_TRAIL; break; /* Ctl-PgUp */ - case '6': lastch = 'N'; mode=M_TRAIL; break; /* Ctl-PgDn */ - - /* ESC [ - Win32 Telnet, PuTTY */ - case '1': lastch = 'y'; mode=M_TRAIL; break; /* Home */ - case '4': lastch = 'b'; mode=M_TRAIL; break; /* End */ - - /* ESC O - PuTTY */ - case 'D': ch = CTRL('H'); break; - case 'C': ch = CTRL('L'); break; - case 'A': ch = CTRL('K'); break; - case 'B': ch = CTRL('J'); break; - case 't': ch = 'h'; break; - case 'v': ch = 'l'; break; - case 'x': ch = 'k'; break; - case 'r': ch = 'j'; break; - case 'w': ch = 'y'; break; - case 'y': ch = 'u'; break; - case 's': ch = 'n'; break; - case 'q': ch = 'b'; break; - case 'u': ch = '.'; break; - } - - if (mode != M_KEYPAD) - continue; - } - - if (ch == 27) - { - halfdelay(1); - mode = M_ESC; - continue; - } - - switch(ch) - { - case KEY_LEFT : ch = 'h'; break; - case KEY_DOWN : ch = 'j'; break; - case KEY_UP : ch = 'k'; break; - case KEY_RIGHT : ch = 'l'; break; - case KEY_HOME : ch = 'y'; break; - case KEY_PPAGE : ch = 'u'; break; - case KEY_END : ch = 'b'; break; -#ifdef KEY_LL - case KEY_LL : ch = 'b'; break; -#endif - case KEY_NPAGE : ch = 'n'; break; - -#ifdef KEY_B1 - case KEY_B1 : ch = 'h'; break; - case KEY_C2 : ch = 'j'; break; - case KEY_A2 : ch = 'k'; break; - case KEY_B3 : ch = 'l'; break; -#endif - case KEY_A1 : ch = 'y'; break; - case KEY_A3 : ch = 'u'; break; - case KEY_C1 : ch = 'b'; break; - case KEY_C3 : ch = 'n'; break; - /* next should be '.', but for problem with putty/linux */ - case KEY_B2 : ch = 'u'; break; - -#ifdef KEY_SLEFT - case KEY_SRIGHT : ch = CTRL('L'); break; - case KEY_SLEFT : ch = CTRL('H'); break; -#ifdef KEY_SUP - case KEY_SUP : ch = CTRL('K'); break; - case KEY_SDOWN : ch = CTRL('J'); break; -#endif - case KEY_SHOME : ch = CTRL('Y'); break; - case KEY_SPREVIOUS:ch = CTRL('U'); break; - case KEY_SEND : ch = CTRL('B'); break; - case KEY_SNEXT : ch = CTRL('N'); break; -#endif - case 0x146 : ch = CTRL('K'); break; /* Shift-Up */ - case 0x145 : ch = CTRL('J'); break; /* Shift-Down */ - - -#ifdef CTL_RIGHT - case CTL_RIGHT : ch = CTRL('L'); break; - case CTL_LEFT : ch = CTRL('H'); break; - case CTL_UP : ch = CTRL('K'); break; - case CTL_DOWN : ch = CTRL('J'); break; - case CTL_HOME : ch = CTRL('Y'); break; - case CTL_PGUP : ch = CTRL('U'); break; - case CTL_END : ch = CTRL('B'); break; - case CTL_PGDN : ch = CTRL('N'); break; -#endif -#ifdef KEY_EOL - case KEY_EOL : ch = CTRL('B'); break; -#endif - -#ifndef CTL_PAD1 - /* MSYS rxvt console */ - case 511 : ch = CTRL('J'); break; /* Shift Dn */ - case 512 : ch = CTRL('J'); break; /* Ctl Down */ - case 514 : ch = CTRL('H'); break; /* Ctl Left */ - case 516 : ch = CTRL('L'); break; /* Ctl Right*/ - case 518 : ch = CTRL('K'); break; /* Shift Up */ - case 519 : ch = CTRL('K'); break; /* Ctl Up */ -#endif - -#ifdef CTL_PAD1 - case CTL_PAD1 : ch = CTRL('B'); break; - case CTL_PAD2 : ch = CTRL('J'); break; - case CTL_PAD3 : ch = CTRL('N'); break; - case CTL_PAD4 : ch = CTRL('H'); break; - case CTL_PAD5 : ch = '.'; break; - case CTL_PAD6 : ch = CTRL('L'); break; - case CTL_PAD7 : ch = CTRL('Y'); break; - case CTL_PAD8 : ch = CTRL('K'); break; - case CTL_PAD9 : ch = CTRL('U'); break; -#endif - -#ifdef ALT_RIGHT - case ALT_RIGHT : ch = CTRL('L'); break; - case ALT_LEFT : ch = CTRL('H'); break; - case ALT_DOWN : ch = CTRL('J'); break; - case ALT_HOME : ch = CTRL('Y'); break; - case ALT_PGUP : ch = CTRL('U'); break; - case ALT_END : ch = CTRL('B'); break; - case ALT_PGDN : ch = CTRL('N'); break; -#endif - -#ifdef ALT_PAD1 - case ALT_PAD1 : ch = CTRL('B'); break; - case ALT_PAD2 : ch = CTRL('J'); break; - case ALT_PAD3 : ch = CTRL('N'); break; - case ALT_PAD4 : ch = CTRL('H'); break; - case ALT_PAD5 : ch = '.'; break; - case ALT_PAD6 : ch = CTRL('L'); break; - case ALT_PAD7 : ch = CTRL('Y'); break; - case ALT_PAD8 : ch = CTRL('K'); break; - case ALT_PAD9 : ch = CTRL('U'); break; -#endif -#ifdef KEY_BACKSPACE /* NCURSES in Keypad mode sends this for Ctrl-H */ - case KEY_BACKSPACE: ch = CTRL('H'); break; -#endif - } - - break; - } - - nocbreak(); /* disable halfdelay mode if on */ - raw(); - - return(ch & 0x7F); -} -#endif - -#if defined(LOADAV) && defined(HAVE_NLIST_H) && defined(HAVE_NLIST) -/* - * loadav: - * Looking up load average in core (for system where the loadav() - * system call isn't defined - */ - -#include - -struct nlist avenrun = { - "_avenrun" -}; - -void -md_loadav(double *avg) -{ - int kmem; - - if ((kmem = open("/dev/kmem", 0)) < 0) - goto bad; - nlist(NAMELIST, &avenrun); - if (avenrun.n_type == 0) - { - close(kmem); -bad: - avg[0] = 0.0; - avg[1] = 0.0; - avg[2] = 0.0; - return; - } - - lseek(kmem, avenrun.n_value, 0); - read(kmem, (char *) avg, 3 * sizeof (double)); - close(kmem); -} -#else -void -md_loadav(double *avg) -{ -#if defined(HAVE_LOADAV) - loadav(avg); -#elif defined(HAVE_GETLOADAVG) - getloadavg(avg,3); -#else - avg[0] = avg[1] = avg[2] = 0; -#endif -} -#endif - -#ifndef NSIG -#define NSIG 32 -#endif - -void -md_ignoreallsignals() -{ - int i; - - for (i = 0; i < NSIG; i++) - signal(i, SIG_IGN); -} - -void -md_tstphold() -{ -#ifdef SIGTSTP - /* - * If a process can be suspended, this code wouldn't work - */ -# ifdef SIG_HOLD - signal(SIGTSTP, SIG_HOLD); -# else - signal(SIGTSTP, SIG_IGN); -# endif -#endif -} - -void -md_tstpresume() -{ -#ifdef SIGTSTP - signal(SIGTSTP, tstp); -#endif -} - -void -md_tstpsignal() -{ -#ifdef SIGTSTP - kill(0, SIGTSTP); /* send actual signal and suspend process */ -#endif -} - -#if defined(CHECKTIME) -void -md_start_checkout_timer(int time) -{ - int checkout(); - -#if defined(HAVE_ALARM) && defined(SIGALRM) - signal(SIGALRM, checkout); - alarm(time); -#endif -} - -void -md_stop_checkout_timer() -{ -#if defined(SIGALRM) - signal(SIGALRM, SIG_IGN); -#endif -} - -#endif diff --git a/src/cc/rogue/misc.c b/src/cc/rogue/misc.c deleted file mode 100644 index b2aaffc9a..000000000 --- a/src/cc/rogue/misc.c +++ /dev/null @@ -1,620 +0,0 @@ -// Copyright (c) 2016-2023 The Hush developers -// Distributed under the GPLv3 software license, see the accompanying -// file COPYING or https://www.gnu.org/licenses/gpl-3.0.en.html -/* - * All sorts of miscellaneous routines - * - * @(#)misc.c 4.66 (Berkeley) 08/06/83 - * - * Rogue: Exploring the Dungeons of Doom - * Copyright (C) 1980-1983, 1985, 1999 Michael Toy, Ken Arnold and Glenn Wichman - * All rights reserved. - * - * See the file LICENSE.TXT for full copyright and licensing information. - */ - -//#include -//#include -//#include -//#include -#include "rogue.h" - -/* - * look: - * A quick glance all around the player - */ -#undef DEBUG - - -void -look(struct rogue_state *rs,bool wakeup) -{ - int x, y; - int ch; - THING *tp; - PLACE *pp; - struct room *rp; - int ey, ex; - int passcount; - char pfl, *fp, pch; - int sy, sx, sumhero = 0, diffhero = 0; -# ifdef DEBUG - static bool done = FALSE; - - if (done) - return; - done = TRUE; -# endif /* DEBUG */ - passcount = 0; - rp = proom; - if (!ce(oldpos, hero)) - { - erase_lamp(&oldpos, oldrp); - oldpos = hero; - oldrp = rp; - } - ey = hero.y + 1; - ex = hero.x + 1; - sx = hero.x - 1; - sy = hero.y - 1; - if (door_stop && !firstmove && running) - { - sumhero = hero.y + hero.x; - diffhero = hero.y - hero.x; - } - pp = INDEX(hero.y, hero.x); - pch = pp->p_ch; - pfl = pp->p_flags; - - for (y = sy; y <= ey; y++) - if (y > 0 && y < NUMLINES - 1) for (x = sx; x <= ex; x++) - { - if (x < 0 || x >= NUMCOLS) - continue; - if (!on(player, ISBLIND)) - { - if (y == hero.y && x == hero.x) - continue; - } - - pp = INDEX(y, x); - ch = pp->p_ch; - if (ch == ' ') /* nothing need be done with a ' ' */ - continue; - fp = &pp->p_flags; - if (pch != DOOR && ch != DOOR) - if ((pfl & F_PASS) != (*fp & F_PASS)) - continue; - if (((*fp & F_PASS) || ch == DOOR) && - ((pfl & F_PASS) || pch == DOOR)) - { - if (hero.x != x && hero.y != y && - !step_ok(chat(y, hero.x)) && !step_ok(chat(hero.y, x))) - continue; - } - - if ((tp = pp->p_monst) == NULL) - ch = trip_ch(y, x, ch); - else - if (on(player, SEEMONST) && on(*tp, ISINVIS)) - { - if (door_stop && !firstmove) - running = FALSE; - continue; - } - else - { - if (wakeup) - wake_monster(rs,y, x); - if (see_monst(tp)) - { - if (on(player, ISHALU)) - ch = rnd(26) + 'A'; - else - ch = tp->t_disguise; - } - } - if (on(player, ISBLIND) && (y != hero.y || x != hero.x)) - continue; - - move(y, x); - - if ((proom->r_flags & ISDARK) && !see_floor && ch == FLOOR) - ch = ' '; - - if (tp != NULL || ch != CCHAR( inch() )) - addch(ch); - - if (door_stop && !firstmove && running) - { - switch (runch) - { - case 'h': - if (x == ex) - continue; - when 'j': - if (y == sy) - continue; - when 'k': - if (y == ey) - continue; - when 'l': - if (x == sx) - continue; - when 'y': - if ((y + x) - sumhero >= 1) - continue; - when 'u': - if ((y - x) - diffhero >= 1) - continue; - when 'n': - if ((y + x) - sumhero <= -1) - continue; - when 'b': - if ((y - x) - diffhero <= -1) - continue; - } - switch (ch) - { - case DOOR: - if (x == hero.x || y == hero.y) - running = FALSE; - break; - case PASSAGE: - if (x == hero.x || y == hero.y) - passcount++; - break; - case FLOOR: - case '|': - case '-': - case ' ': - break; - default: - running = FALSE; - break; - } - } - } - if (door_stop && !firstmove && passcount > 1) - running = FALSE; - if (!running || !jump) - mvaddch(hero.y, hero.x, PLAYER); -# ifdef DEBUG - done = FALSE; -# endif /* DEBUG */ -} - -/* - * trip_ch: - * Return the character appropriate for this space, taking into - * account whether or not the player is tripping. - */ -int -trip_ch(int y, int x, int ch) -{ - if (on(player, ISHALU) && after) - switch (ch) - { - case FLOOR: - case ' ': - case PASSAGE: - case '-': - case '|': - case DOOR: - case TRAP: - break; - default: - if (y != stairs.y || x != stairs.x || !seenstairs) - ch = rnd_thing(); - break; - } - return ch; -} - -/* - * erase_lamp: - * Erase the area shown by a lamp in a dark room. - */ - -void -erase_lamp(coord *pos, struct room *rp) -{ - int y, x, ey, sy, ex; - - if (!(see_floor && (rp->r_flags & (ISGONE|ISDARK)) == ISDARK - && !on(player,ISBLIND))) - return; - - ey = pos->y + 1; - ex = pos->x + 1; - sy = pos->y - 1; - for (x = pos->x - 1; x <= ex; x++) - for (y = sy; y <= ey; y++) - { - if (y == hero.y && x == hero.x) - continue; - move(y, x); - if (inch() == FLOOR) - addch(' '); - } -} - -/* - * show_floor: - * Should we show the floor in her room at this time? - */ -bool -show_floor() -{ - if ((proom->r_flags & (ISGONE|ISDARK)) == ISDARK && !on(player, ISBLIND)) - return see_floor; - else - return TRUE; -} - -/* - * find_obj: - * Find the unclaimed object at y, x - */ -THING * -find_obj(struct rogue_state *rs,int y, int x) -{ - THING *obj; - - for (obj = lvl_obj; obj != NULL; obj = next(obj)) - { - if (obj->o_pos.y == y && obj->o_pos.x == x) - return obj; - } -#ifdef MASTER - sprintf(prbuf, "Non-object %d,%d", y, x); - msg(rs,prbuf); - return NULL; -#else - /* NOTREACHED */ - return NULL; -#endif -} - -/* - * eat: - * She wants to eat something, so let her try - */ - -void -eat(struct rogue_state *rs) -{ - THING *obj; - - if ((obj = get_item(rs,"eat", FOOD)) == NULL) - return; - if (obj->o_type != FOOD) - { - if (!terse) - msg(rs,"ugh, you would get ill if you ate that"); - else - msg(rs,"that's Inedible!"); - return; - } - if (food_left < 0) - food_left = 0; - if ((food_left += HUNGERTIME - 200 + rnd(400)) > STOMACHSIZE) - food_left = STOMACHSIZE; - hungry_state = 0; - if (obj == cur_weapon) - cur_weapon = NULL; - if (obj->o_which == 1) - msg(rs,"my, that was a yummy %s", fruit); - else - if (rnd(100) > 70) - { - pstats.s_exp++; - msg(rs,"%s, this food tastes awful", choose_str("bummer", "yuk")); - check_level(rs); - } - else - msg(rs,"%s, that tasted good", choose_str("oh, wow", "yum")); - leave_pack(rs,obj, FALSE, FALSE); -} - -/* - * check_level: - * Check to see if the guy has gone up a level. - */ - -void -check_level(struct rogue_state *rs) -{ - int i, add, olevel; - - for (i = 0; e_levels[i] != 0; i++) - if (e_levels[i] > pstats.s_exp) - break; - i++; - olevel = pstats.s_lvl; - pstats.s_lvl = i; - if (i > olevel) - { - add = roll(i - olevel, 10); - max_hp += add; - pstats.s_hpt += add; - msg(rs,"welcome to level %d", i); - } -} - -/* - * chg_str: - * used to modify the playes strength. It keeps track of the - * highest it has been, just in case - */ - -void -chg_str(int amt) -{ - //auto jl777: strange compiler error - uint32_t comp; - - if (amt == 0) - return; - //add_str(&pstats.s_str, amt); - pstats.s_str += amt; - if ( pstats.s_str < 3 ) - pstats.s_str = 3; - else if ( pstats.s_str > 31 ) - pstats.s_str = 31; - comp = pstats.s_str; - if (ISRING(LEFT, R_ADDSTR)) - { - // add_str(&comp, -cur_ring[LEFT]->o_arm); - comp += -cur_ring[LEFT]->o_arm; - if ( comp < 3 ) - comp = 3; - else if ( comp > 31 ) - comp = 31; - } - if (ISRING(RIGHT, R_ADDSTR)) - { - //add_str(&comp, -cur_ring[RIGHT]->o_arm); - comp += -cur_ring[RIGHT]->o_arm; - if ( comp < 3 ) - comp = 3; - else if ( comp > 31 ) - comp = 31; - } - if ( comp > max_stats.s_str ) - max_stats.s_str = comp; -} - -/* - * add_str: - * Perform the actual add, checking upper and lower bound limits - */ -void -add_str(str_t *sp, int amt) -{ - if ((*sp += amt) < 3) - *sp = 3; - else if (*sp > 31) - *sp = 31; -} - -/* - * add_haste: - * Add a haste to the player - */ -bool -add_haste(struct rogue_state *rs,bool potion) -{ - if (on(player, ISHASTE)) - { - no_command += rnd(8); - player.t_flags &= ~(ISRUN|ISHASTE); - extinguish(nohaste); - msg(rs,"you faint from exhaustion"); - return FALSE; - } - else - { - player.t_flags |= ISHASTE; - if (potion) - fuse(nohaste, 0, rnd(4)+4, AFTER); - return TRUE; - } -} - -/* - * aggravate: - * Aggravate all the monsters on this level - */ - -void -aggravate(struct rogue_state *rs) -{ - THING *mp; - - for (mp = mlist; mp != NULL; mp = next(mp)) - runto(rs,&mp->t_pos); -} - -/* - * vowelstr: - * For printfs: if string starts with a vowel, return "n" for an - * "an". - */ -char * -vowelstr(char *str) -{ - switch (*str) - { - case 'a': case 'A': - case 'e': case 'E': - case 'i': case 'I': - case 'o': case 'O': - case 'u': case 'U': - return "n"; - default: - return ""; - } -} - -/* - * is_current: - * See if the object is one of the currently used items - */ -bool -is_current(struct rogue_state *rs,THING *obj) -{ - if (obj == NULL) - return FALSE; - if (obj == cur_armor || obj == cur_weapon || obj == cur_ring[LEFT] - || obj == cur_ring[RIGHT]) - { - if (!terse) - addmsg(rs,"That's already "); - msg(rs,"in use"); - return TRUE; - } - return FALSE; -} - -/* - * get_dir: - * Set up the direction co_ordinate for use in varios "prefix" - * commands - */ -bool -get_dir(struct rogue_state *rs) -{ - char *prompt; - bool gotit; - static coord last_delt= {0,0}; - - if (again && last_dir != '\0') - { - delta.y = last_delt.y; - delta.x = last_delt.x; - dir_ch = last_dir; - } - else - { - if (!terse) - msg(rs,prompt = "which direction? "); - else - prompt = "direction: "; - do - { - gotit = TRUE; - switch (dir_ch = readchar(rs)) - { - case 'h': case'H': delta.y = 0; delta.x = -1; - when 'j': case'J': delta.y = 1; delta.x = 0; - when 'k': case'K': delta.y = -1; delta.x = 0; - when 'l': case'L': delta.y = 0; delta.x = 1; - when 'y': case'Y': delta.y = -1; delta.x = -1; - when 'u': case'U': delta.y = -1; delta.x = 1; - when 'b': case'B': delta.y = 1; delta.x = -1; - when 'n': case'N': delta.y = 1; delta.x = 1; - when ESCAPE: last_dir = '\0'; reset_last(); return FALSE; - otherwise: - mpos = 0; - msg(rs,prompt); - gotit = FALSE; - } - } until (gotit); - if (isupper(dir_ch)) - dir_ch = (char) tolower(dir_ch); - last_dir = dir_ch; - last_delt.y = delta.y; - last_delt.x = delta.x; - } - if (on(player, ISHUH) && rnd(5) == 0) - do - { - delta.y = rnd(3) - 1; - delta.x = rnd(3) - 1; - } while (delta.y == 0 && delta.x == 0); - mpos = 0; - return TRUE; -} - -/* - * sign: - * Return the sign of the number - */ -int -sign(int nm) -{ - if (nm < 0) - return -1; - else - return (nm > 0); -} - -/* - * spread: - * Give a spread around a given number (+/- 20%) - */ -int -spread(int nm) -{ - return nm - nm / 20 + rnd(nm / 10); -} - -/* - * call_it: - * Call an object something after use. - */ - -void -call_it(struct rogue_state *rs,struct obj_info *info) -{ - if (info->oi_know) - { - if (info->oi_guess) - { - free(info->oi_guess); - info->oi_guess = NULL; - } - } - else if (!info->oi_guess) - { - msg(rs,terse ? (char *)"call it: " : (char *)"what do you want to call it? "); - if (get_str(rs,prbuf, stdscr) == NORM) - { - if (info->oi_guess != NULL) - free(info->oi_guess); - info->oi_guess = (char *)malloc((unsigned int) strlen(prbuf) + 1); - strcpy(info->oi_guess, prbuf); - } - } -} - -/* - * rnd_thing: - * Pick a random thing appropriate for this level - */ -char -rnd_thing() -{ - int i; - static char thing_list[] = { - POTION, SCROLL, RING, STICK, FOOD, WEAPON, ARMOR, STAIRS, GOLD, AMULET - }; - - if (level >= AMULETLEVEL) - i = rnd(sizeof thing_list / sizeof (char)); - else - i = rnd(sizeof thing_list / sizeof (char) - 1); - return thing_list[i]; -} - -/* - str str: - * Choose the first or second string depending on whether it the - * player is tripping - */ -char * -choose_str(char *ts, char *ns) -{ - return (on(player, ISHALU) ? ts : ns); -} diff --git a/src/cc/rogue/monsters.c b/src/cc/rogue/monsters.c deleted file mode 100644 index ee309c291..000000000 --- a/src/cc/rogue/monsters.c +++ /dev/null @@ -1,258 +0,0 @@ -// Copyright (c) 2016-2023 The Hush developers -// Distributed under the GPLv3 software license, see the accompanying -// file COPYING or https://www.gnu.org/licenses/gpl-3.0.en.html -/* - * File with various monster functions in it, none as evil as KYC - * - * @(#)monsters.c 4.46 (Berkeley) 02/05/99 - * - * Rogue: Exploring the Dungeons of Doom - * Copyright (C) 1980-1983, 1985, 1999 Michael Toy, Ken Arnold and Glenn Wichman - * All rights reserved. - * - * See the file LICENSE.TXT for full copyright and licensing information. - */ - -//#include -//#include -#include "rogue.h" -//#include - -/* - * List of monsters in rough order of vorpalness - */ -static char lvl_mons[] = { - 'K', 'E', 'B', 'S', 'H', 'I', 'R', 'O', 'Z', 'L', 'C', 'Q', 'A', - 'N', 'Y', 'F', 'T', 'W', 'P', 'X', 'U', 'M', 'V', 'G', 'J', 'D' -}; - -static char wand_mons[] = { - 'K', 'E', 'B', 'S', 'H', 0, 'R', 'O', 'Z', 0, 'C', 'Q', 'A', - 0, 'Y', 0, 'T', 'W', 'P', 0, 'U', 'M', 'V', 'G', 'J', 0 -}; - -/* - * randmonster: - * Pick a monster to show up. The lower the level, - * the meaner the monster. - */ -char -randmonster(bool wander) -{ - int d; - char *mons; - - mons = (wander ? wand_mons : lvl_mons); - do - { - d = level + (rnd(10) - 6); - if (d < 0) - d = rnd(5); - if (d > 25) - d = rnd(5) + 21; - } while (mons[d] == 0); - return mons[d]; -} - -/* - * new_monster: - * Pick a new monster and add it to the list - */ - -void -new_monster(struct rogue_state *rs,THING *tp, char type, coord *cp) -{ - struct monster *mp; - int lev_add; - - if ((lev_add = level - AMULETLEVEL) < 0) - lev_add = 0; - attach(mlist, tp); - tp->t_type = type; - tp->t_disguise = type; - tp->t_pos = *cp; - move(cp->y, cp->x); - tp->t_oldch = CCHAR( inch() ); - tp->t_room = roomin(rs,cp); - moat(cp->y, cp->x) = tp; - mp = &monsters[tp->t_type-'A']; - tp->t_stats.s_lvl = mp->m_stats.s_lvl + lev_add; - tp->t_stats.s_maxhp = tp->t_stats.s_hpt = roll(tp->t_stats.s_lvl, 8); - tp->t_stats.s_arm = mp->m_stats.s_arm - lev_add; - strcpy(tp->t_stats.s_dmg,mp->m_stats.s_dmg); - tp->t_stats.s_str = mp->m_stats.s_str; - tp->t_stats.s_exp = mp->m_stats.s_exp + lev_add * 10 + exp_add(tp); - tp->t_flags = mp->m_flags; - if (level > 29) - tp->t_flags |= ISHASTE; - tp->t_turn = TRUE; - tp->t_pack = NULL; - if (ISWEARING(R_AGGR)) - runto(rs,cp); - if (type == 'X') - tp->t_disguise = rnd_thing(); -} - -/* - * expadd: - * Experience to add for this monster's level/hit points - */ -int -exp_add(THING *tp) -{ - int mod; - - if (tp->t_stats.s_lvl == 1) - mod = tp->t_stats.s_maxhp / 8; - else - mod = tp->t_stats.s_maxhp / 6; - if (tp->t_stats.s_lvl > 9) - mod *= 20; - else if (tp->t_stats.s_lvl > 6) - mod *= 4; - return mod; -} - -/* - * wanderer: - * Create a new wandering monster and aim it at the player - */ - -void -wanderer(struct rogue_state *rs) -{ - THING *tp; - static coord cp; - - tp = new_item(); - do - { - find_floor(rs,(struct room *) NULL, &cp, FALSE, TRUE); - } while (roomin(rs,&cp) == proom); - new_monster(rs,tp, randmonster(TRUE), &cp); - if (on(player, SEEMONST)) - { - standout(); - if (!on(player, ISHALU)) - addch(tp->t_type); - else - addch(rnd(26) + 'A'); - standend(); - } - runto(rs,&tp->t_pos); -#ifdef MASTER - if (wizard) - msg(rs,"started a wandering %s", monsters[tp->t_type-'A'].m_name); -#endif -} - -/* - * wake_monster: - * What to do when the hero steps next to a monster - */ -THING * -wake_monster(struct rogue_state *rs,int y, int x) -{ - THING *tp; - struct room *rp; - char ch, *mname; - -#ifdef MASTER - if ((tp = moat(y, x)) == NULL) - msg(rs,"can't find monster in wake_monster"); -#else - tp = moat(y, x); - if (tp == NULL) - endwin(), abort(); -#endif - ch = tp->t_type; - /* - * Every time he sees mean monster, it might start chasing him - */ - if (!on(*tp, ISRUN) && rnd(3) != 0 && on(*tp, ISMEAN) && !on(*tp, ISHELD) - && !ISWEARING(R_STEALTH) && !on(player, ISLEVIT)) - { - tp->t_dest = &hero; - tp->t_flags |= ISRUN; - } - if (ch == 'M' && !on(player, ISBLIND) && !on(player, ISHALU) - && !on(*tp, ISFOUND) && !on(*tp, ISCANC) && on(*tp, ISRUN)) - { - rp = proom; - if ((rp != NULL && !(rp->r_flags & ISDARK)) - || dist(y, x, hero.y, hero.x) < LAMPDIST) - { - tp->t_flags |= ISFOUND; - if (!save(VS_MAGIC)) - { - if (on(player, ISHUH)) - lengthen(unconfuse, spread(HUHDURATION)); - else - fuse(unconfuse, 0, spread(HUHDURATION), AFTER); - player.t_flags |= ISHUH; - mname = set_mname(tp); - addmsg(rs,"%s", mname); - if (strcmp(mname, "it") != 0) - addmsg(rs,"'"); - msg(rs,"s gaze has confused you"); - } - } - } - /* - * Let greedy ones guard gold - */ - if (on(*tp, ISGREED) && !on(*tp, ISRUN)) - { - tp->t_flags |= ISRUN; - if (proom->r_goldval) - tp->t_dest = &proom->r_gold; - else - tp->t_dest = &hero; - } - return tp; -} - -/* - * give_pack: - * Give a pack to a monster if it deserves one - */ - -void -give_pack(struct rogue_state *rs,THING *tp) -{ - if (level >= max_level && rnd(100) < monsters[tp->t_type-'A'].m_carry) - { - //fprintf(stderr,"give_pack\n"); - attach(tp->t_pack, new_thing(rs)); - } -} - -/* - * save_throw: - * See if a creature save against something - */ -int -save_throw(int which, THING *tp) -{ - int need; - - need = 14 + which - tp->t_stats.s_lvl / 2; - return (roll(1, 20) >= need); -} - -/* - * save: - * See if he saves against various nasty things - */ -int -save(int which) -{ - if (which == VS_MAGIC) - { - if (ISRING(LEFT, R_PROTECT)) - which -= cur_ring[LEFT]->o_arm; - if (ISRING(RIGHT, R_PROTECT)) - which -= cur_ring[RIGHT]->o_arm; - } - return save_throw(which, &player); -} diff --git a/src/cc/rogue/move.c b/src/cc/rogue/move.c deleted file mode 100644 index 4e20e54b4..000000000 --- a/src/cc/rogue/move.c +++ /dev/null @@ -1,429 +0,0 @@ -// Copyright (c) 2016-2023 The Hush developers -// Distributed under the GPLv3 software license, see the accompanying -// file COPYING or https://www.gnu.org/licenses/gpl-3.0.en.html -/* - * hero movement commands - * - * @(#)move.c 4.49 (Berkeley) 02/05/99 - * - * Rogue: Exploring the Dungeons of Doom - * Copyright (C) 1980-1983, 1985, 1999 Michael Toy, Ken Arnold and Glenn Wichman - * All rights reserved. - * - * See the file LICENSE.TXT for full copyright and licensing information. - */ - -//#include -//#include -#include "rogue.h" - -/* - * used to hold the new hero position - */ - -coord nh; - -/* - * do_run: - * Start the hero running - */ - -void -do_run(char ch) -{ - running = TRUE; - after = FALSE; - runch = ch; -} - -/* - * do_move: - * Check to see that a move is legal. If it is handle the - * consequences (fighting, picking up, etc.) - */ - -void -do_move(struct rogue_state *rs,int dy, int dx) -{ - char ch, fl; - - firstmove = FALSE; - if (no_move) - { - no_move--; - msg(rs,"you are still stuck in the bear trap"); - return; - } - /* - * Do a confused move (maybe) - */ - if (on(player, ISHUH) && rnd(5) != 0) - { - nh = *rndmove(&player); - if (ce(nh, hero)) - { - after = FALSE; - running = FALSE; - to_death = FALSE; - return; - } - } - else - { -over: - nh.y = hero.y + dy; - nh.x = hero.x + dx; - } - - /* - * Check if he tried to move off the screen or make an illegal - * diagonal move, and stop him if he did. - */ - if (nh.x < 0 || nh.x >= NUMCOLS || nh.y <= 0 || nh.y >= NUMLINES - 1) - goto hit_bound; - if (!diag_ok(&hero, &nh)) - { - after = FALSE; - running = FALSE; - return; - } - if (running && ce(hero, nh)) - after = running = FALSE; - fl = flat(nh.y, nh.x); - ch = winat(nh.y, nh.x); - if (!(fl & F_REAL) && ch == FLOOR) - { - if (!on(player, ISLEVIT)) - { - chat(nh.y, nh.x) = ch = TRAP; - flat(nh.y, nh.x) |= F_REAL; - } - } - else if (on(player, ISHELD) && ch != 'F') - { - msg(rs,"you are being held"); - return; - } - switch (ch) - { - case ' ': - case '|': - case '-': -hit_bound: - if (passgo && running && (proom->r_flags & ISGONE) - && !on(player, ISBLIND)) - { - bool b1, b2; - - switch (runch) - { - case 'h': - case 'l': - b1 = (bool)(hero.y != 1 && turn_ok(hero.y - 1, hero.x)); - b2 = (bool)(hero.y != NUMLINES - 2 && turn_ok(hero.y + 1, hero.x)); - if (!(b1 ^ b2)) - break; - if (b1) - { - runch = 'k'; - dy = -1; - } - else - { - runch = 'j'; - dy = 1; - } - dx = 0; - turnref(); - goto over; - case 'j': - case 'k': - b1 = (bool)(hero.x != 0 && turn_ok(hero.y, hero.x - 1)); - b2 = (bool)(hero.x != NUMCOLS - 1 && turn_ok(hero.y, hero.x + 1)); - if (!(b1 ^ b2)) - break; - if (b1) - { - runch = 'h'; - dx = -1; - } - else - { - runch = 'l'; - dx = 1; - } - dy = 0; - turnref(); - goto over; - } - } - running = FALSE; - after = FALSE; - break; - case DOOR: - running = FALSE; - if (flat(hero.y, hero.x) & F_PASS) - enter_room(rs,&nh); - goto move_stuff; - case TRAP: - ch = be_trapped(rs,&nh); - if (ch == T_DOOR || ch == T_TELEP) - return; - goto move_stuff; - case PASSAGE: - /* - * when you're in a corridor, you don't know if you're in - * a maze room or not, and there ain't no way to find out - * if you're leaving a maze room, so it is necessary to - * always recalculate proom. - */ - proom = roomin(rs,&hero); - goto move_stuff; - case FLOOR: - if (!(fl & F_REAL)) - be_trapped(rs,&hero); - goto move_stuff; - case STAIRS: - seenstairs = TRUE; - /* FALLTHROUGH */ - default: - running = FALSE; - if (isupper(ch) || moat(nh.y, nh.x)) - fight(rs,&nh, cur_weapon, FALSE); - else - { - if (ch != STAIRS) - take = ch; -move_stuff: - mvaddch(hero.y, hero.x, floor_at()); - if ((fl & F_PASS) && chat(oldpos.y, oldpos.x) == DOOR) - leave_room(rs,&nh); - hero = nh; - } - } -} - -/* - * turn_ok: - * Decide whether it is legal to turn onto the given space - */ -bool -turn_ok(int y, int x) -{ - PLACE *pp; - - pp = INDEX(y, x); - return (pp->p_ch == DOOR - || (pp->p_flags & (F_REAL|F_PASS)) == (F_REAL|F_PASS)); -} - -/* - * turnref: - * Decide whether to refresh at a passage turning or not - */ - -void -turnref() -{ - PLACE *pp; - - pp = INDEX(hero.y, hero.x); - if (!(pp->p_flags & F_SEEN)) - { - if (jump) - { - leaveok(stdscr, TRUE); - if ( globalR.sleeptime != 0 ) - refresh(); - leaveok(stdscr, FALSE); - } - pp->p_flags |= F_SEEN; - } -} - -/* - * door_open: - * Called to illuminate a room. If it is dark, remove anything - * that might move. - */ - -void -door_open(struct rogue_state *rs,struct room *rp) -{ - int y, x; - - if (!(rp->r_flags & ISGONE)) - for (y = rp->r_pos.y; y < rp->r_pos.y + rp->r_max.y; y++) - for (x = rp->r_pos.x; x < rp->r_pos.x + rp->r_max.x; x++) - if (isupper(winat(y, x))) - wake_monster(rs,y, x); -} - -/* - * be_trapped: - * The guy stepped on a trap.... Make him pay. - */ -char -be_trapped(struct rogue_state *rs,coord *tc) -{ - PLACE *pp; - THING *arrow; - char tr; - - if (on(player, ISLEVIT)) - return T_RUST; /* anything that's not a door or teleport */ - running = FALSE; - count = FALSE; - pp = INDEX(tc->y, tc->x); - pp->p_ch = TRAP; - tr = pp->p_flags & F_TMASK; - pp->p_flags |= F_SEEN; - switch (tr) - { - case T_DOOR: - level++; - new_level(rs); - msg(rs,"you fell into a trap!"); - when T_BEAR: - no_move += BEARTIME; - msg(rs,"you are caught in a bear trap"); - when T_MYST: - switch(rnd(11)) - { - case 0: msg(rs,"you are suddenly in a parallel dimension"); - when 1: msg(rs,"the light in here suddenly seems %s", rainbow[rnd(cNCOLORS)]); - when 2: msg(rs,"you feel a sting in the side of your neck"); - when 3: msg(rs,"multi-colored lines swirl around you, then fade"); - when 4: msg(rs,"a %s light flashes in your eyes", rainbow[rnd(cNCOLORS)]); - when 5: msg(rs,"a spike shoots past your ear!"); - when 6: msg(rs,"%s sparks dance across your armor", rainbow[rnd(cNCOLORS)]); - when 7: msg(rs,"you suddenly feel very thirsty"); - when 8: msg(rs,"you feel time speed up suddenly"); - when 9: msg(rs,"time now seems to be going slower"); - when 10: msg(rs,"you pack turns %s!", rainbow[rnd(cNCOLORS)]); - } - when T_SLEEP: - no_command += SLEEPTIME; - player.t_flags &= ~ISRUN; - msg(rs,"a strange white mist envelops you and you fall asleep"); - when T_ARROW: - if (swing(pstats.s_lvl - 1, pstats.s_arm, 1)) - { - pstats.s_hpt -= roll(1, 6); - if (pstats.s_hpt <= 0) - { - msg(rs,"an arrow killed you"); - death(rs,'a'); - } - else - msg(rs,"oh no! An arrow shot you"); - } - else - { - arrow = new_item(); - init_weapon(arrow, ARROW); - arrow->o_count = 1; - arrow->o_pos = hero; - fall(rs,arrow, FALSE); - msg(rs,"an arrow shoots past you"); - } - when T_TELEP: - /* - * since the hero's leaving, look() won't put a TRAP - * down for us, so we have to do it ourself - */ - teleport(rs); - mvaddch(tc->y, tc->x, TRAP); - when T_DART: - if (!swing(pstats.s_lvl+1, pstats.s_arm, 1)) - msg(rs,"a small dart whizzes by your ear and vanishes"); - else - { - pstats.s_hpt -= roll(1, 4); - if (pstats.s_hpt <= 0) - { - msg(rs,"a poisoned dart killed you"); - death(rs,'d'); - } - if (!ISWEARING(R_SUSTSTR) && !save(VS_POISON)) - chg_str(-1); - msg(rs,"a small dart just hit you in the shoulder"); - } - when T_RUST: - msg(rs,"a gush of water hits you on the head"); - rust_armor(rs,cur_armor); - } - flush_type(); - return tr; -} - -/* - * rndmove: - * Move in a random direction if the monster/person is confused - */ -coord * -rndmove(THING *who) -{ - THING *obj; - int x, y; - char ch; - static coord ret; /* what we will be returning */ - - y = ret.y = who->t_pos.y + rnd(3) - 1; - x = ret.x = who->t_pos.x + rnd(3) - 1; - /* - * Now check to see if that's a legal move. If not, don't move. - * (I.e., bump into the wall or whatever) - */ - if (y == who->t_pos.y && x == who->t_pos.x) - return &ret; - if (!diag_ok(&who->t_pos, &ret)) - goto bad; - else - { - ch = winat(y, x); - if (!step_ok(ch)) - goto bad; - if (ch == SCROLL) - { - for (obj = lvl_obj; obj != NULL; obj = next(obj)) - if (y == obj->o_pos.y && x == obj->o_pos.x) - break; - if (obj != NULL && obj->o_which == S_SCARE) - goto bad; - } - } - return &ret; - -bad: - ret = who->t_pos; - return &ret; -} - -/* - * rust_armor: - * Rust the given armor, if it is a legal kind to rust, and we - * aren't wearing a magic ring. - */ - -void -rust_armor(struct rogue_state *rs,THING *arm) -{ - if (arm == NULL || arm->o_type != ARMOR || arm->o_which == LEATHER || - arm->o_arm >= 9) - return; - - if ((arm->o_flags & ISPROT) || ISWEARING(R_SUSTARM)) - { - if (!to_death) - msg(rs,"the rust vanishes instantly"); - } - else - { - arm->o_arm++; - if (!terse) - msg(rs,"your armor appears to be weaker now. Oh my!"); - else - msg(rs,"your armor weakens"); - } -} diff --git a/src/cc/rogue/new_level.c b/src/cc/rogue/new_level.c deleted file mode 100644 index 3acc57622..000000000 --- a/src/cc/rogue/new_level.c +++ /dev/null @@ -1,247 +0,0 @@ -// Copyright (c) 2016-2023 The Hush developers -// Distributed under the GPLv3 software license, see the accompanying -// file COPYING or https://www.gnu.org/licenses/gpl-3.0.en.html -/* - * new_level: - * Dig and draw a new level - * - * @(#)new_level.c 4.38 (Berkeley) 02/05/99 - * - * Rogue: Exploring the Dungeons of Doom - * Copyright (C) 1980-1983, 1985, 1999 Michael Toy, Ken Arnold and Glenn Wichman - * All rights reserved. - * - * See the file LICENSE.TXT for full copyright and licensing information. - */ - -//#include -//#include -#include "rogue.h" - -#define TREAS_ROOM 20 /* one chance in TREAS_ROOM for a treasure room */ -#define MAXTREAS 10 /* maximum number of treasures in a treasure room */ -#define MINTREAS 2 /* minimum number of treasures in a treasure room */ - -void -new_level(struct rogue_state *rs) -{ - THING *tp; - PLACE *pp; - char *sp; - int i; - if ( 0 ) - { - static FILE *fp; - if ( fp == 0 ) - fp = fopen("debug","wb"); - if ( fp != 0 ) - { - fprintf(fp,"newlevel seed.%llu\n",(long long)seed); - fflush(fp); - } - } - player.t_flags &= ~ISHELD; /* unhold when you go down just in case */ - if (level > max_level) - max_level = level; - /* - * Clean things off from last level - */ - for (pp = places; pp < &places[MAXCOLS*MAXLINES]; pp++) - { - pp->p_ch = ' '; - pp->p_flags = F_REAL; - pp->p_monst = NULL; - } - clear(); - /* - * Free up the monsters on the last level - */ - for (tp = mlist; tp != NULL; tp = next(tp)) - free_list(tp->t_pack); - free_list(mlist); - /* - * Throw away stuff left on the previous level (if anything) - */ - free_list(lvl_obj); - do_rooms(rs); /* Draw rooms */ - do_passages(rs); /* Draw passages */ - no_food++; - //fprintf(stderr,"new_level.%d\n",level); - put_things(rs); /* Place objects (if any) */ - /* - * Place the traps - */ - if (rnd(10) < level) - { - ntraps = rnd(level / 4) + 1; - if (ntraps > MAXTRAPS) - ntraps = MAXTRAPS; - i = ntraps; - while (i--) - { - /* - * not only wouldn't it be NICE to have traps in mazes - * (not that we care about being nice), since the trap - * number is stored where the passage number is, we - * can't actually do it. - */ - do - { - find_floor(rs,(struct room *) NULL, &stairs, FALSE, FALSE); - } while (chat(stairs.y, stairs.x) != FLOOR); - sp = &flat(stairs.y, stairs.x); - *sp &= ~F_REAL; - *sp |= rnd(NTRAPS); - } - } - /* - * Place the staircase down. - */ - find_floor(rs,(struct room *) NULL, &stairs, FALSE, FALSE); - chat(stairs.y, stairs.x) = STAIRS; - seenstairs = FALSE; - - for (tp = mlist; tp != NULL; tp = next(tp)) - tp->t_room = roomin(rs,&tp->t_pos); - - find_floor(rs,(struct room *) NULL, &hero, FALSE, TRUE); - enter_room(rs,&hero); - mvaddch(hero.y, hero.x, PLAYER); - if (on(player, SEEMONST)) - turn_see(rs,FALSE); - if (on(player, ISHALU)) - visuals(rs,0); -} - -/* - * rnd_room: - * Pick a room that is really there - */ -int -rnd_room() -{ - int rm; - - do - { - rm = rnd(MAXROOMS); - } while (rooms[rm].r_flags & ISGONE); - return rm; -} - -/* - * put_things: - * Put potions and scrolls on this level - */ - -void -put_things(struct rogue_state *rs) -{ - int i; - THING *obj; - - /* - * Once you have found the amulet, the only way to get new stuff is - * go down into the dungeon. - */ - if (amulet && level < max_level) - return; - /* - * check for treasure rooms, and if so, put it in. - */ - if (rnd(TREAS_ROOM) == 0) - treas_room(rs); - /* - * Do MAXOBJ attempts to put things on a level - */ - for (i = 0; i < MAXOBJ; i++) - if (rnd(100) < 36) - { - /* - * Pick a new object and link it in the list - */ - obj = new_thing(rs); - //fprintf(stderr,"put_things i.%d obj.%p\n",i,obj); - attach(lvl_obj, obj); - /* - * Put it somewhere - */ - find_floor(rs,(struct room *) NULL, &obj->o_pos, FALSE, FALSE); - chat(obj->o_pos.y, obj->o_pos.x) = (char) obj->o_type; - } - /* - * If he is really deep in the dungeon and he hasn't found the - * amulet yet, put it somewhere on the ground - */ - if (level >= AMULETLEVEL && !amulet) - { - obj = new_item(); - attach(lvl_obj, obj); - obj->o_hplus = 0; - obj->o_dplus = 0; - strncpy(obj->o_damage,"0x0",sizeof(obj->o_damage)); - strncpy(obj->o_hurldmg,"0x0",sizeof(obj->o_hurldmg)); - obj->o_arm = 11; - obj->o_type = AMULET; - /* - * Put it somewhere - */ - find_floor(rs,(struct room *) NULL, &obj->o_pos, FALSE, FALSE); - chat(obj->o_pos.y, obj->o_pos.x) = AMULET; - } -} - -/* - * treas_room: - * Add a treasure room - */ -#define MAXTRIES 10 /* max number of tries to put down a monster */ - - -void -treas_room(struct rogue_state *rs) -{ - int nm; - THING *tp; - struct room *rp; - int spots, num_monst; - static coord mp; - - rp = &rooms[rnd_room()]; - spots = (rp->r_max.y - 2) * (rp->r_max.x - 2) - MINTREAS; - if (spots > (MAXTREAS - MINTREAS)) - spots = (MAXTREAS - MINTREAS); - num_monst = nm = rnd(spots) + MINTREAS; - while (nm--) - { - find_floor(rs,rp, &mp, 2 * MAXTRIES, FALSE); - //fprintf(stderr,"treas_room\n"); - tp = new_thing(rs); - tp->o_pos = mp; - attach(lvl_obj, tp); - chat(mp.y, mp.x) = (char) tp->o_type; - } - - /* - * fill up room with monsters from the next level down - */ - - if ((nm = rnd(spots) + MINTREAS) < num_monst + 2) - nm = num_monst + 2; - spots = (rp->r_max.y - 2) * (rp->r_max.x - 2); - if (nm > spots) - nm = spots; - level++; - while (nm--) - { - spots = 0; - if (find_floor(rs,rp, &mp, MAXTRIES, TRUE)) - { - tp = new_item(); - new_monster(rs,tp, randmonster(FALSE), &mp); - tp->t_flags |= ISMEAN; /* no sloughers in THIS room */ - give_pack(rs,tp); - } - } - level--; -} diff --git a/src/cc/rogue/options.c b/src/cc/rogue/options.c deleted file mode 100644 index a90edc149..000000000 --- a/src/cc/rogue/options.c +++ /dev/null @@ -1,504 +0,0 @@ -// Copyright (c) 2016-2023 The Hush developers -// Distributed under the GPLv3 software license, see the accompanying -// file COPYING or https://www.gnu.org/licenses/gpl-3.0.en.html -/* - * This file has all the code for the option command. I would rather - * this command were not necessary, but it is the only way to keep the - * wolves off of my back. - * - * @(#)options.c 4.24 (Berkeley) 05/10/83 - * - * Rogue: Exploring the Dungeons of Doom - * Copyright (C) 1980-1983, 1985, 1999 Michael Toy, Ken Arnold and Glenn Wichman - * All rights reserved. - * - * See the file LICENSE.TXT for full copyright and licensing information. - */ - -//#include -//#include -//#include -//#include -#include "rogue.h" - -#define EQSTR(a, b, c) (strncmp(a, b, c) == 0) - -#define NUM_OPTS (sizeof optlist / sizeof (OPTION)) - -/* - * description of an option and what to do with it - */ -struct optstruct { - char *o_name; /* option name */ - char *o_prompt; /* prompt for interactive entry */ - void *o_opt; /* pointer to thing to set */ - /* function to print value */ - void (*o_putfunc)(void *opt); - /* function to get value interactively */ - int (*o_getfunc)(struct rogue_state *rs,void *opt, WINDOW *win); -}; - -typedef struct optstruct OPTION; - -void pr_optname(OPTION *op); - -OPTION optlist[] = { - {"terse", "Terse output", - &terse, put_bool, get_bool }, - {"flush", "Flush typeahead during battle", - &fight_flush, put_bool, get_bool }, - {"jump", "Show position only at end of run", - &jump, put_bool, get_bool }, - {"seefloor", "Show the lamp-illuminated floor", - &see_floor, put_bool, get_sf }, - {"passgo", "Follow turnings in passageways", - &passgo, put_bool, get_bool }, - {"tombstone", "Print out tombstone when killed", - &tombstone, put_bool, get_bool }, - {"inven", "Inventory style", - &inv_type, put_inv_t, get_inv_t }, - {"name", "Name", - whoami, put_str, get_str }, - {"fruit", "Fruit", - fruit, put_str, get_str }, - {"file", "Save file", - file_name, put_str, get_str } -}; - -/* - * option: - * Print and then set options from the terminal - */ - -void -option(struct rogue_state *rs) -{ - OPTION *op; - int retval; - - wclear(hw); - /* - * Display current values of options - */ - for (op = optlist; op <= &optlist[NUM_OPTS-1]; op++) - { - pr_optname(op); - (*op->o_putfunc)(op->o_opt); - waddch(hw, '\n'); - } - /* - * Set values - */ - wmove(hw, 0, 0); - for (op = optlist; op <= &optlist[NUM_OPTS-1]; op++) - { - pr_optname(op); - retval = (*op->o_getfunc)(rs,op->o_opt, hw); - if (retval) - { - if (retval == QUIT) - break; - else if (op > optlist) { /* MINUS */ - wmove(hw, (int)(op - optlist) - 1, 0); - op -= 2; - } - else /* trying to back up beyond the top */ - { - putchar('\007'); - wmove(hw, 0, 0); - op--; - } - } - } - /* - * Switch back to original screen - */ - wmove(hw, LINES - 1, 0); - waddstr(hw, "--Press space to continue--"); - wrefresh(hw); - wait_for(rs,' '); - clearok(curscr, TRUE); - touchwin(stdscr); - after = FALSE; -} - -/* - * pr_optname: - * Print out the option name prompt - */ - -void -pr_optname(OPTION *op) -{ - wprintw(hw, "%s (\"%s\"): ", op->o_prompt, op->o_name); -} - -/* - * put_bool - * Put out a boolean - */ - -void -put_bool(void *b) -{ - waddstr(hw, *(bool *) b ? "True" : "False"); -} - -/* - * put_str: - * Put out a string - */ - -void -put_str(void *str) -{ - waddstr(hw, (char *) str); -} - -/* - * put_inv_t: - * Put out an inventory type - */ - -void -put_inv_t(void *ip) -{ - waddstr(hw, inv_t_name[*(int *) ip]); -} - -/* - * get_bool: - * Allow changing a boolean option and print it out - */ -int -get_bool(struct rogue_state *rs,void *vp, WINDOW *win) -{ - bool *bp = (bool *) vp; - int oy, ox; - bool op_bad; - - op_bad = TRUE; - getyx(win, oy, ox); - waddstr(win, *bp ? "True" : "False"); - while (op_bad) - { - wmove(win, oy, ox); - wrefresh(win); - switch (readchar(rs)) - { - case 't': - case 'T': - *bp = TRUE; - op_bad = FALSE; - break; - case 'f': - case 'F': - *bp = FALSE; - op_bad = FALSE; - break; - case '\n': - case '\r': - op_bad = FALSE; - break; - case ESCAPE: - return QUIT; - case '-': - return MINUS; - default: - wmove(win, oy, ox + 10); - waddstr(win, "(T or F)"); - } - } - wmove(win, oy, ox); - waddstr(win, *bp ? "True" : "False"); - waddch(win, '\n'); - return NORM; -} - -/* - * get_sf: - * Change value and handle transition problems from see_floor to - * !see_floor. - */ -int -get_sf(struct rogue_state *rs,void *vp, WINDOW *win) -{ - bool *bp = (bool *) vp; - bool was_sf; - int retval; - - was_sf = see_floor; - retval = get_bool(rs,bp, win); - if (retval == QUIT) return(QUIT); - if (was_sf != see_floor) - { - if (!see_floor) { - see_floor = TRUE; - erase_lamp(&hero, proom); - see_floor = FALSE; - } - else - look(rs,FALSE); - } - return(NORM); -} - -/* - * get_str: - * Set a string option - */ -#define MAXINP 50 /* max string to read from terminal or environment */ - -int -get_str(struct rogue_state *rs,void *vopt, WINDOW *win) -{ - char *opt = (char *) vopt; - char *sp; - int oy, ox; - int i; - signed char c; - static char buf[MAXSTR]; - - getyx(win, oy, ox); - wrefresh(win); - /* - * loop reading in the string, and put it in a temporary buffer - */ - for (sp = buf; (c = readchar(rs)) != '\n' && c != '\r' && c != ESCAPE; - wclrtoeol(win), wrefresh(win)) - { - if (c == -1) - continue; - /*else if (c == erasechar()) // process erase character - { - if (sp > buf) - { - sp--; - for (i = (int) strlen(unctrl(*sp)); i; i--) - waddch(win, '\b'); - } - continue; - } - else if (c == killchar()) // process kill character - { - sp = buf; - wmove(win, oy, ox); - continue; - }*/ - else if (sp == buf) - { - if (c == '-' && win != stdscr) - break; - else if (c == '~') - { - strcpy(buf, home); - waddstr(win, home); - sp += strlen(home); - continue; - } - } - if (sp >= &buf[MAXINP] || !(isprint(c) || c == ' ')) - putchar(CTRL('G')); - else - { - *sp++ = c; - waddstr(win, unctrl(c)); - } - } - *sp = '\0'; - if (sp > buf) /* only change option if something has been typed */ - strucpy(opt, buf, (int) strlen(buf)); - mvwprintw(win, oy, ox, "%s\n", opt); - wrefresh(win); - if (win == stdscr) - mpos += (int)(sp - buf); - if (c == '-') - return MINUS; - else if (c == ESCAPE) - return QUIT; - else - return NORM; -} - -/* - * get_inv_t - * Get an inventory type name - */ -int -get_inv_t(struct rogue_state *rs,void *vp, WINDOW *win) -{ - int *ip = (int *) vp; - int oy, ox; - bool op_bad; - - op_bad = TRUE; - getyx(win, oy, ox); - waddstr(win, inv_t_name[*ip]); - while (op_bad) - { - wmove(win, oy, ox); - wrefresh(win); - switch (readchar(rs)) - { - case 'o': - case 'O': - *ip = INV_OVER; - op_bad = FALSE; - break; - case 's': - case 'S': - *ip = INV_SLOW; - op_bad = FALSE; - break; - case 'c': - case 'C': - *ip = INV_CLEAR; - op_bad = FALSE; - break; - case '\n': - case '\r': - op_bad = FALSE; - break; - case ESCAPE: - return QUIT; - case '-': - return MINUS; - default: - wmove(win, oy, ox + 15); - waddstr(win, "(O, S, or C)"); - } - } - mvwprintw(win, oy, ox, "%s\n", inv_t_name[*ip]); - return NORM; -} - - -#ifdef MASTER -/* - * get_num: - * Get a numeric option - */ -int -get_num(struct rogue_state *rs,void *vp, WINDOW *win) -{ - short *opt = (short *) vp; - int i; - static char buf[MAXSTR]; - - if ((i = get_str(rs,buf, win)) == NORM) - *opt = (short) atoi(buf); - return i; -} -#endif - -/* - * parse_opts: - * Parse options from string, usually taken from the environment. - * The string is a series of comma seperated values, with booleans - * being stated as "name" (true) or "noname" (false), and strings - * being "name=....", with the string being defined up to a comma - * or the end of the entire option string. - */ - -void -parse_opts(char *str) -{ - char *sp; - OPTION *op; - int len; - const char **i; - char *start; - - while (*str) - { - /* - * Get option name - */ - for (sp = str; isalpha(*sp); sp++) - continue; - len = (int)(sp - str); - /* - * Look it up and deal with it - */ - for (op = optlist; op <= &optlist[NUM_OPTS-1]; op++) - if (EQSTR(str, op->o_name, len)) - { - if (op->o_putfunc == put_bool) /* if option is a boolean */ - *(bool *)op->o_opt = TRUE; /* NOSTRICT */ - else /* string option */ - { - /* - * Skip to start of string value - */ - for (str = sp + 1; *str == '='; str++) - continue; - if (*str == '~') - { - strcpy((char *) op->o_opt, home); /* NOSTRICT */ - start = (char *) op->o_opt + strlen(home);/* NOSTRICT */ - while (*++str == '/') - continue; - } - else - start = (char *) op->o_opt; /* NOSTRICT */ - /* - * Skip to end of string value - */ - for (sp = str + 1; *sp && *sp != ','; sp++) - continue; - /* - * check for type of inventory - */ - if (op->o_putfunc == put_inv_t) - { - if (islower(*str)) - *str = (char) toupper(*str); - for (i = inv_t_name; i <= &inv_t_name[INV_CLEAR]; i++) - if (strncmp(str, *i, sp - str) == 0) - { - inv_type = (int)(i - inv_t_name); - break; - } - } - else - strucpy(start, str, (int)(sp - str)); - } - break; - } - /* - * check for "noname" for booleans - */ - else if (op->o_putfunc == put_bool - && EQSTR(str, "no", 2) && EQSTR(str + 2, op->o_name, len - 2)) - { - *(bool *)op->o_opt = FALSE; /* NOSTRICT */ - break; - } - - /* - * skip to start of next option name - */ - while (*sp && !isalpha(*sp)) - sp++; - str = sp; - } -} - -/* - * strucpy: - * Copy string using unctrl for things - */ - -void -strucpy(char *s1, char *s2, int len) -{ - if (len > MAXINP) - len = MAXINP; - while (len--) - { - if (isprint(*s2) || *s2 == ' ') - *s1++ = *s2; - s2++; - } - *s1 = '\0'; -} diff --git a/src/cc/rogue/pack.c b/src/cc/rogue/pack.c deleted file mode 100644 index 63c135f7a..000000000 --- a/src/cc/rogue/pack.c +++ /dev/null @@ -1,543 +0,0 @@ -// Copyright (c) 2016-2023 The Hush developers -// Distributed under the GPLv3 software license, see the accompanying -// file COPYING or https://www.gnu.org/licenses/gpl-3.0.en.html -/* - * Routines to deal with the pack - * - * @(#)pack.c 4.40 (Berkeley) 02/05/99 - * - * Rogue: Exploring the Dungeons of Doom - * Copyright (C) 1980-1983, 1985, 1999 Michael Toy, Ken Arnold and Glenn Wichman - * All rights reserved. - * - * See the file LICENSE.TXT for full copyright and licensing information. - */ - -//#include -//#include -//#include -#include "rogue.h" - -/* - * add_pack: - * Pick up an object and add it to the pack. If the argument is - * non-null use it as the linked_list pointer instead of gettting - * it off the ground. - */ - -void -add_pack(struct rogue_state *rs,THING *obj, bool silent) -{ - THING *op, *lp; - bool from_floor; - - from_floor = FALSE; - if (obj == NULL) - { - if ((obj = find_obj(rs,hero.y, hero.x)) == NULL) - return; - from_floor = TRUE; - } - - /* - * Check for and deal with scare monster scrolls - */ - if (obj->o_type == SCROLL && obj->o_which == S_SCARE) - if (obj->o_flags & ISFOUND) - { - detach(lvl_obj, obj); - mvaddch(hero.y, hero.x, floor_ch()); - chat(hero.y, hero.x) = (proom->r_flags & ISGONE) ? PASSAGE : FLOOR; - discard(obj); - msg(rs,"the scroll turns to dust as you pick it up"); - return; - } - - if (pack == NULL) - { - pack = obj; - obj->o_packch = pack_char(); - inpack++; - } - else - { - lp = NULL; - for (op = pack; op != NULL; op = next(op)) - { - if (op->o_type != obj->o_type) - lp = op; - else - { - while (op->o_type == obj->o_type && op->o_which != obj->o_which) - { - lp = op; - if (next(op) == NULL) - break; - else - op = next(op); - } - if (op->o_type == obj->o_type && op->o_which == obj->o_which) - { - if (ISMULT(op->o_type)) - { - if (!pack_room(rs,from_floor, obj)) - return; - op->o_count++; -dump_it: - discard(obj); - obj = op; - lp = NULL; - goto out; - } - else if (obj->o_group) - { - lp = op; - while (op->o_type == obj->o_type - && op->o_which == obj->o_which - && op->o_group != obj->o_group) - { - lp = op; - if (next(op) == NULL) - break; - else - op = next(op); - } - if (op->o_type == obj->o_type - && op->o_which == obj->o_which - && op->o_group == obj->o_group) - { - op->o_count += obj->o_count; - inpack--; - if (!pack_room(rs,from_floor, obj)) - return; - goto dump_it; - } - } - else - lp = op; - } -out: - break; - } - } - - if (lp != NULL) - { - if (!pack_room(rs,from_floor, obj)) - return; - else - { - obj->o_packch = pack_char(); - next(obj) = next(lp); - prev(obj) = lp; - if (next(lp) != NULL) - prev(next(lp)) = obj; - next(lp) = obj; - } - } - } - - obj->o_flags |= ISFOUND; - - /* - * If this was the object of something's desire, that monster will - * get mad and run at the hero. - */ - for (op = mlist; op != NULL; op = next(op)) - if (op->t_dest == &obj->o_pos) - op->t_dest = &hero; - - if (obj->o_type == AMULET) - amulet = TRUE; - /* - * Notify the user - */ - if (!silent) - { - if (!terse) - addmsg(rs,"you now have "); - msg(rs,"%s (%c)", inv_name(obj, !terse), obj->o_packch); - } -} - -int32_t num_packitems(struct rogue_state *rs) -{ - THING *list = pack; - int32_t type = 0,n = 0,total = 0; - for (; list != NULL; list = next(list)) - { - if ( thing_find(list) < 0 ) - { - fprintf(stderr,"num_packitems cant find %p\n",list); - return(-1); - } - if ( list->o_packch != 0 ) - { - n++; - total += rogue_total(list); - } - } - if ( rs->guiflag != 0 ) - { - char str[MAXSTR]; - sprintf(str,"strength*2 %d vs total.%d vs %d inventory letters\n",ROGUE_MAXTOTAL,total,n); - add_line(rs,"%s",str); - } - if ( total > ROGUE_MAXTOTAL ) - return(MAXPACK); - return(n); -} - -/* - * pack_room: - * See if there's room in the pack. If not, print out an - * appropriate message - */ -bool pack_room(struct rogue_state *rs,bool from_floor, THING *obj) -{ - inpack = num_packitems(rs); - if ( ++inpack > MAXPACK ) - { - if (!terse) - addmsg(rs,"there's "); - addmsg(rs,"no room"); - if (!terse) - addmsg(rs," in your pack"); - endmsg(rs); - if (from_floor) - move_msg(rs,obj); - inpack = MAXPACK; - return FALSE; - } - //fprintf(stderr,"inpack.%d vs MAX.%d\n",inpack,MAXPACK), sleep(2); - if ( from_floor != 0 ) - { - detach(lvl_obj, obj); - mvaddch(hero.y, hero.x, floor_ch()); - chat(hero.y, hero.x) = (proom->r_flags & ISGONE) ? PASSAGE : FLOOR; - } - return TRUE; -} - -/* - * leave_pack: - * take an item out of the pack - */ -THING * -leave_pack(struct rogue_state *rs,THING *obj, bool newobj, bool all) -{ - THING *nobj; - - inpack--; - nobj = obj; - if (obj->o_count > 1 && !all) - { - last_pick = obj; - obj->o_count--; - if (obj->o_group) - inpack++; - if (newobj) - { - nobj = new_item(); - *nobj = *obj; - next(nobj) = NULL; - prev(nobj) = NULL; - nobj->o_count = 1; - } - } - else - { - last_pick = NULL; - pack_used[obj->o_packch - 'a'] = FALSE; - detach(pack, obj); - } - return nobj; -} - -/* - * pack_char: - * Return the next unused pack character. - */ -char -pack_char() -{ - bool *bp; - - for (bp = pack_used; *bp; bp++) - continue; - *bp = TRUE; - return (char)((int)(bp - pack_used) + 'a'); -} - -/* - * inventory: - * List what is in the pack. Return TRUE if there is something of - * the given type. - */ - - -bool -inventory(struct rogue_state *rs,THING *list, int type) -{ - char inv_temp[MAXSTR]; - - n_objs = 0; - for (; list != NULL; list = next(list)) - { - if (type && type != list->o_type && !(type == CALLABLE && - list->o_type != FOOD && list->o_type != AMULET) && - !(type == R_OR_S && (list->o_type == RING || list->o_type == STICK))) - continue; - n_objs++; -#ifdef MASTER - if (!list->o_packch) - strcpy(inv_temp, "%s"); - else -#endif - sprintf(inv_temp, "%c) %%s", list->o_packch); - msg_esc = TRUE; - if (add_line(rs,inv_temp, inv_name(list, FALSE)) == ESCAPE) - { - msg_esc = FALSE; - msg(rs,""); - return TRUE; - } - msg_esc = FALSE; - } - //if ( n_objs != inpack ) - // fprintf(stderr,"n_objs.%d vs inpack.%d\n",n_objs,inpack), sleep(2); - if (n_objs == 0) - { - if (terse) - msg(rs,type == 0 ? (char *)"empty handed" : (char *)"nothing appropriate"); - else - msg(rs,type == 0 ? (char *)"you are empty handed" : (char *)"you don't have anything appropriate"); - return FALSE; - } - end_line(rs); - return TRUE; -} - -/* - * pick_up: - * Add something to characters pack. - */ - -void -pick_up(struct rogue_state *rs,char ch) -{ - THING *obj; - - if (on(player, ISLEVIT)) - return; - - obj = find_obj(rs,hero.y, hero.x); - if (move_on) - move_msg(rs,obj); - else - switch (ch) - { - case GOLD: - if (obj == NULL) - return; - money(rs,obj->o_goldval); - detach(lvl_obj, obj); - discard(obj); - proom->r_goldval = 0; - break; - default: -#ifdef MASTER - debug("Where did you pick a '%s' up???", unctrl(ch)); -#endif - case ARMOR: - case POTION: - case FOOD: - case WEAPON: - case SCROLL: - case AMULET: - case RING: - case STICK: - add_pack(rs,(THING *) NULL, FALSE); - break; - } -} - -/* - * move_msg: - * Print out the message if you are just moving onto an object - */ - -void -move_msg(struct rogue_state *rs,THING *obj) -{ - if (!terse) - addmsg(rs,"you "); - msg(rs,"moved onto %s", inv_name(obj, TRUE)); -} - -/* - * picky_inven: - * Allow player to inventory a single item - */ - -void -picky_inven(struct rogue_state *rs) -{ - THING *obj; - char mch; - - if (pack == NULL) - msg(rs,"you aren't carrying anything"); - else if (next(pack) == NULL) - msg(rs,"a) %s", inv_name(pack, FALSE)); - else - { - msg(rs,terse ? (char *)"item: " : (char *)"which item do you wish to inventory: "); - mpos = 0; - if ((mch = readchar(rs)) == ESCAPE) - { - msg(rs,""); - return; - } - for (obj = pack; obj != NULL; obj = next(obj)) - if (mch == obj->o_packch) - { - msg(rs,"%c) %s", mch, inv_name(obj, FALSE)); - return; - } - msg(rs,"'%s' not in pack", unctrl(mch)); - } -} - -/* - * get_item: - * Pick something out of a pack for a purpose - */ -THING * -get_item(struct rogue_state *rs,char *purpose, int type) -{ - THING *obj; - char ch; - - if (pack == NULL) - msg(rs,"you aren't carrying anything"); - else if (again) - if (last_pick) - return last_pick; - else - msg(rs,"you ran out"); - else - { - for (;;) - { - if ( rs->replaydone != 0 ) - return(NULL); - if (!terse) - addmsg(rs,"which object do you want to "); - addmsg(rs,purpose); - if (terse) - addmsg(rs," what"); - msg(rs,"? (* for list): "); - ch = readchar(rs); - mpos = 0; - /* - * Give the poor player a chance to abort the command - */ - if (ch == ESCAPE) - { - reset_last(); - after = FALSE; - msg(rs,""); - return NULL; - } - n_objs = 1; /* normal case: person types one char */ - if (ch == '*') - { - mpos = 0; - if (inventory(rs,pack, type) == 0) - { - after = FALSE; - return NULL; - } - continue; - } - for (obj = pack; obj != NULL; obj = next(obj)) - if (obj->o_packch == ch) - break; - if (obj == NULL) - { - //msg(rs,"'%s' is not a valid item",unctrl(ch)); - //continue; - reset_last(); - after = FALSE; - msg(rs,"'%s' is not a valid item",unctrl(ch)); - return NULL; - } - else - { - return obj; - } - } - } - return NULL; -} - -/* - * money: - * Add or subtract gold from the pack - */ - -void -money(struct rogue_state *rs,int value) -{ - purse += value; - mvaddch(hero.y, hero.x, floor_ch()); - chat(hero.y, hero.x) = (proom->r_flags & ISGONE) ? PASSAGE : FLOOR; - if (value > 0) - { - if (!terse) - addmsg(rs,"you found "); - msg(rs,"%d gold pieces", value); - } -} - -/* - * floor_ch: - * Return the appropriate floor character for her room - */ -char -floor_ch() -{ - if (proom->r_flags & ISGONE) - return PASSAGE; - return (show_floor() ? FLOOR : ' '); -} - -/* - * floor_at: - * Return the character at hero's position, taking see_floor - * into account - */ -char -floor_at() -{ - char ch; - - ch = chat(hero.y, hero.x); - if (ch == FLOOR) - ch = floor_ch(); - return ch; -} - -/* - * reset_last: - * Reset the last command when the current one is aborted - */ - -void -reset_last() -{ - last_comm = l_last_comm; - last_dir = l_last_dir; - last_pick = l_last_pick; -} diff --git a/src/cc/rogue/passages.c b/src/cc/rogue/passages.c deleted file mode 100644 index 4bba3f2d7..000000000 --- a/src/cc/rogue/passages.c +++ /dev/null @@ -1,427 +0,0 @@ -// Copyright (c) 2016-2023 The Hush developers -// Distributed under the GPLv3 software license, see the accompanying -// file COPYING or https://www.gnu.org/licenses/gpl-3.0.en.html -/* - * Draw the connecting passages - * - * @(#)passages.c 4.22 (Berkeley) 02/05/99 - * - * Rogue: Exploring the Dungeons of Doom - * Copyright (C) 1980-1983, 1985, 1999 Michael Toy, Ken Arnold and Glenn Wichman - * All rights reserved. - * - * See the file LICENSE.TXT for full copyright and licensing information. - */ - -//#include -//#include -#include "rogue.h" - -/* - * do_passages: - * Draw all the passages on a level. - */ - -void -do_passages(struct rogue_state *rs) -{ - struct rdes *r1, *r2 = NULL; - int i, j; - int roomcount; - static struct rdes - { - bool conn[MAXROOMS]; /* possible to connect to room i? */ - bool isconn[MAXROOMS]; /* connection been made to room i? */ - bool ingraph; /* this room in graph already? */ - } rdes[MAXROOMS] = { - { { 0, 1, 0, 1, 0, 0, 0, 0, 0 }, { 0, 0, 0, 0, 0, 0, 0, 0, 0 }, 0 }, - { { 1, 0, 1, 0, 1, 0, 0, 0, 0 }, { 0, 0, 0, 0, 0, 0, 0, 0, 0 }, 0 }, - { { 0, 1, 0, 0, 0, 1, 0, 0, 0 }, { 0, 0, 0, 0, 0, 0, 0, 0, 0 }, 0 }, - { { 1, 0, 0, 0, 1, 0, 1, 0, 0 }, { 0, 0, 0, 0, 0, 0, 0, 0, 0 }, 0 }, - { { 0, 1, 0, 1, 0, 1, 0, 1, 0 }, { 0, 0, 0, 0, 0, 0, 0, 0, 0 }, 0 }, - { { 0, 0, 1, 0, 1, 0, 0, 0, 1 }, { 0, 0, 0, 0, 0, 0, 0, 0, 0 }, 0 }, - { { 0, 0, 0, 1, 0, 0, 0, 1, 0 }, { 0, 0, 0, 0, 0, 0, 0, 0, 0 }, 0 }, - { { 0, 0, 0, 0, 1, 0, 1, 0, 1 }, { 0, 0, 0, 0, 0, 0, 0, 0, 0 }, 0 }, - { { 0, 0, 0, 0, 0, 1, 0, 1, 0 }, { 0, 0, 0, 0, 0, 0, 0, 0, 0 }, 0 }, - }; - - /* - * reinitialize room graph description - */ - for (r1 = rdes; r1 <= &rdes[MAXROOMS-1]; r1++) - { - for (j = 0; j < MAXROOMS; j++) - r1->isconn[j] = FALSE; - r1->ingraph = FALSE; - } - - /* - * starting with one room, connect it to a random adjacent room and - * then pick a new room to start with. - */ - roomcount = 1; - r1 = &rdes[rnd(MAXROOMS)]; - r1->ingraph = TRUE; - do - { - /* - * find a room to connect with - */ - j = 0; - for (i = 0; i < MAXROOMS; i++) - if (r1->conn[i] && !rdes[i].ingraph && rnd(++j) == 0) - r2 = &rdes[i]; - /* - * if no adjacent rooms are outside the graph, pick a new room - * to look from - */ - if (j == 0) - { - do - r1 = &rdes[rnd(MAXROOMS)]; - until (r1->ingraph); - } - /* - * otherwise, connect new room to the graph, and draw a tunnel - * to it - */ - else - { - r2->ingraph = TRUE; - i = (int)(r1 - rdes); - j = (int)(r2 - rdes); - conn(rs,i, j); - r1->isconn[j] = TRUE; - r2->isconn[i] = TRUE; - roomcount++; - } - } while (roomcount < MAXROOMS); - - /* - * attempt to add passages to the graph a random number of times so - * that there isn't always just one unique passage through it. - */ - for (roomcount = rnd(5); roomcount > 0; roomcount--) - { - r1 = &rdes[rnd(MAXROOMS)]; /* a random room to look from */ - /* - * find an adjacent room not already connected - */ - j = 0; - for (i = 0; i < MAXROOMS; i++) - if (r1->conn[i] && !r1->isconn[i] && rnd(++j) == 0) - r2 = &rdes[i]; - /* - * if there is one, connect it and look for the next added - * passage - */ - if (j != 0) - { - i = (int)(r1 - rdes); - j = (int)(r2 - rdes); - conn(rs,i, j); - r1->isconn[j] = TRUE; - r2->isconn[i] = TRUE; - } - } - passnum(); -} - -/* - * conn: - * Draw a corridor from a room in a certain direction. - */ - -void -conn(struct rogue_state *rs,int r1, int r2) -{ - struct room *rpf, *rpt = NULL; - int rmt; - int distance = 0, turn_spot, turn_distance = 0; - int rm; - char direc; - static coord del, curr, turn_delta, spos, epos; - - if (r1 < r2) - { - rm = r1; - if (r1 + 1 == r2) - direc = 'r'; - else - direc = 'd'; - } - else - { - rm = r2; - if (r2 + 1 == r1) - direc = 'r'; - else - direc = 'd'; - } - rpf = &rooms[rm]; - /* - * Set up the movement variables, in two cases: - * first drawing one down. - */ - if (direc == 'd') - { - rmt = rm + 3; /* room # of dest */ - rpt = &rooms[rmt]; /* room pointer of dest */ - del.x = 0; /* direction of move */ - del.y = 1; - spos.x = rpf->r_pos.x; /* start of move */ - spos.y = rpf->r_pos.y; - epos.x = rpt->r_pos.x; /* end of move */ - epos.y = rpt->r_pos.y; - if (!(rpf->r_flags & ISGONE)) /* if not gone pick door pos */ - do - { - spos.x = rpf->r_pos.x + rnd(rpf->r_max.x - 2) + 1; - spos.y = rpf->r_pos.y + rpf->r_max.y - 1; - } while ((rpf->r_flags&ISMAZE) && !(flat(spos.y, spos.x)&F_PASS)); - if (!(rpt->r_flags & ISGONE)) - do - { - epos.x = rpt->r_pos.x + rnd(rpt->r_max.x - 2) + 1; - } while ((rpt->r_flags&ISMAZE) && !(flat(epos.y, epos.x)&F_PASS)); - distance = abs(spos.y - epos.y) - 1; /* distance to move */ - turn_delta.y = 0; /* direction to turn */ - turn_delta.x = (spos.x < epos.x ? 1 : -1); - turn_distance = abs(spos.x - epos.x); /* how far to turn */ - } - else if (direc == 'r') /* setup for moving right */ - { - rmt = rm + 1; - rpt = &rooms[rmt]; - del.x = 1; - del.y = 0; - spos.x = rpf->r_pos.x; - spos.y = rpf->r_pos.y; - epos.x = rpt->r_pos.x; - epos.y = rpt->r_pos.y; - if (!(rpf->r_flags & ISGONE)) - do - { - spos.x = rpf->r_pos.x + rpf->r_max.x - 1; - spos.y = rpf->r_pos.y + rnd(rpf->r_max.y - 2) + 1; - } while ((rpf->r_flags&ISMAZE) && !(flat(spos.y, spos.x)&F_PASS)); - if (!(rpt->r_flags & ISGONE)) - do - { - epos.y = rpt->r_pos.y + rnd(rpt->r_max.y - 2) + 1; - } while ((rpt->r_flags&ISMAZE) && !(flat(epos.y, epos.x)&F_PASS)); - distance = abs(spos.x - epos.x) - 1; - turn_delta.y = (spos.y < epos.y ? 1 : -1); - turn_delta.x = 0; - turn_distance = abs(spos.y - epos.y); - } -#ifdef MASTER - else - debug("error in connection tables"); -#endif - - turn_spot = rnd(distance - 1) + 1; /* where turn starts */ - - /* - * Draw in the doors on either side of the passage or just put #'s - * if the rooms are gone. - */ - if (!(rpf->r_flags & ISGONE)) - door(rpf, &spos); - else - putpass(&spos); - if (!(rpt->r_flags & ISGONE)) - door(rpt, &epos); - else - putpass(&epos); - /* - * Get ready to move... - */ - curr.x = spos.x; - curr.y = spos.y; - while (distance > 0) - { - /* - * Move to new position - */ - curr.x += del.x; - curr.y += del.y; - /* - * Check if we are at the turn place, if so do the turn - */ - if (distance == turn_spot) - while (turn_distance--) - { - putpass(&curr); - curr.x += turn_delta.x; - curr.y += turn_delta.y; - } - /* - * Continue digging along - */ - putpass(&curr); - distance--; - } - curr.x += del.x; - curr.y += del.y; - if (!ce(curr, epos)) - msg(rs,"warning, connectivity problem on this level"); -} - -/* - * putpass: - * add a passage character or secret passage here - */ - -void -putpass(coord *cp) -{ - PLACE *pp; - - pp = INDEX(cp->y, cp->x); - pp->p_flags |= F_PASS; - if (rnd(10) + 1 < level && rnd(40) == 0) - pp->p_flags &= ~F_REAL; - else - pp->p_ch = PASSAGE; -} - -/* - * door: - * Add a door or possibly a secret door. Also enters the door in - * the exits array of the room. - */ - -void -door(struct room *rm, coord *cp) -{ - PLACE *pp; - - rm->r_exit[rm->r_nexits++] = *cp; - - if (rm->r_flags & ISMAZE) - return; - - pp = INDEX(cp->y, cp->x); - if (rnd(10) + 1 < level && rnd(5) == 0) - { - if (cp->y == rm->r_pos.y || cp->y == rm->r_pos.y + rm->r_max.y - 1) - pp->p_ch = '-'; - else - pp->p_ch = '|'; - pp->p_flags &= ~F_REAL; - } - else - pp->p_ch = DOOR; -} - -#ifdef MASTER -/* - * add_pass: - * Add the passages to the current window (wizard command) - */ - -void -add_pass() -{ - PLACE *pp; - int y, x; - char ch; - - for (y = 1; y < NUMLINES - 1; y++) - for (x = 0; x < NUMCOLS; x++) - { - pp = INDEX(y, x); - if ((pp->p_flags & F_PASS) || pp->p_ch == DOOR || - (!(pp->p_flags&F_REAL) && (pp->p_ch == '|' || pp->p_ch == '-'))) - { - ch = pp->p_ch; - if (pp->p_flags & F_PASS) - ch = PASSAGE; - pp->p_flags |= F_SEEN; - move(y, x); - if (pp->p_monst != NULL) - pp->p_monst->t_oldch = pp->p_ch; - else if (pp->p_flags & F_REAL) - addch(ch); - else - { - standout(); - addch((pp->p_flags & F_PASS) ? PASSAGE : DOOR); - standend(); - } - } - } -} -#endif - -/* - * passnum: - * Assign a number to each passageway - */ -static int pnum; -static bool newpnum; - - -void -passnum() -{ - struct room *rp; - int i; - - pnum = 0; - newpnum = FALSE; - for (rp = passages; rp < &passages[MAXPASS]; rp++) - rp->r_nexits = 0; - for (rp = rooms; rp < &rooms[MAXROOMS]; rp++) - for (i = 0; i < rp->r_nexits; i++) - { - newpnum ^= 1;//newpnum++; - numpass(rp->r_exit[i].y, rp->r_exit[i].x); - } -} - -/* - * numpass: - * Number a passageway square and its brethren - */ - -void -numpass(int y, int x) -{ - char *fp; - struct room *rp; - char ch; - - if (x >= NUMCOLS || x < 0 || y >= NUMLINES || y <= 0) - return; - fp = &flat(y, x); - if (*fp & F_PNUM) - return; - if (newpnum) - { - pnum++; - newpnum = FALSE; - } - /* - * check to see if it is a door or secret door, i.e., a new exit, - * or a numerable type of place - */ - if ((ch = chat(y, x)) == DOOR || - (!(*fp & F_REAL) && (ch == '|' || ch == '-'))) - { - rp = &passages[pnum]; - rp->r_exit[rp->r_nexits].y = y; - rp->r_exit[rp->r_nexits++].x = x; - } - else if (!(*fp & F_PASS)) - return; - *fp |= pnum; - /* - * recurse on the surrounding places - */ - numpass(y + 1, x); - numpass(y - 1, x); - numpass(y, x + 1); - numpass(y, x - 1); -} diff --git a/src/cc/rogue/potions.c b/src/cc/rogue/potions.c deleted file mode 100644 index ac78594c1..000000000 --- a/src/cc/rogue/potions.c +++ /dev/null @@ -1,335 +0,0 @@ -// Copyright (c) 2016-2023 The Hush developers -// Distributed under the GPLv3 software license, see the accompanying -// file COPYING or https://www.gnu.org/licenses/gpl-3.0.en.html -/* - * Function(s) for dealing with potions, mmmmmmmmmm, potionzzzzzzz - * - * @(#)potions.c 4.46 (Berkeley) 06/07/83 - * - * Rogue: Exploring the Dungeons of Doom - * Copyright (C) 1980-1983, 1985, 1999 Michael Toy, Ken Arnold and Glenn Wichman - * All rights reserved. - * - * See the file LICENSE.TXT for full copyright and licensing information. - */ - -//#include -//#include -#include "rogue.h" - -typedef struct -{ - int pa_flags; - void (*pa_daemon)(struct rogue_state *rs,int); - int pa_time; - char *pa_high, *pa_straight; -} PACT; - -static PACT p_actions[] = -{ - { ISHUH, unconfuse, HUHDURATION, /* P_CONFUSE */ - "what a tripy feeling!", - "wait, what's going on here. Huh? What? Who?" }, - { ISHALU, come_down, SEEDURATION, /* P_LSD */ - "Oh, wow! Everything seems so cosmic!", - "Oh, wow! Everything seems so cosmic!" }, - { 0, NULL, 0 }, /* P_POISON */ - { 0, NULL, 0 }, /* P_STRENGTH */ - { CANSEE, unsee, SEEDURATION, /* P_SEEINVIS */ - prbuf, - prbuf }, - { 0, NULL, 0 }, /* P_HEALING */ - { 0, NULL, 0 }, /* P_MFIND */ - { 0, NULL, 0 }, /* P_TFIND */ - { 0, NULL, 0 }, /* P_RAISE */ - { 0, NULL, 0 }, /* P_XHEAL */ - { 0, NULL, 0 }, /* P_HASTE */ - { 0, NULL, 0 }, /* P_RESTORE */ - { ISBLIND, sight, SEEDURATION, /* P_BLIND */ - "oh, bummer! Everything is dark! Help!", - "a cloak of darkness falls around you" }, - { ISLEVIT, land, HEALTIME, /* P_LEVIT */ - "oh, wow! You're floating in the air!", - "you start to float in the air" } -}; - -/* - * quaff: - * Quaff a potion from the pack - */ - -void quaff(struct rogue_state *rs) -{ - THING *obj, *tp, *mp; - bool discardit = FALSE; - bool show, trip; - - obj = get_item(rs,"quaff", POTION); - /* - * Make certain that it is somethings that we want to drink - */ - if (obj == NULL) - return; - if (obj->o_type != POTION) - { - if (!terse) - msg(rs,"yuk! Why would you want to drink that?"); - else - msg(rs,"that's undrinkable"); - return; - } - if (obj == cur_weapon) - cur_weapon = NULL; - /* - * Calculate the effect it has on the poor guy. - */ - trip = on(player, ISHALU); - discardit = (bool)(obj->o_count == 1); - leave_pack(rs,obj, FALSE, FALSE); - switch (obj->o_which) - { - case P_CONFUSE: - do_pot(rs,P_CONFUSE, !trip); - when P_POISON: - pot_info[P_POISON].oi_know = TRUE; - if (ISWEARING(R_SUSTSTR)) - msg(rs,"you feel momentarily sick"); - else - { - chg_str(-(rnd(3) + 1)); - msg(rs,"you feel very sick now"); - come_down(rs,0); - } - when P_HEALING: - pot_info[P_HEALING].oi_know = TRUE; - if ((pstats.s_hpt += roll(pstats.s_lvl, 4)) > max_hp) - pstats.s_hpt = ++max_hp; - sight(rs,0); - msg(rs,"you begin to feel better"); - when P_STRENGTH: - pot_info[P_STRENGTH].oi_know = TRUE; - chg_str(1); - msg(rs,"you feel stronger, now. What bulging muscles!"); - when P_MFIND: - player.t_flags |= SEEMONST; - fuse((void(*)(struct rogue_state *rs,int))turn_see, TRUE, HUHDURATION, AFTER); - if (!turn_see(rs,FALSE)) - msg(rs,"you have a %s feeling for a moment, then it passes", - choose_str("normal", "strange")); - when P_TFIND: - /* - * Potion of magic detection. Show the potions and scrolls - */ - show = FALSE; - if (lvl_obj != NULL) - { - wclear(hw); - for (tp = lvl_obj; tp != NULL; tp = next(tp)) - { - if (is_magic(tp)) - { - show = TRUE; - wmove(hw, tp->o_pos.y, tp->o_pos.x); - waddch(hw, MAGIC); - pot_info[P_TFIND].oi_know = TRUE; - } - } - for (mp = mlist; mp != NULL; mp = next(mp)) - { - for (tp = mp->t_pack; tp != NULL; tp = next(tp)) - { - if (is_magic(tp)) - { - show = TRUE; - wmove(hw, mp->t_pos.y, mp->t_pos.x); - waddch(hw, MAGIC); - } - } - } - } - if (show) - { - pot_info[P_TFIND].oi_know = TRUE; - show_win(rs,"You sense the presence of magic on this level.--More--"); - } - else - msg(rs,"you have a %s feeling for a moment, then it passes", - choose_str("normal", "strange")); - when P_LSD: - if (!trip) - { - if (on(player, SEEMONST)) - turn_see(rs,FALSE); - start_daemon(visuals, 0, BEFORE); - seenstairs = seen_stairs(); - } - do_pot(rs,P_LSD, TRUE); - when P_SEEINVIS: - sprintf(prbuf, "this potion tastes like %s juice", fruit); - show = on(player, CANSEE); - do_pot(rs,P_SEEINVIS, FALSE); - if (!show) - invis_on(); - sight(rs,0); - when P_RAISE: - pot_info[P_RAISE].oi_know = TRUE; - msg(rs,"you suddenly feel much more skillful"); - raise_level(rs); - when P_XHEAL: - pot_info[P_XHEAL].oi_know = TRUE; - if ((pstats.s_hpt += roll(pstats.s_lvl, 8)) > max_hp) - { - if (pstats.s_hpt > max_hp + pstats.s_lvl + 1) - ++max_hp; - pstats.s_hpt = ++max_hp; - } - sight(rs,0); - come_down(rs,0); - msg(rs,"you begin to feel much better"); - when P_HASTE: - pot_info[P_HASTE].oi_know = TRUE; - after = FALSE; - if (add_haste(rs,TRUE)) - msg(rs,"you feel yourself moving much faster"); - when P_RESTORE: - if (ISRING(LEFT, R_ADDSTR)) - add_str(&pstats.s_str, -cur_ring[LEFT]->o_arm); - if (ISRING(RIGHT, R_ADDSTR)) - add_str(&pstats.s_str, -cur_ring[RIGHT]->o_arm); - if (pstats.s_str < max_stats.s_str) - pstats.s_str = max_stats.s_str; - if (ISRING(LEFT, R_ADDSTR)) - add_str(&pstats.s_str, cur_ring[LEFT]->o_arm); - if (ISRING(RIGHT, R_ADDSTR)) - add_str(&pstats.s_str, cur_ring[RIGHT]->o_arm); - msg(rs,"hey, this tastes great. It make you feel warm all over"); - when P_BLIND: - do_pot(rs,P_BLIND, TRUE); - when P_LEVIT: - do_pot(rs,P_LEVIT, TRUE); -#ifdef MASTER - otherwise: - msg(rs,"what an odd tasting potion!"); - return; -#endif - } - status(rs); - /* - * Throw the item away - */ - - call_it(rs,&pot_info[obj->o_which]); - - if (discardit) - discard(obj); - return; -} - -/* - * is_magic: - * Returns true if an object radiates magic - */ -bool -is_magic(THING *obj) -{ - switch (obj->o_type) - { - case ARMOR: - return (bool)((obj->o_flags&ISPROT) || obj->o_arm != a_class[obj->o_which]); - case WEAPON: - return (bool)(obj->o_hplus != 0 || obj->o_dplus != 0); - case POTION: - case SCROLL: - case STICK: - case RING: - case AMULET: - return TRUE; - } - return FALSE; -} - -/* - * invis_on: - * Turn on the ability to see invisible - */ - -void -invis_on() -{ - THING *mp; - - player.t_flags |= CANSEE; - for (mp = mlist; mp != NULL; mp = next(mp)) - if (on(*mp, ISINVIS) && see_monst(mp) && !on(player, ISHALU)) - mvaddch(mp->t_pos.y, mp->t_pos.x, mp->t_disguise); -} - - -/* - * seen_stairs: - * Return TRUE if the player has seen the stairs - */ -bool -seen_stairs() -{ - THING *tp; - - move(stairs.y, stairs.x); - if (inch() == STAIRS) /* it's on the map */ - return TRUE; - if (ce(hero, stairs)) /* It's under him */ - return TRUE; - - /* - * if a monster is on the stairs, this gets hairy - */ - if ((tp = moat(stairs.y, stairs.x)) != NULL) - { - if (see_monst(tp) && on(*tp, ISRUN)) /* if it's visible and awake */ - return TRUE; /* it must have moved there */ - - if (on(player, SEEMONST) /* if she can detect monster */ - && tp->t_oldch == STAIRS) /* and there once were stairs */ - return TRUE; /* it must have moved there */ - } - return FALSE; -} - -/* - * raise_level: - * The guy just magically went up a level. - */ - -void -raise_level(struct rogue_state *rs) -{ - pstats.s_exp = e_levels[pstats.s_lvl-1] + 1L; - check_level(rs); -} - -/* - * do_pot: - * Do a potion with standard setup. This means it uses a fuse and - * turns on a flag - */ - -void -do_pot(struct rogue_state *rs,int type, bool knowit) -{ - PACT *pp; - int t; - - pp = &p_actions[type]; - if (!pot_info[type].oi_know) - pot_info[type].oi_know = knowit; - t = spread(pp->pa_time); - if (!on(player, pp->pa_flags)) - { - player.t_flags |= pp->pa_flags; - fuse(pp->pa_daemon, 0, t, AFTER); - look(rs,FALSE); - } - else - lengthen(pp->pa_daemon, t); - msg(rs,choose_str(pp->pa_high, pp->pa_straight)); -} diff --git a/src/cc/rogue/rings.c b/src/cc/rogue/rings.c deleted file mode 100644 index 7398fd776..000000000 --- a/src/cc/rogue/rings.c +++ /dev/null @@ -1,209 +0,0 @@ -// Copyright (c) 2016-2023 The Hush developers -// Distributed under the GPLv3 software license, see the accompanying -// file COPYING or https://www.gnu.org/licenses/gpl-3.0.en.html -/* - * Routines dealing specifically with rings - * - * @(#)rings.c 4.19 (Berkeley) 05/29/83 - * - * Rogue: Exploring the Dungeons of Doom - * Copyright (C) 1980-1983, 1985, 1999 Michael Toy, Ken Arnold and Glenn Wichman - * All rights reserved. - * - * See the file LICENSE.TXT for full copyright and licensing information. - */ - -//#include -#include "rogue.h" - -/* - * ring_on: - * Put a ring on a hand - */ - -void -ring_on(struct rogue_state *rs) -{ - THING *obj; - int ring; - - obj = get_item(rs,"put on", RING); - /* - * Make certain that it is somethings that we want to wear - */ - if (obj == NULL) - return; - if (obj->o_type != RING) - { - if (!terse) - msg(rs,"it would be difficult to wrap that around a finger"); - else - msg(rs,"not a ring"); - return; - } - - /* - * find out which hand to put it on - */ - if (is_current(rs,obj)) - return; - - if (cur_ring[LEFT] == NULL && cur_ring[RIGHT] == NULL) - { - if ((ring = gethand(rs)) < 0) - return; - } - else if (cur_ring[LEFT] == NULL) - ring = LEFT; - else if (cur_ring[RIGHT] == NULL) - ring = RIGHT; - else - { - if (!terse) - msg(rs,"you already have a ring on each hand"); - else - msg(rs,"wearing two"); - return; - } - cur_ring[ring] = obj; - - /* - * Calculate the effect it has on the poor guy. - */ - switch (obj->o_which) - { - case R_ADDSTR: - chg_str(obj->o_arm); - break; - case R_SEEINVIS: - invis_on(); - break; - case R_AGGR: - aggravate(rs); - break; - } - - if (!terse) - addmsg(rs,"you are now wearing "); - msg(rs,"%s (%c)", inv_name(obj, TRUE), obj->o_packch); -} - -/* - * ring_off: - * take off a ring - */ - -void -ring_off(struct rogue_state *rs) -{ - int ring; - THING *obj; - - if (cur_ring[LEFT] == NULL && cur_ring[RIGHT] == NULL) - { - if (terse) - msg(rs,"no rings"); - else - msg(rs,"you aren't wearing any rings"); - return; - } - else if (cur_ring[LEFT] == NULL) - ring = RIGHT; - else if (cur_ring[RIGHT] == NULL) - ring = LEFT; - else - if ((ring = gethand(rs)) < 0) - return; - mpos = 0; - obj = cur_ring[ring]; - if (obj == NULL) - { - msg(rs,"not wearing such a ring"); - return; - } - if (dropcheck(rs,obj)) - msg(rs,"was wearing %s(%c)", inv_name(obj, TRUE), obj->o_packch); -} - -/* - * gethand: - * Which hand is the hero interested in? - */ -int -gethand(struct rogue_state *rs) -{ - int c; - - for (;;) - { - if ( rs->replaydone != 0 ) - return(-1); - if (terse) - msg(rs,"left or right ring? "); - else - msg(rs,"left hand or right hand? "); - if ((c = readchar(rs)) == ESCAPE) - return -1; - mpos = 0; - if (c == 'l' || c == 'L') - return LEFT; - else if (c == 'r' || c == 'R') - return RIGHT; - if (terse) - msg(rs,"L or R"); - else - msg(rs,"please type L or R"); - } -} - -/* - * ring_eat: - * How much food does this ring use up? - */ -int -ring_eat(int hand) -{ - THING *ring; - int eat; - static int uses[] = { - 1, /* R_PROTECT */ 1, /* R_ADDSTR */ - 1, /* R_SUSTSTR */ -3, /* R_SEARCH */ - -5, /* R_SEEINVIS */ 0, /* R_NOP */ - 0, /* R_AGGR */ -3, /* R_ADDHIT */ - -3, /* R_ADDDAM */ 2, /* R_REGEN */ - -2, /* R_DIGEST */ 0, /* R_TELEPORT */ - 1, /* R_STEALTH */ 1 /* R_SUSTARM */ - }; - - if ((ring = cur_ring[hand]) == NULL) - return 0; - if ((eat = uses[ring->o_which]) < 0) - eat = (rnd(-eat) == 0); - if (ring->o_which == R_DIGEST) - eat = -eat; - return eat; -} - -/* - * ring_num: - * Print ring bonuses - */ -char * -ring_num(THING *obj) -{ - static char buf[10]; - - if (!(obj->o_flags & ISKNOW)) - return ""; - switch (obj->o_which) - { - case R_PROTECT: - case R_ADDSTR: - case R_ADDDAM: - case R_ADDHIT: - sprintf(buf, " [%s]", num(obj->o_arm, 0, RING)); - otherwise: - return ""; - } - return buf; -} diff --git a/src/cc/rogue/rip.c b/src/cc/rogue/rip.c deleted file mode 100644 index 730a0c61f..000000000 --- a/src/cc/rogue/rip.c +++ /dev/null @@ -1,464 +0,0 @@ -// Copyright (c) 2016-2023 The Hush developers -// Distributed under the GPLv3 software license, see the accompanying -// file COPYING or https://www.gnu.org/licenses/gpl-3.0.en.html -/* - * File for the fun ends - * Death or a total win - * - * @(#)rip.c 4.57 (Berkeley) 02/05/99 - * - * Rogue: Exploring the Dungeons of Doom - * Copyright (C) 1980-1983, 1985, 1999 Michael Toy, Ken Arnold and Glenn Wichman - * All rights reserved. - * - * See the file LICENSE.TXT for full copyright and licensing information. - */ - -//#include -//#include -//#include -#include -//#include -//#include -//#include -//#include -#include "rogue.h" -#include "score.h" - -static char *rip[] = { -" __________\n", -" / \\\n", -" / REST \\\n", -" / IN \\\n", -" / PEACE \\\n", -" / \\\n", -" | |\n", -" | |\n", -" | killed by a |\n", -" | |\n", -" | 1980 |\n", -" *| * * * | *\n", -" ________)/\\\\_//(\\/(/\\)/\\//\\/|_)_______\n", - 0 -}; - -/* - * score: - * Figure score and post it. - */ -/* VARARGS2 */ - -void -score(struct rogue_state *rs,int amount, int flags, char monst) -{ - SCORE *scp; - int i; - SCORE *sc2; - SCORE *top_ten, *endp; - if ( rs->guiflag == 0 ) - return; -# ifdef MASTER - int prflags = 0; -# endif - void (*fp)(int); - unsigned int uid; - static char *reason[] = { - "killed", - "quit", - "A total winner", - "killed with Amulet" - }; - - start_score(); - - if (flags >= 0 -#ifdef MASTER - || wizard -#endif - ) - { - mvaddstr(LINES - 1, 0 , "[Press return to continue]"); - refresh(); - wgetnstr(stdscr,prbuf,80); - endwin(); - printf("\n"); - resetltchars(); - /* - * free up space to "guarantee" there is space for the top_ten - */ - delwin(stdscr); - delwin(curscr); - if (hw != NULL) - delwin(hw); - hw = NULL; - } - - top_ten = (SCORE *) malloc(numscores * sizeof (SCORE)); - endp = &top_ten[numscores]; - for (scp = top_ten; scp < endp; scp++) - { - scp->sc_score = 0; - for (i = 0; i < MAXSTR; i++) - scp->sc_name[i] = (unsigned char) rnd(255); - scp->sc_flags = RN; - scp->sc_level = RN; - scp->sc_monster = (unsigned short) RN; - scp->sc_uid = RN; - } - - signal(SIGINT, SIG_DFL); - -#ifdef MASTER - if (wizard) - if (strcmp(prbuf, "names") == 0) - prflags = 1; - else if (strcmp(prbuf, "edit") == 0) - prflags = 2; -#endif - rd_score(top_ten); - /* - * Insert her in list if need be - */ - sc2 = NULL; - if (!noscore) - { - uid = md_getuid(); - for (scp = top_ten; scp < endp; scp++) - if (amount > scp->sc_score) - break; - else if (!allscore && /* only one score per nowin uid */ - flags != 2 && scp->sc_uid == uid && scp->sc_flags != 2) - scp = endp; - if (scp < endp) - { - if (flags != 2 && !allscore) - { - for (sc2 = scp; sc2 < endp; sc2++) - { - if (sc2->sc_uid == uid && sc2->sc_flags != 2) - break; - } - if (sc2 >= endp) - sc2 = endp - 1; - } - else - sc2 = endp - 1; - while (sc2 > scp) - { - *sc2 = sc2[-1]; - sc2--; - } - scp->sc_score = amount; - strncpy(scp->sc_name, whoami, MAXSTR); - scp->sc_flags = flags; - if (flags == 2) - scp->sc_level = max_level; - else - scp->sc_level = level; - scp->sc_monster = monst; - scp->sc_uid = uid; - sc2 = scp; - } - } - /* - * Print the list - */ - if (flags != -1) - putchar('\n'); - printf("Top %s %s:\n", Numname, allscore ? "Scores" : "Rogueists"); - printf(" Score Name\n"); - for (scp = top_ten; scp < endp; scp++) - { - if (scp->sc_score) { - if (sc2 == scp) - md_raw_standout(); - printf("%2d %5d %s: %s on level %d", (int) (scp - top_ten + 1), - scp->sc_score, scp->sc_name, reason[scp->sc_flags], - scp->sc_level); - if (scp->sc_flags == 0 || scp->sc_flags == 3) - printf(" by %s", killname((char) scp->sc_monster, TRUE)); -#ifdef MASTER - if (prflags == 1) - { - printf(" (%s)", md_getrealname(scp->sc_uid)); - } - else if (prflags == 2) - { - fflush(stdout); - if ( fgets(prbuf,10,stdin) != 0 ) - fprintf(stderr,"fgets error\n"); - if (prbuf[0] == 'd') - { - for (sc2 = scp; sc2 < endp - 1; sc2++) - *sc2 = *(sc2 + 1); - sc2 = endp - 1; - sc2->sc_score = 0; - for (i = 0; i < MAXSTR; i++) - sc2->sc_name[i] = (char) rnd(255); - sc2->sc_flags = RN; - sc2->sc_level = RN; - sc2->sc_monster = (unsigned short) RN; - scp--; - } - } - else -#endif /* MASTER */ - printf("."); - if (sc2 == scp) - md_raw_standend(); - putchar('\n'); - } - else - break; - } - /* - * Update the list file - */ - if (sc2 != NULL) - { - if (lock_sc()) - { - fp = signal(SIGINT, SIG_IGN); - wr_score(top_ten); - unlock_sc(); - signal(SIGINT, fp); - } - } - free(top_ten); -} - -/* - * death: - * Do something really fun when he dies - */ - -void -death(struct rogue_state *rs,char monst) -{ - char **dp, *killer; - struct tm *lt; - static time_t date; - //struct tm *localtime(const time_t *); - if ( rs->guiflag == 0 ) - { - //fprintf(stderr,"death during replay by (%c)\n",monst); //sleep(3); - rs->replaydone = (uint32_t)time(NULL); - return; - } - signal(SIGINT, SIG_IGN); - purse -= purse / 10; - signal(SIGINT, leave); - clear(); - killer = killname(monst, FALSE); - if (!tombstone) - { - mvprintw(LINES - 2, 0, "Killed by "); - killer = killname(monst, FALSE); - if (monst != 's' && monst != 'h') - printw("a%s ", vowelstr(killer)); - printw("%s with %d gold", killer, purse); - } - else - { - time(&date); - lt = localtime(&date); - move(8, 0); - dp = rip; - while (*dp) - addstr(*dp++); - mvaddstr(17, center(killer), killer); - if (monst == 's' || monst == 'h') - mvaddch(16, 32, ' '); - else - mvaddstr(16, 33, vowelstr(killer)); - mvaddstr(14, center(whoami), whoami); - sprintf(prbuf, "%d Au", purse); - move(15, center(prbuf)); - addstr(prbuf); - sprintf(prbuf, "%4d", 1900+lt->tm_year); - mvaddstr(18, 26, prbuf); - } - move(LINES - 1, 0); - refresh(); - score(rs,purse, amulet ? 3 : 0, monst); - rogue_bailout(rs); - printf("[Press return to continue]"); - fflush(stdout); - if ( fgets(prbuf,10,stdin) != 0 ) - ; - my_exit(0); -} - -/* - * center: - * Return the index to center the given string - */ -int -center(char *str) -{ - return 28 - (((int)strlen(str) + 1) / 2); -} - -/* - * total_winner: - * Code for a winner - */ - -void -total_winner(struct rogue_state *rs) -{ - THING *obj; - struct obj_info *op; - int worth = 0; - int oldpurse; - - clear(); - standout(); - addstr(" \n"); - addstr(" @ @ @ @ @ @@@ @ @ \n"); - addstr(" @ @ @@ @@ @ @ @ @ \n"); - addstr(" @ @ @@@ @ @ @ @ @ @@@ @@@@ @@@ @ @@@ @ \n"); - addstr(" @@@@ @ @ @ @ @ @ @ @ @ @ @ @ @ @ \n"); - addstr(" @ @ @ @ @ @ @ @@@@ @ @ @@@@@ @ @ @ \n"); - addstr(" @ @ @ @ @ @@ @ @ @ @ @ @ @ @ @ @ \n"); - addstr(" @@@ @@@ @@ @ @ @ @@@@ @@@@ @@@ @@@ @@ @ \n"); - addstr(" \n"); - addstr(" Congratulations, you have made it to the light of day! \n"); - standend(); - addstr("\nYou have joined the elite ranks of those who have escaped the\n"); - addstr("Dungeons of Doom alive. You journey home and sell all your loot at\n"); - addstr("a great profit and are admitted to the Fighters' Guild.\n"); - mvaddstr(LINES - 1, 0, "--Press space to continue--"); - refresh(); - wait_for(rs,' '); - clear(); - mvaddstr(0, 0, " Worth Item\n"); - oldpurse = purse; - for (obj = pack; obj != NULL; obj = next(obj)) - { - switch (obj->o_type) - { - case FOOD: - worth = 2 * obj->o_count; - when WEAPON: - worth = weap_info[obj->o_which].oi_worth; - worth *= 3 * (obj->o_hplus + obj->o_dplus) + obj->o_count; - obj->o_flags |= ISKNOW; - when ARMOR: - worth = arm_info[obj->o_which].oi_worth; - worth += (9 - obj->o_arm) * 100; - worth += (10 * (a_class[obj->o_which] - obj->o_arm)); - obj->o_flags |= ISKNOW; - when SCROLL: - worth = scr_info[obj->o_which].oi_worth; - worth *= obj->o_count; - op = &scr_info[obj->o_which]; - if (!op->oi_know) - worth /= 2; - op->oi_know = TRUE; - when POTION: - worth = pot_info[obj->o_which].oi_worth; - worth *= obj->o_count; - op = &pot_info[obj->o_which]; - if (!op->oi_know) - worth /= 2; - op->oi_know = TRUE; - when RING: - op = &ring_info[obj->o_which]; - worth = op->oi_worth; - if (obj->o_which == R_ADDSTR || obj->o_which == R_ADDDAM || - obj->o_which == R_PROTECT || obj->o_which == R_ADDHIT) - { - if (obj->o_arm > 0) - worth += obj->o_arm * 100; - else - worth = 10; - } - if (!(obj->o_flags & ISKNOW)) - worth /= 2; - obj->o_flags |= ISKNOW; - op->oi_know = TRUE; - when STICK: - op = &ws_info[obj->o_which]; - worth = op->oi_worth; - worth += 20 * obj->o_charges; - if (!(obj->o_flags & ISKNOW)) - worth /= 2; - obj->o_flags |= ISKNOW; - op->oi_know = TRUE; - when AMULET: - worth = 1000; - } - if (worth < 0) - worth = 0; - printw("%c) %5d %s\n", obj->o_packch, worth, inv_name(obj, FALSE)); - purse += worth; - } - printw(" %5d Gold Pieces ", oldpurse); - refresh(); - score(rs,purse, 2, ' '); - my_exit(0); -} - -/* - * killname: - * Convert a code to a monster name - */ -char * -killname(char monst, bool doart) -{ - struct h_list *hp; - char *sp; - bool article; - static struct h_list nlist[] = { - {'a', "arrow", TRUE}, - {'b', "bolt", TRUE}, - {'d', "dart", TRUE}, - {'h', "hypothermia", FALSE}, - {'s', "starvation", FALSE}, - {'\0'} - }; - - if (isupper(monst)) - { - sp = monsters[monst-'A'].m_name; - article = TRUE; - } - else - { - sp = "Wally the Wonder Badger"; - article = FALSE; - for (hp = nlist; hp->h_ch; hp++) - if (hp->h_ch == monst) - { - sp = hp->h_desc; - article = hp->h_print; - break; - } - } - if (doart && article) - sprintf(prbuf, "a%s ", vowelstr(sp)); - else - prbuf[0] = '\0'; - strcat(prbuf, sp); - return prbuf; -} - -/* - * death_monst: - * Return a monster appropriate for a random death. - */ -char -death_monst() -{ - static char poss[] = - { - 'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', - 'M', 'N', 'O', 'P', 'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X', - 'Y', 'Z', 'a', 'b', 'h', 'd', 's', - ' ' /* This is provided to generate the "Wally the Wonder Badger" - message for killer */ - }; - - return poss[rnd(sizeof poss / sizeof (char))]; -} diff --git a/src/cc/rogue/rogue.6 b/src/cc/rogue/rogue.6 deleted file mode 100644 index 6b63252ab..000000000 --- a/src/cc/rogue/rogue.6 +++ /dev/null @@ -1,96 +0,0 @@ -.\" -.\" @(#)rogue.6 6.2 (Berkeley) 5/6/86 -.\" -.\" Rogue: Exploring the Dungeons of Doom -.\" Copyright (C) 1980-1983, 1985, 1986 Michael Toy, Ken Arnold and Glenn Wichman -.\" All rights reserved. -.\" -.\" See the file LICENSE.TXT for full copyright and licensing information. -.\" -.TH ROGUE 6 "May 6, 1986" -.UC 4 -.SH NAME -rogue \- Exploring The Dungeons of Doom -.SH SYNOPSIS -.B rogue -[ -.B \-r -] -[ -.I save_file -] -[ -.B \-s -] -[ -.B \-d -] -.SH DESCRIPTION -.PP -.I Rogue -is a computer fantasy game with a new twist. It is crt oriented and the -object of the game is to survive the attacks of various monsters and get -a lot of gold, rather than the puzzle solving orientation of most computer -fantasy games. -.PP -To get started you really only need to know two commands. The command -.B ? -will give you a list of the available commands and the command -.B / -will identify the things you see on the screen. -.PP -To win the game (as opposed to merely playing to beat other people's high -scores) you must locate the Amulet of Yendor which is somewhere below -the 20th level of the dungeon and get it out. Nobody has achieved this -yet and if somebody does, they will probably go down in history as a hero -among heroes. -.PP -When the game ends, either by your death, when you quit, or if you (by -some miracle) manage to win, -.I rogue -will give you a list of the top-ten scorers. The scoring is based entirely -upon how much gold you get. There is a 10% penalty for getting yourself -killed. -.PP -If -.I save_file -is specified, -rogue will be restored from the specified saved game file. -If the -.B \-r -option is used, the save game file is presumed to be the default. -.PP -The -.B \-s -option will print out the list of scores. -.PP -The -.B \-d -option will kill you and try to add you to the score file. -.PP -For more detailed directions, read the document -.I "A Guide to the Dungeons of Doom." -.SH AUTHORS -Michael C. Toy, -Kenneth C. R. C. Arnold, -Glenn Wichman -.SH FILES -.DT -.ta \w'rogue.scr\ \ \ 'u -rogue.scr Score file -.br -\fB~\fP/rogue.save Default save file -.SH SEE ALSO -Michael C. Toy -and -Kenneth C. R. C. Arnold, -.I "A guide to the Dungeons of Doom" -.SH BUGS -.PP -Probably infinite -(although countably infinite). -However, -that Ice Monsters sometimes transfix you permanently is -.I not -a bug. -It's a feature. diff --git a/src/cc/rogue/rogue.6.in b/src/cc/rogue/rogue.6.in deleted file mode 100644 index a9d6d9903..000000000 --- a/src/cc/rogue/rogue.6.in +++ /dev/null @@ -1,96 +0,0 @@ -.\" -.\" @(#)rogue.6 6.2 (Berkeley) 5/6/86 -.\" -.\" Rogue: Exploring the Dungeons of Doom -.\" Copyright (C) 1980-1983, 1985, 1986 Michael Toy, Ken Arnold and Glenn Wichman -.\" All rights reserved. -.\" -.\" See the file LICENSE.TXT for full copyright and licensing information. -.\" -.TH ROGUE 6 "May 6, 1986" -.UC 4 -.SH NAME -rogue \- Exploring The Dungeons of Doom -.SH SYNOPSIS -.B @PROGRAM@ -[ -.B \-r -] -[ -.I save_file -] -[ -.B \-s -] -[ -.B \-d -] -.SH DESCRIPTION -.PP -.I Rogue -is a computer fantasy game with a new twist. It is crt oriented and the -object of the game is to survive the attacks of various monsters and get -a lot of gold, rather than the puzzle solving orientation of most computer -fantasy games. -.PP -To get started you really only need to know two commands. The command -.B ? -will give you a list of the available commands and the command -.B / -will identify the things you see on the screen. -.PP -To win the game (as opposed to merely playing to beat other people's high -scores) you must locate the Amulet of Yendor which is somewhere below -the 20th level of the dungeon and get it out. Nobody has achieved this -yet and if somebody does, they will probably go down in history as a hero -among heroes. -.PP -When the game ends, either by your death, when you quit, or if you (by -some miracle) manage to win, -.I rogue -will give you a list of the top-ten scorers. The scoring is based entirely -upon how much gold you get. There is a 10% penalty for getting yourself -killed. -.PP -If -.I save_file -is specified, -rogue will be restored from the specified saved game file. -If the -.B \-r -option is used, the save game file is presumed to be the default. -.PP -The -.B \-s -option will print out the list of scores. -.PP -The -.B \-d -option will kill you and try to add you to the score file. -.PP -For more detailed directions, read the document -.I "A Guide to the Dungeons of Doom." -.SH AUTHORS -Michael C. Toy, -Kenneth C. R. C. Arnold, -Glenn Wichman -.SH FILES -.DT -.ta \w'@SCOREFILE@\ \ \ 'u -@SCOREFILE@ Score file -.br -\fB~\fP/rogue.save Default save file -.SH SEE ALSO -Michael C. Toy -and -Kenneth C. R. C. Arnold, -.I "A guide to the Dungeons of Doom" -.SH BUGS -.PP -Probably infinite -(although countably infinite). -However, -that Ice Monsters sometimes transfix you permanently is -.I not -a bug. -It's a feature. diff --git a/src/cc/rogue/rogue.c b/src/cc/rogue/rogue.c deleted file mode 100644 index 858a2deb9..000000000 --- a/src/cc/rogue/rogue.c +++ /dev/null @@ -1,776 +0,0 @@ -// Copyright (c) 2016-2023 The Hush developers -// Distributed under the GPLv3 software license, see the accompanying -// file COPYING or https://www.gnu.org/licenses/gpl-3.0.en.html -/* - * Rogue: Exploring the Dungeons of Doom - * Copyright (C) 1980-1983, 1985, 1999 Michael Toy, Ken Arnold and Glenn Wichman - * All rights reserved. - * - * See the file LICENSE.TXT for full copyright and licensing information. - * - * @(#)main.c 4.22 (Berkeley) 02/05/99 - */ - -//#include -//#include -#include -//#include -//#include - -#include "rogue.h" -#ifdef STANDALONE -#include "../hush3/src/hush_cJSON.h" -#else -#include "../../hush_cJSON.h" -#endif - -/* - * main: - * The main program, of course - */ -struct rogue_state globalR; -char Gametxidstr[67]; -void garbage_collect(); - -void purge_obj_guess(struct obj_info *array,int32_t n) -{ - int32_t i; - for (i=0; iseed; - //clear(); - purge_obj_guess(things,NUMTHINGS); - purge_obj_guess(ring_info,MAXRINGS); - purge_obj_guess(pot_info,MAXPOTIONS); - purge_obj_guess(arm_info,MAXARMORS); - purge_obj_guess(scr_info,MAXSCROLLS); - purge_obj_guess(weap_info,MAXWEAPONS + 1); - purge_obj_guess(ws_info,MAXSTICKS); - free_list(player._t._t_pack); - for (tp = mlist; tp != NULL; tp = next(tp)) - free_list(tp->t_pack); - free_list(mlist); - free_list(lvl_obj); - garbage_collect(); - - externs_clear(); - memset(d_list,0,sizeof(d_list)); - - memcpy(passages,origpassages,sizeof(passages)); - memcpy(monsters,origmonsters,sizeof(monsters)); - memcpy(things,origthings,sizeof(things)); - - memcpy(ring_info,origring_info,sizeof(ring_info)); - memcpy(pot_info,origpot_info,sizeof(pot_info)); - memcpy(arm_info,origarm_info,sizeof(arm_info)); - memcpy(scr_info,origscr_info,sizeof(scr_info)); - memcpy(weap_info,origweap_info,sizeof(weap_info)); - memcpy(ws_info,origws_info,sizeof(ws_info)); - - initscr(); /* Start up cursor package */ - init_probs(); /* Set up prob tables for objects */ - init_player(rs); /* Set up initial player stats */ - init_names(); /* Set up names of scrolls */ - init_colors(); /* Set up colors of potions */ - init_stones(); /* Set up stone settings of rings */ - init_materials(); /* Set up materials of wands */ - setup(); - - /* - * The screen must be at least NUMLINES x NUMCOLS - */ - if (LINES < NUMLINES || COLS < NUMCOLS) - { - printf("\nSorry, the screen must be at least %dx%d\n", NUMLINES, NUMCOLS); - endwin(); - my_exit(1); - } - //fprintf(stderr,"LINES %d, COLS %d\n",LINES,COLS); - - // Set up windows - if ( hw == NULL ) - { - hw = newwin(LINES, COLS, 0, 0); - } - idlok(stdscr, TRUE); - idlok(hw, TRUE); -#ifdef MASTER - noscore = wizard; -#endif - new_level(rs); // Draw current level - // Start up daemons and fuses - start_daemon(runners, 0, AFTER); - start_daemon(doctor, 0, AFTER); - fuse(swander, 0, WANDERTIME, AFTER); - start_daemon(stomach, 0, AFTER); - if ( rs->restoring != 0 ) - { - restore_player(rs); - } - playit(rs); -} - -int32_t roguefname(char *fname,uint64_t seed,int32_t counter) -{ - sprintf(fname,"rogue.%llu.%d",(long long)seed,counter); - return(0); -} - -int32_t flushkeystrokes_local(struct rogue_state *rs,int32_t waitflag) -{ -#ifndef BUILD_ROGUE - char fname[1024]; FILE *fp; int32_t i,retflag = -1; - rs->counter++; - roguefname(fname,rs->seed,rs->counter); - if ( (fp= fopen(fname,"wb")) != 0 ) - { - if ( fwrite(rs->buffered,1,rs->num,fp) == rs->num ) - { - rs->num = 0; - retflag = 0; - fclose(fp); - /*if ( (fp= fopen("savefile","wb")) != 0 ) - { - save_file(rs,fp,0); - if ( 0 && (fp= fopen("savefile","rb")) != 0 ) - { - for (i=0; i<0x150; i++) - fprintf(stderr,"%02x",fgetc(fp)); - fprintf(stderr," first part rnd.%d\n",rnd(1000)); - fclose(fp); - }*/ - roguefname(fname,rs->seed,rs->counter+1); - if ( (fp= fopen(fname,"wb")) != 0 ) // truncate next file - fclose(fp); - //fprintf(stderr,"savefile <- %s retflag.%d\n",fname,retflag); - //} - } else fprintf(stderr,"error writing (%s)\n",fname); - } else fprintf(stderr,"error creating (%s)\n",fname); - return(retflag); -#else - return(0); -#endif -} - -#ifdef BUILD_ROGUE -// stubs for inside daemon - -int32_t rogue_progress(struct rogue_state *rs,int32_t waitflag,uint64_t seed,char *keystrokes,int32_t num) -{ -} - -int32_t rogue_setplayerdata(struct rogue_state *rs,char *gametxidstr) -{ - return(-1); -} -#endif - -int32_t flushkeystrokes(struct rogue_state *rs,int32_t waitflag) -{ - if ( rs->num > 0 ) - { - if ( rogue_progress(rs,waitflag,rs->seed,rs->buffered,rs->num) > 0 ) - { - flushkeystrokes_local(rs,waitflag); - memset(rs->buffered,0,sizeof(rs->buffered)); - } - } - return(0); -} - -void rogue_bailout(struct rogue_state *rs) -{ - char cmd[512]; - flushkeystrokes(rs,1); - //sleep(5); - return; - /*fprintf(stderr,"bailing out\n"); - sprintf(cmd,"./hush-cli -ac_name=ROGUE cclib bailout 17 \\\"[%%22%s%%22]\\\" >> bailout.log",Gametxidstr); - if ( system(cmd) != 0 ) - fprintf(stderr,"error issuing (%s)\n",cmd);*/ -} - -#ifdef _WIN32 -#ifdef _MSC_VER -#define sleep(x) Sleep(1000*(x)) -#endif -#endif - -int32_t rogue_replay2(uint8_t *newdata,uint64_t seed,char *keystrokes,int32_t num,struct rogue_player *player,int32_t sleepmillis) -{ - struct rogue_state *rs; FILE *fp; int32_t i,n; - rs = (struct rogue_state *)calloc(1,sizeof(*rs)); - rs->seed = seed; - rs->keystrokes = keystrokes; - rs->numkeys = num; - rs->sleeptime = sleepmillis * 1000; - if ( player != 0 ) - { - rs->P = *player; - rs->restoring = 1; - //fprintf(stderr,"restore player packsize.%d HP.%d\n",rs->P.packsize,rs->P.hitpoints); - if ( rs->P.packsize > MAXPACK ) - rs->P.packsize = MAXPACK; - } - globalR = *rs; - uint32_t starttime = (uint32_t)time(NULL); - rogueiterate(rs); - - /* - // keypress after replay - printf("[Press return to continue]"); - fflush(stdout); - if (fgets(prbuf, 10, stdin) != 0); - */ - - if ( 0 ) - { - fprintf(stderr,"elapsed %d seconds\n",(uint32_t)time(NULL) - starttime); - sleep(2); - - starttime = (uint32_t)time(NULL); - for (i=0; i<10000; i++) - { - memset(rs,0,sizeof(*rs)); - rs->seed = seed; - rs->keystrokes = keystrokes; - rs->numkeys = num; - rs->sleeptime = 0; - rogueiterate(rs); - } - fprintf(stderr,"elapsed %d seconds\n",(uint32_t)time(NULL)-starttime); - sleep(3); - } - if ( (fp= fopen("checkfile","wb")) != 0 ) - { - save_file(rs,fp,0); - //fprintf(stderr,"gold.%d hp.%d strength.%d/%d level.%d exp.%d dungeon.%d data[%d]\n",rs->P.gold,rs->P.hitpoints,rs->P.strength&0xffff,rs->P.strength>>16,rs->P.level,rs->P.experience,rs->P.dungeonlevel,rs->playersize); - if ( newdata != 0 && rs->playersize > 0 ) - memcpy(newdata,rs->playerdata,rs->playersize); - } - n = rs->playersize; - free(rs); - return(n); -} - -long get_filesize(FILE *fp) -{ - long fsize,fpos = ftell(fp); - fseek(fp,0,SEEK_END); - fsize = ftell(fp); - fseek(fp,fpos,SEEK_SET); - return(fsize); -} - -char *rogue_keystrokesload(int32_t *numkeysp,uint64_t seed,int32_t counter) -{ - char fname[1024],*keystrokes = 0; FILE *fp; long fsize; int32_t num = 0; - *numkeysp = 0; - while ( 1 ) - { - roguefname(fname,seed,counter); - //printf("check (%s)\n",fname); - if ( (fp= fopen(fname,"rb")) == 0 ) - break; - if ( (fsize= get_filesize(fp)) <= 0 ) - { - fclose(fp); - //printf("fsize.%ld\n",fsize); - break; - } - if ( (keystrokes= (char *)realloc(keystrokes,num+fsize)) == 0 ) - { - fprintf(stderr,"error reallocating keystrokes\n"); - fclose(fp); - return(0); - } - if ( fread(&keystrokes[num],1,fsize,fp) != fsize ) - { - fprintf(stderr,"error reading keystrokes from (%s)\n",fname); - fclose(fp); - free(keystrokes); - return(0); - } - fclose(fp); - num += fsize; - counter++; - //fprintf(stderr,"loaded %ld from (%s) total %d\n",fsize,fname,num); - } - *numkeysp = num; - return(keystrokes); -} - -int32_t rogue_replay(uint64_t seed,int32_t sleeptime) -{ - FILE *fp; char fname[1024]; char *keystrokes = 0; long fsize; int32_t i,num=0,counter = 0; struct rogue_state *rs; struct rogue_player P,*player = 0; - if ( seed == 0 ) - seed = 777; - keystrokes = rogue_keystrokesload(&num,seed,counter); - if ( num > 0 ) - { - sprintf(fname,"rogue.%llu.player",(long long)seed); - if ( (fp=fopen(fname,"rb")) != 0 ) - { - if ( fread(&P,1,sizeof(P),fp) > 0 ) - { - //printf("max size player\n"); - player = &P; - } - fclose(fp); - } - rogue_replay2(0,seed,keystrokes,num,player,sleeptime); - mvaddstr(LINES - 2, 0, (char *)"replay completed"); - endwin(); - my_exit(0); - } - if ( keystrokes != 0 ) - free(keystrokes); - return(num); -} - -int rogue(int argc, char **argv, char **envp) -{ - char *env; int lowtime; struct rogue_state *rs = &globalR; - memset(rs,0,sizeof(*rs)); - rs->guiflag = 1; - rs->sleeptime = 1; // non-zero to allow refresh() - if ( argc == 3 && strlen(argv[2]) == 64 ) - { - #ifdef _WIN32 - #ifdef _MSC_VER - rs->seed = _strtoui64(argv[1], NULL, 10); - #else - rs->seed = atol(argv[1]); // windows, but not MSVC - #endif // _MSC_VER - #else - rs->seed = atol(argv[1]); // non-windows - #endif // _WIN32 - strcpy(Gametxidstr,argv[2]); - fprintf(stderr,"setplayerdata\n"); - if ( rogue_setplayerdata(rs,Gametxidstr) < 0 ) - { - fprintf(stderr,"invalid gametxid, or already started\n"); - return(-1); - } - } else rs->seed = 777; - md_init(); - -#ifdef MASTER - /* - * Check to see if he is a wizard - */ - if (argc >= 2 && argv[1][0] == '\0') - if (strcmp(PASSWD, md_crypt(md_getpass("wizard's password: "), "mT")) == 0) - { - wizard = TRUE; - player.t_flags |= SEEMONST; - argv++; - argc--; - } - -#endif - - /* - * get home and options from environment - */ - - strncpy(home, md_gethomedir(), MAXSTR); - - strcpy(file_name, home); - strcat(file_name, "rogue.save"); - - if ((env = getenv("ROGUEOPTS")) != NULL) - parse_opts(env); - //if (env == NULL || whoami[0] == '\0') - // strucpy(whoami, md_getusername(), (int) strlen(md_getusername())); - lowtime = (int) time(NULL); -#ifdef MASTER - if (wizard && getenv("SEED") != NULL) - rs->seed = atoi(getenv("SEED")); - else -#endif - //dnum = lowtime + md_getpid(); - if ( rs != 0 ) - seed = rs->seed; - else seed = 777; - //dnum = (int)seed; - - open_score(); - - /* - * Drop setuid/setgid after opening the scoreboard file. - */ - - md_normaluser(); - - /* - * check for print-score option - */ - - md_normaluser(); /* we drop any setgid/setuid priveldges here */ - - if (argc == 2) - { - if (strcmp(argv[1], "-s") == 0) - { - noscore = TRUE; - score(rs,0, -1, 0); - exit(0); - } - else if (strcmp(argv[1], "-d") == 0) - { - rs->seed = rnd(100); /* throw away some rnd()s to break patterns */ - while (--rs->seed) - rnd(100); - purse = rnd(100) + 1; - level = rnd(100) + 1; - initscr(); - getltchars(); - death(rs,death_monst()); - exit(0); - } - } - - init_check(); /* check for legal startup */ - if (argc == 2) - if (!restore(rs,argv[1], envp)) /* Note: restore will never return */ - my_exit(1); -#ifdef MASTER - if (wizard) - printf("Hello %s, welcome to dungeon #%d", whoami, dnum); - else -#endif - printf("Hello %s, just a moment while I dig the dungeon... seed.%llu", whoami,(long long)rs->seed); - fflush(stdout); - fprintf(stderr,"rogueiterate\n"); - rogueiterate(rs); - return(0); -} - -/* - * endit: - * Exit the program abnormally. - */ - -void -endit(int sig) -{ - NOOP(sig); - fatal("Okay, bye bye!\n"); -} - -/* - * fatal: - * Exit the program, printing a message. - */ - -void -fatal(char *s) -{ - mvaddstr(LINES - 2, 0, s); - refresh(); - endwin(); - my_exit(0); -} - -/* - * rnd: - * Pick a very random number. - */ -int -rnd(int range) -{ - return range == 0 ? 0 : abs((int) RN) % range; -} - -/* - * roll: - * Roll a number of dice - */ -int -roll(int number, int sides) -{ - int dtotal = 0; - - while (number--) - dtotal += rnd(sides)+1; - return dtotal; -} - -/* - * tstp: - * Handle stop and start signals - */ - -void -tstp(int ignored) -{ - int y, x; - int oy, ox; - - NOOP(ignored); - - /* - * leave nicely - */ - getyx(curscr, oy, ox); - mvcur(0, COLS - 1, LINES - 1, 0); - endwin(); - resetltchars(); - fflush(stdout); - md_tstpsignal(); - - /* - * start back up again - */ - md_tstpresume(); - raw(); - noecho(); - keypad(stdscr,1); - playltchars(); - clearok(curscr, TRUE); - wrefresh(curscr); - getyx(curscr, y, x); - mvcur(y, x, oy, ox); - fflush(stdout); - wmove(curscr,oy,ox); -/*#ifndef __APPLE__ -#ifndef BUILD_ROGUE - curscr->_cury = oy; - curscr->_curx = ox; -#endif -#endif*/ -} - - -#ifdef _WIN32 -#ifdef _MSC_VER -void usleep(int32_t micros) -{ - if (micros < 1000) - Sleep(1); - else Sleep(micros / 1000); -} -#endif -#endif - -/* - * playit: - * The main loop of the program. Loop until the game is over, - * refreshing things and looking at the proper times. - */ - -void -playit(struct rogue_state *rs) -{ - char *opts; - - /* - * set up defaults for slow terminals - */ - - if (baudrate() <= 1200) - { - terse = TRUE; - jump = TRUE; - see_floor = FALSE; - } - - if (md_hasclreol()) - inv_type = INV_CLEAR; - - /* - * parse environment declaration of options - */ - if ((opts = getenv("ROGUEOPTS")) != NULL) - parse_opts(opts); - - - oldpos = hero; - oldrp = roomin(rs,&hero); - while (playing) - { - command(rs); // Command execution - if ( rs->guiflag == 0 ) - { - if ( rs->replaydone != 0 ) - { - if ( 0 && rs->sleeptime != 0 ) - sleep(3); - return; - } - if ( rs->sleeptime != 0 ) - usleep(rs->sleeptime); - } - else - { - if ( rs->needflush != 0 ) - { - if ( flushkeystrokes(rs,0) == 0 ) - rs->needflush = 0; - } - } - } - if ( rs->guiflag != 0 ) - flushkeystrokes(rs,1); - endit(0); -} - - - -int32_t _quit() -{ - struct rogue_state *rs = &globalR; - int oy, ox, c; - //fprintf(stderr,"inside quit(%d)\n",sig); - getyx(curscr, oy, ox); - msg(rs,"really quit?"); - //sleep(1); - if ( (c= readchar(rs)) == 'y') - { - if ( rs->guiflag != 0 ) - { - signal(SIGINT, leave); - clear(); - mvprintw(LINES - 2, 0, "You quit with %d gold pieces", purse); - move(LINES - 1, 0); - if ( rs->sleeptime != 0 ) - refresh(); - score(rs,purse, 1, 0); - flushkeystrokes(rs,1); - my_exit(0); - } - else - { - //score(rs,purse, 1, 0); - //fprintf(stderr,"done! (%c)\n",c); - } - return(1); - } - else - { - //fprintf(stderr,"'Q' answer (%c)\n",c); - move(0, 0); - clrtoeol(); - status(rs); - move(oy, ox); - if ( rs->sleeptime != 0 ) - refresh(); - mpos = 0; - count = 0; - to_death = FALSE; - return(0); - } -} - -/* - * quit: - * Have player make certain, then exit. - */ - -void quit(int sig) -{ - struct rogue_state *rs = &globalR; - int oy, ox, c; - //fprintf(stderr,"inside quit(%d)\n",sig); - if ( rs->guiflag != 0 ) - { - NOOP(sig); - - /* - * Reset the signal in case we got here via an interrupt - */ - if (!q_comm) - mpos = 0; - } - _quit(); -} - -/* - * leave: - * Leave quickly, but curteously - */ - -void -leave(int sig) -{ - static char buf[BUFSIZ]; - - NOOP(sig); - - setbuf(stdout, buf); /* throw away pending output */ - - if (!isendwin()) - { - mvcur(0, COLS - 1, LINES - 1, 0); - endwin(); - } - - putchar('\n'); - my_exit(0); -} - -/* - * shell: - * Let them escape for a while - */ - -void -shell(struct rogue_state *rs) -{ - if ( rs != 0 && rs->guiflag != 0 ) - { - /* - * Set the terminal back to original mode - */ - move(LINES-1, 0); - refresh(); - endwin(); - resetltchars(); - putchar('\n'); - in_shell = TRUE; - after = FALSE; - fflush(stdout); - /* - * Fork and do a shell - */ - md_shellescape(); - - printf("\n[Press return to continue]"); - fflush(stdout); - noecho(); - raw(); - keypad(stdscr,1); - playltchars(); - in_shell = FALSE; - wait_for(rs,'\n'); - clearok(stdscr, TRUE); - } - else fprintf(stderr,"no shell in the blockchain\n"); -} - -/* - * my_exit: - * Leave the process properly - */ - -void -my_exit(int st) -{ - uint32_t counter; - resetltchars(); - if ( globalR.guiflag != 0 || globalR.sleeptime != 0 ) - exit(st); - else if ( counter++ < 10 ) - { - fprintf(stderr,"would have exit.(%d) sleeptime.%d\n",st,globalR.sleeptime); - globalR.replaydone = 1; - } -} - diff --git a/src/cc/rogue/rogue.cat b/src/cc/rogue/rogue.cat deleted file mode 100644 index 66d9605a2..000000000 --- a/src/cc/rogue/rogue.cat +++ /dev/null @@ -1,61 +0,0 @@ -ROGUE(6) ROGUE(6) - - - -NAME - rogue - Exploring The Dungeons of Doom - -SYNOPSIS - rogue [ -r ] [ save_file ] [ -s ] [ -d ] - -DESCRIPTION - Rogue is a computer fantasy game with a new twist. It is crt oriented - and the object of the game is to survive the attacks of various mon- - sters and get a lot of gold, rather than the puzzle solving orientation - of most computer fantasy games. - - To get started you really only need to know two commands. The command - ? will give you a list of the available commands and the command / - will identify the things you see on the screen. - - To win the game (as opposed to merely playing to beat other people's - high scores) you must locate the Amulet of Yendor which is somewhere - below the 20th level of the dungeon and get it out. Nobody has - achieved this yet and if somebody does, they will probably go down in - history as a hero among heroes. - - When the game ends, either by your death, when you quit, or if you (by - some miracle) manage to win, rogue will give you a list of the top-ten - scorers. The scoring is based entirely upon how much gold you get. - There is a 10% penalty for getting yourself killed. - - If save_file is specified, rogue will be restored from the specified - saved game file. If the -r option is used, the save game file is pre- - sumed to be the default. - - The -s option will print out the list of scores. - - The -d option will kill you and try to add you to the score file. - - For more detailed directions, read the document A Guide to the Dungeons - of Doom. - -AUTHORS - Michael C. Toy, Kenneth C. R. C. Arnold, Glenn Wichman - -FILES - rogue.scr Score file - ~/rogue.save Default save file - -SEE ALSO - Michael C. Toy and Kenneth C. R. C. Arnold, A guide to the Dungeons of - Doom - -BUGS - Probably infinite (although countably infinite). However, that Ice - Monsters sometimes transfix you permanently is not a bug. It's a fea- - ture. - - - -4th Berkeley Distribution May 6, 1986 ROGUE(6) diff --git a/src/cc/rogue/rogue.cat.in b/src/cc/rogue/rogue.cat.in deleted file mode 100644 index 8dbef73c1..000000000 --- a/src/cc/rogue/rogue.cat.in +++ /dev/null @@ -1,61 +0,0 @@ -ROGUE(6) ROGUE(6) - - - -NAME - rogue - Exploring The Dungeons of Doom - -SYNOPSIS - @PROGRAM@ [ -r ] [ save_file ] [ -s ] [ -d ] - -DESCRIPTION - Rogue is a computer fantasy game with a new twist. It is crt oriented - and the object of the game is to survive the attacks of various mon- - sters and get a lot of gold, rather than the puzzle solving orientation - of most computer fantasy games. - - To get started you really only need to know two commands. The command - ? will give you a list of the available commands and the command / - will identify the things you see on the screen. - - To win the game (as opposed to merely playing to beat other people's - high scores) you must locate the Amulet of Yendor which is somewhere - below the 20th level of the dungeon and get it out. Nobody has - achieved this yet and if somebody does, they will probably go down in - history as a hero among heroes. - - When the game ends, either by your death, when you quit, or if you (by - some miracle) manage to win, rogue will give you a list of the top-ten - scorers. The scoring is based entirely upon how much gold you get. - There is a 10% penalty for getting yourself killed. - - If save_file is specified, rogue will be restored from the specified - saved game file. If the -r option is used, the save game file is pre- - sumed to be the default. - - The -s option will print out the list of scores. - - The -d option will kill you and try to add you to the score file. - - For more detailed directions, read the document A Guide to the Dungeons - of Doom. - -AUTHORS - Michael C. Toy, Kenneth C. R. C. Arnold, Glenn Wichman - -FILES - @SCOREFILE@ Score file - ~/rogue.save Default save file - -SEE ALSO - Michael C. Toy and Kenneth C. R. C. Arnold, A guide to the Dungeons of - Doom - -BUGS - Probably infinite (although countably infinite). However, that Ice - Monsters sometimes transfix you permanently is not a bug. It's a fea- - ture. - - - -4th Berkeley Distribution May 6, 1986 ROGUE(6) diff --git a/src/cc/rogue/rogue.desktop b/src/cc/rogue/rogue.desktop deleted file mode 100644 index 74f9518c7..000000000 --- a/src/cc/rogue/rogue.desktop +++ /dev/null @@ -1,11 +0,0 @@ -[Desktop Entry] -Encoding=UTF-8 -Name=Rogue -GenericName=Rogue -Comment=The original curses-based adventure game -Exec=rogue -Icon=rogue.png -Terminal=true -Type=Application -Categories=Game;RolePlaying; -Version=1.0 diff --git a/src/cc/rogue/rogue.doc b/src/cc/rogue/rogue.doc deleted file mode 100644 index 684738d11..000000000 --- a/src/cc/rogue/rogue.doc +++ /dev/null @@ -1,858 +0,0 @@ - - - - - - - - A Guide to the Dungeons of Doom - - - Michael C. Toy - Kenneth C. R. C. Arnold - - - Computer Systems Research Group - Department of Electrical Engineering and Computer Science - University of California - Berkeley, California 94720 - - - - - ABSTRACT - - Rogue is a visual CRT based fantasy game which runs - under the UNIX timesharing system. This paper de- - scribes how to play rogue, and gives a few hints for - those who might otherwise get lost in the Dungeons - of Doom. - - - - -1. Introduction - - You have just finished your years as a student at the -local fighter's guild. After much practice and sweat you -have finally completed your training and are ready to embark -upon a perilous adventure. As a test of your skills, the -local guildmasters have sent you into the Dungeons of Doom. -Your task is to return with the Amulet of Yendor. Your -reward for the completion of this task will be a full mem- -bership in the local guild. In addition, you are allowed to -keep all the loot you bring back from the dungeons. - - In preparation for your journey, you are given an -enchanted mace, a bow, and a quiver of arrows taken from a -dragon's hoard in the far off Dark Mountains. You are also -outfitted with elf-crafted armor and given enough food to -reach the dungeons. You say goodbye to family and friends -for what may be the last time and head up the road. - - You set out on your way to the dungeons and after sev- -eral days of uneventful travel, you see the ancient ruins -that mark the entrance to the Dungeons of Doom. It is late -at night, so you make camp at the entrance and spend the -____________________ - UNIX is a trademark of Bell Laboratories - - - - - - - - - - - - -USD:33-2 A Guide to the Dungeons of Doom - - -night sleeping under the open skies. In the morning you -gather your weapons, put on your armor, eat what is almost -your last food, and enter the dungeons. - -2. What is going on here? - - You have just begun a game of rogue. Your goal is to -grab as much treasure as you can, find the Amulet of Yendor, -and get out of the Dungeons of Doom alive. On the screen, a -map of where you have been and what you have seen on the -current dungeon level is kept. As you explore more of the -level, it appears on the screen in front of you. - - Rogue differs from most computer fantasy games in that -it is screen oriented. Commands are all one or two -keystrokes1 and the results of your commands are displayed -graphically on the screen rather than being explained in -words.2 - - Another major difference between rogue and other com- -puter fantasy games is that once you have solved all the -puzzles in a standard fantasy game, it has lost most of its -excitement and it ceases to be fun. Rogue, on the other -hand, generates a new dungeon every time you play it and -even the author finds it an entertaining and exciting game. - -3. What do all those things on the screen mean? - - In order to understand what is going on in rogue you -have to first get some grasp of what rogue is doing with the -screen. The rogue screen is intended to replace the "You -can see ..." descriptions of standard fantasy games. Figure -1 is a sample of what a rogue screen might look like. - -3.1. The bottom line - - At the bottom line of the screen are a few pieces of -cryptic information describing your current status. Here is -an explanation of what these things mean: - -Level This number indicates how deep you have gone in the - dungeon. It starts at one and goes up as you go - deeper into the dungeon. - -Gold The number of gold pieces you have managed to find - and keep with you so far. -____________________ - 1 As opposed to pseudo English sentences. - 2 A minimum screen size of 24 lines by 80 columns is re- -quired. If the screen is larger, only the 24x80 section -will be used for the map. - - - - - - - - - - - - -A Guide to the Dungeons of Doom USD:33-3 - - - -____________________________________________________________ - - - ------------ - |..........+ - |..@....]..| - |....B.....| - |..........| - -----+------ - - - -Level: 1 Gold: 0 Hp: 12(12) Str: 16(16) Arm: 4 Exp: 1/0 - - Figure 1 -____________________________________________________________ - - -Hp Your current and maximum health points. Health - points indicate how much damage you can take before - you die. The more you get hit in a fight, the lower - they get. You can regain health points by resting. - The number in parentheses is the maximum number your - health points can reach. - -Str Your current strength and maximum ever strength. - This can be any integer less than or equal to 31, or - greater than or equal to three. The higher the num- - ber, the stronger you are. The number in the paren- - theses is the maximum strength you have attained so - far this game. - -Arm Your current armor protection. This number indicates - how effective your armor is in stopping blows from - unfriendly creatures. The higher this number is, the - more effective the armor. - -Exp These two numbers give your current experience level - and experience points. As you do things, you gain - experience points. At certain experience point - totals, you gain an experience level. The more expe- - rienced you are, the better you are able to fight and - to withstand magical attacks. - -3.2. The top line - - The top line of the screen is reserved for printing -messages that describe things that are impossible to repre- -sent visually. If you see a "--More--" on the top line, -this means that rogue wants to print another message on the -screen, but it wants to make certain that you have read the -one that is there first. To read the next message, just - - - - - - - - - - -USD:33-4 A Guide to the Dungeons of Doom - - -type a space. - -3.3. The rest of the screen - - The rest of the screen is the map of the level as you -have explored it so far. Each symbol on the screen repre- -sents something. Here is a list of what the various symbols -mean: - -@ This symbol represents you, the adventurer. - --| These symbols represent the walls of rooms. - -+ A door to/from a room. - -. The floor of a room. - -# The floor of a passage between rooms. - -* A pile or pot of gold. - -) A weapon of some sort. - -] A piece of armor. - -! A flask containing a magic potion. - -? A piece of paper, usually a magic scroll. - -= A ring with magic properties - -/ A magical staff or wand - -^ A trap, watch out for these. - -% A staircase to other levels - -: A piece of food. - -A-Z The uppercase letters represent the various inhabitants - of the Dungeons of Doom. Watch out, they can be nasty - and vicious. - -4. Commands - - Commands are given to rogue by typing one or two char- -acters. Most commands can be preceded by a count to repeat -them (e.g. typing "10s" will do ten searches). Commands for -which counts make no sense have the count ignored. To can- -cel a count or a prefix, type . The list of com- -mands is rather long, but it can be read at any time during -the game with the "?" command. Here it is for reference, -with a short explanation of each command. - - - - - - - - - - -A Guide to the Dungeons of Doom USD:33-5 - - -? The help command. Asks for a character to give help - on. If you type a "*", it will list all the commands, - otherwise it will explain what the character you typed - does. - -/ This is the "What is that on the screen?" command. A - "/" followed by any character that you see on the - level, will tell you what that character is. For - instance, typing "/@" will tell you that the "@" symbol - represents you, the player. - -h, H, ^H - Move left. You move one space to the left. If you use - upper case "h", you will continue to move left until - you run into something. This works for all movement - commands (e.g. "L" means run in direction "l") If you - use the "control" "h", you will continue moving in the - specified direction until you pass something interest- - ing or run into a wall. You should experiment with - this, since it is a very useful command, but very dif- - ficult to describe. This also works for all movement - commands. - -j Move down. - -k Move up. - -l Move right. - -y Move diagonally up and left. - -u Move diagonally up and right. - -b Move diagonally down and left. - -n Move diagonally down and right. - -t Throw an object. This is a prefix command. When fol- - lowed with a direction it throws an object in the spec- - ified direction. (e.g. type "th" to throw something to - the left.) - -f Fight until someone dies. When followed with a direc- - tion this will force you to fight the creature in that - direction until either you or it bites the big one. - -m Move onto something without picking it up. This will - move you one space in the direction you specify and, if - there is an object there you can pick up, it won't do - it. - -z Zap prefix. Point a staff or wand in a given direction - and fire it. Even non-directional staves must be - - - - - - - - - - -USD:33-6 A Guide to the Dungeons of Doom - - - pointed in some direction to be used. - -^ Identify trap command. If a trap is on your map and - you can't remember what type it is, you can get rogue - to remind you by getting next to it and typing "^" fol- - lowed by the direction that would move you on top of - it. - -s Search for traps and secret doors. Examine each space - immediately adjacent to you for the existence of a trap - or secret door. There is a large chance that even if - there is something there, you won't find it, so you - might have to search a while before you find something. - -> Climb down a staircase to the next level. Not surpris- - ingly, this can only be done if you are standing on - staircase. - -< Climb up a staircase to the level above. This can't be - done without the Amulet of Yendor in your possession. - -. Rest. This is the "do nothing" command. This is good - for waiting and healing. - -, Pick up something. This picks up whatever you are cur- - rently standing on, if you are standing on anything at - all. - -i Inventory. List what you are carrying in your pack. - -I Selective inventory. Tells you what a single item in - your pack is. - -q Quaff one of the potions you are carrying. - -r Read one of the scrolls in your pack. - -e Eat food from your pack. - -w Wield a weapon. Take a weapon out of your pack and - carry it for use in combat, replacing the one you are - currently using (if any). - -W Wear armor. You can only wear one suit of armor at a - time. This takes extra time. - -T Take armor off. You can't remove armor that is cursed. - This takes extra time. - -P Put on a ring. You can wear only two rings at a time - (one on each hand). If you aren't wearing any rings, - this command will ask you which hand you want to wear - it on, otherwise, it will place it on the unused hand. - - - - - - - - - - -A Guide to the Dungeons of Doom USD:33-7 - - - The program assumes that you wield your sword in your - right hand. - -R Remove a ring. If you are only wearing one ring, this - command takes it off. If you are wearing two, it will - ask you which one you wish to remove, - -d Drop an object. Take something out of your pack and - leave it lying on the floor. Only one object can - occupy each space. You cannot drop a cursed object at - all if you are wielding or wearing it. - -c Call an object something. If you have a type of object - in your pack which you wish to remember something - about, you can use the call command to give a name to - that type of object. This is usually used when you - figure out what a potion, scroll, ring, or staff is - after you pick it up, or when you want to remember - which of those swords in your pack you were wielding. - -D Print out which things you've discovered something - about. This command will ask you what type of thing - you are interested in. If you type the character for a - given type of object (e.g. "!" for potion) it will - tell you which kinds of that type of object you've dis- - covered (i.e., figured out what they are). This com- - mand works for potions, scrolls, rings, and staves and - wands. - -o Examine and set options. This command is further - explained in the section on options. - -^R Redraws the screen. Useful if spurious messages or - transmission errors have messed up the display. - -^P Print last message. Useful when a message disappears - before you can read it. This only repeats the last - message that was not a mistyped command so that you - don't loose anything by accidentally typing the wrong - character instead of ^P. - - - Cancel a command, prefix, or count. - -! Escape to a shell for some commands. - -Q Quit. Leave the game. - -S Save the current game in a file. It will ask you - whether you wish to use the default save file. Caveat: - Rogue won't let you start up a copy of a saved game, - and it removes the save file as soon as you start up a - restored game. This is to prevent people from saving a - - - - - - - - - - -USD:33-8 A Guide to the Dungeons of Doom - - - game just before a dangerous position and then restart- - ing it if they die. To restore a saved game, give the - file name as an argument to rogue. As in - % rogue save_file - - To restart from the default save file (see below), run - % rogue -r - -v Prints the program version number. - -) Print the weapon you are currently wielding - -] Print the armor you are currently wearing - -= Print the rings you are currently wearing - -@ Reprint the status line on the message line - -5. Rooms - - Rooms in the dungeons are either lit or dark. If you -walk into a lit room, the entire room will be drawn on the -screen as soon as you enter. If you walk into a dark room, -it will only be displayed as you explore it. Upon leaving a -room, all monsters inside the room are erased from the -screen. In the darkness you can only see one space in all -directions around you. A corridor is always dark. - -6. Fighting - - If you see a monster and you wish to fight it, just -attempt to run into it. Many times a monster you find will -mind its own business unless you attack it. It is often the -case that discretion is the better part of valor. - -7. Objects you can find - - When you find something in the dungeon, it is common to -want to pick the object up. This is accomplished in rogue -by walking over the object (unless you use the "m" prefix, -see above). If you are carrying too many things, the pro- -gram will tell you and it won't pick up the object, other- -wise it will add it to your pack and tell you what you just -picked up. - - Many of the commands that operate on objects must -prompt you to find out which object you want to use. If you -change your mind and don't want to do that command after -all, just type an and the command will be aborted. - - Some objects, like armor and weapons, are easily dif- -ferentiated. Others, like scrolls and potions, are given -labels which vary according to type. During a game, any two - - - - - - - - - - -A Guide to the Dungeons of Doom USD:33-9 - - -of the same kind of object with the same label are the same -type. However, the labels will vary from game to game. - - When you use one of these labeled objects, if its -effect is obvious, rogue will remember what it is for you. -If it's effect isn't extremely obvious you will be asked -what you want to scribble on it so you will recognize it -later, or you can use the "call" command (see above). - -7.1. Weapons - - Some weapons, like arrows, come in bunches, but most -come one at a time. In order to use a weapon, you must -wield it. To fire an arrow out of a bow, you must first -wield the bow, then throw the arrow. You can only wield one -weapon at a time, but you can't change weapons if the one -you are currently wielding is cursed. The commands to use -weapons are "w" (wield) and "t" (throw). - -7.2. Armor - - There are various sorts of armor lying around in the -dungeon. Some of it is enchanted, some is cursed, and some -is just normal. Different armor types have different armor -protection. The higher the armor protection, the more pro- -tection the armor affords against the blows of monsters. -Here is a list of the various armor types and their normal -armor protection: - - - +-----------------------------------------+ - | Type Protection | - |None 0 | - |Leather armor 2 | - |Studded leather / Ring mail 3 | - |Scale mail 4 | - |Chain mail 5 | - |Banded mail / Splint mail 6 | - |Plate mail 7 | - +-----------------------------------------+ - - -If a piece of armor is enchanted, its armor protection will -be higher than normal. If a suit of armor is cursed, its -armor protection will be lower, and you will not be able to -remove it. However, not all armor with a protection that is -lower than normal is cursed. - - The commands to use weapons are "W" (wear) and "T" -(take off). - - - - - - - - - - - - - -USD:33-10 A Guide to the Dungeons of Doom - - -7.3. Scrolls - - Scrolls come with titles in an unknown tongue3. After -you read a scroll, it disappears from your pack. The com- -mand to use a scroll is "r" (read). - -7.4. Potions - - Potions are labeled by the color of the liquid inside -the flask. They disappear after being quaffed. The command -to use a scroll is "q" (quaff). - -7.5. Staves and Wands - - Staves and wands do the same kinds of things. Staves -are identified by a type of wood; wands by a type of metal -or bone. They are generally things you want to do to some- -thing over a long distance, so you must point them at what -you wish to affect to use them. Some staves are not -affected by the direction they are pointed, though. Staves -come with multiple magic charges, the number being random, -and when they are used up, the staff is just a piece of wood -or metal. - - The command to use a wand or staff is "z" (zap) - -7.6. Rings - - Rings are very useful items, since they are relatively -permanent magic, unlike the usually fleeting effects of -potions, scrolls, and staves. Of course, the bad rings are -also more powerful. Most rings also cause you to use up -food more rapidly, the rate varying with the type of ring. -Rings are differentiated by their stone settings. The com- -mands to use rings are "P" (put on) and "R" (remove). - -7.7. Food - - Food is necessary to keep you going. If you go too -long without eating you will faint, and eventually die of -starvation. The command to use food is "e" (eat). - -8. Options - - Due to variations in personal tastes and conceptions of -the way rogue should do things, there are a set of options -you can set that cause rogue to behave in various different -____________________ - 3 Actually, it's a dialect spoken only by the twenty-sev- -en members of a tribe in Outer Mongolia, but you're not sup- -posed to know that. - - - - - - - - - - - - -A Guide to the Dungeons of Doom USD:33-11 - - -ways. - -8.1. Setting the options - - There are two ways to set the options. The first is -with the "o" command of rogue; the second is with the -"ROGUEOPTS" environment variable4. - -8.1.1. Using the `o' command - - When you type "o" in rogue, it clears the screen and -displays the current settings for all the options. It then -places the cursor by the value of the first option and waits -for you to type. You can type a which means to go -to the next option, a "-" which means to go to the previous -option, an which means to return to the game, or -you can give the option a value. For boolean options this -merely involves typing "t" for true or "f" for false. For -string options, type the new value followed by a . - -8.1.2. Using the ROGUEOPTS variable - - The ROGUEOPTS variable is a string containing a comma -separated list of initial values for the various options. -Boolean variables can be turned on by listing their name or -turned off by putting a "no" in front of the name. Thus to -set up an environment variable so that jump is on, terse is -off, and the name is set to "Blue Meanie", use the command - % setenv ROGUEOPTS "jump,noterse,name=Blue Meanie"5 - -8.2. Option list - - Here is a list of the options and an explanation of -what each one is for. The default value for each is -enclosed in square brackets. For character string options, -input over fifty characters will be ignored. - -terse [noterse] - Useful for those who are tired of the sometimes lengthy - messages of rogue. This is a useful option for playing - on slow terminals, so this option defaults to terse if - you are on a slow (1200 baud or under) terminal. - - -____________________ - 4 On Version 6 systems, there is no equivalent of the -ROGUEOPTS feature. - 5 For those of you who use the Bourne shell sh (1), the -commands would be - $ ROGUEOPTS="jump,noterse,name=Blue Meanie" - $ export ROGUEOPTS - - - - - - - - - - - - -USD:33-12 A Guide to the Dungeons of Doom - - -jump [nojump] - If this option is set, running moves will not be dis- - played until you reach the end of the move. This saves - considerable cpu and display time. This option - defaults to jump if you are using a slow terminal. - -flush [noflush] - All typeahead is thrown away after each round of bat- - tle. This is useful for those who type far ahead and - then watch in dismay as a Bat kills them. - -seefloor [seefloor] - Display the floor around you on the screen as you move - through dark rooms. Due to the amount of characters - generated, this option defaults to noseefloor if you - are using a slow terminal. - -passgo [nopassgo] - Follow turnings in passageways. If you run in a pas- - sage and you run into stone or a wall, rogue will see - if it can turn to the right or left. If it can only - turn one way, it will turn that way. If it can turn - either or neither, it will stop. This algorithm can - sometimes lead to slightly confusing occurrences which - is why it defaults to nopassgo. - -tombstone [tombstone] - Print out the tombstone at the end if you get killed. - This is nice but slow, so you can turn it off if you - like. - -inven [overwrite] - Inventory type. This can have one of three values: - overwrite, slow, or clear. With overwrite the top - lines of the map are overwritten with the list when - inventory is requested or when "Which item do you wish - to . . .? " questions are answered with a "*". How- - ever, if the list is longer than a screenful, the - screen is cleared. With slow, lists are displayed one - item at a time on the top of the screen, and with - clear, the screen is cleared, the list is displayed, - and then the dungeon level is re-displayed. Due to - speed considerations, clear is the default for termi- - nals without clear-to-end-of-line capabilities. - -name [account name] - This is the name of your character. It is used if you - get on the top ten scorer's list. - -fruit [slime-mold] - This should hold the name of a fruit that you enjoy - eating. It is basically a whimsey that rogue uses in a - couple of places. - - - - - - - - - - -A Guide to the Dungeons of Doom USD:33-13 - - -file [~/rogue.save] - The default file name for saving the game. If your - phone is hung up by accident, rogue will automatically - save the game in this file. The file name may start - with the special character "~" which expands to be your - home directory. - -9. Scoring - - Rogue usually maintains a list of the top scoring peo- -ple or scores on your machine. Depending on how it is set -up, it can post either the top scores or the top players. -In the latter case, each account on the machine can post -only one non-winning score on this list. If you score -higher than someone else on this list, or better your previ- -ous score on the list, you will be inserted in the proper -place under your current name. How many scores are kept can -also be set up by whoever installs it on your machine. - - If you quit the game, you get out with all of your gold -intact. If, however, you get killed in the Dungeons of -Doom, your body is forwarded to your next-of-kin, along with -90% of your gold; ten percent of your gold is kept by the -Dungeons' wizard as a fee6. This should make you consider -whether you want to take one last hit at that monster and -possibly live, or quit and thus stop with whatever you have. -If you quit, you do get all your gold, but if you swing and -live, you might find more. - - If you just want to see what the current top play- -ers/games list is, you can type - % rogue -s - -10. Acknowledgements - - Rogue was originally conceived of by Glenn Wichman and -Michael Toy. Ken Arnold and Michael Toy then smoothed out -the user interface, and added jillions of new features. We -would like to thank Bob Arnold, Michelle Busch, Andy -Hatcher, Kipp Hickman, Mark Horton, Daniel Jensen, Bill Joy, -Joe Kalash, Steve Maurer, Marty McNary, Jan Miller, and -Scott Nelson for their ideas and assistance; and also the -teeming multitudes who graciously ignored work, school, and -social life to play rogue and send us bugs, complaints, sug- -gestions, and just plain flames. And also Mom. - - - -____________________ - 6 The Dungeon's wizard is named Wally the Wonder Badger. -Invocations should be accompanied by a sizable donation. - - - - - - - - diff --git a/src/cc/rogue/rogue.doc.in b/src/cc/rogue/rogue.doc.in deleted file mode 100644 index 3031d0d24..000000000 --- a/src/cc/rogue/rogue.doc.in +++ /dev/null @@ -1,858 +0,0 @@ - - - - - - - - A Guide to the Dungeons of Doom - - - Michael C. Toy - Kenneth C. R. C. Arnold - - - Computer Systems Research Group - Department of Electrical Engineering and Computer Science - University of California - Berkeley, California 94720 - - - - - ABSTRACT - - Rogue is a visual CRT based fantasy game which runs - under the UNIX timesharing system. This paper de- - scribes how to play rogue, and gives a few hints for - those who might otherwise get lost in the Dungeons - of Doom. - - - - -1. Introduction - - You have just finished your years as a student at the -local fighter's guild. After much practice and sweat you -have finally completed your training and are ready to embark -upon a perilous adventure. As a test of your skills, the -local guildmasters have sent you into the Dungeons of Doom. -Your task is to return with the Amulet of Yendor. Your -reward for the completion of this task will be a full mem- -bership in the local guild. In addition, you are allowed to -keep all the loot you bring back from the dungeons. - - In preparation for your journey, you are given an -enchanted mace, a bow, and a quiver of arrows taken from a -dragon's hoard in the far off Dark Mountains. You are also -outfitted with elf-crafted armor and given enough food to -reach the dungeons. You say goodbye to family and friends -for what may be the last time and head up the road. - - You set out on your way to the dungeons and after sev- -eral days of uneventful travel, you see the ancient ruins -that mark the entrance to the Dungeons of Doom. It is late -at night, so you make camp at the entrance and spend the -____________________ - UNIX is a trademark of Bell Laboratories - - - - - - - - - - - - -USD:33-2 A Guide to the Dungeons of Doom - - -night sleeping under the open skies. In the morning you -gather your weapons, put on your armor, eat what is almost -your last food, and enter the dungeons. - -2. What is going on here? - - You have just begun a game of rogue. Your goal is to -grab as much treasure as you can, find the Amulet of Yendor, -and get out of the Dungeons of Doom alive. On the screen, a -map of where you have been and what you have seen on the -current dungeon level is kept. As you explore more of the -level, it appears on the screen in front of you. - - Rogue differs from most computer fantasy games in that -it is screen oriented. Commands are all one or two -keystrokes1 and the results of your commands are displayed -graphically on the screen rather than being explained in -words.2 - - Another major difference between rogue and other com- -puter fantasy games is that once you have solved all the -puzzles in a standard fantasy game, it has lost most of its -excitement and it ceases to be fun. Rogue, on the other -hand, generates a new dungeon every time you play it and -even the author finds it an entertaining and exciting game. - -3. What do all those things on the screen mean? - - In order to understand what is going on in rogue you -have to first get some grasp of what rogue is doing with the -screen. The rogue screen is intended to replace the "You -can see ..." descriptions of standard fantasy games. Figure -1 is a sample of what a rogue screen might look like. - -3.1. The bottom line - - At the bottom line of the screen are a few pieces of -cryptic information describing your current status. Here is -an explanation of what these things mean: - -Level This number indicates how deep you have gone in the - dungeon. It starts at one and goes up as you go - deeper into the dungeon. - -Gold The number of gold pieces you have managed to find - and keep with you so far. -____________________ - 1 As opposed to pseudo English sentences. - 2 A minimum screen size of 24 lines by 80 columns is re- -quired. If the screen is larger, only the 24x80 section -will be used for the map. - - - - - - - - - - - - -A Guide to the Dungeons of Doom USD:33-3 - - - -____________________________________________________________ - - - ------------ - |..........+ - |..@....]..| - |....B.....| - |..........| - -----+------ - - - -Level: 1 Gold: 0 Hp: 12(12) Str: 16(16) Arm: 4 Exp: 1/0 - - Figure 1 -____________________________________________________________ - - -Hp Your current and maximum health points. Health - points indicate how much damage you can take before - you die. The more you get hit in a fight, the lower - they get. You can regain health points by resting. - The number in parentheses is the maximum number your - health points can reach. - -Str Your current strength and maximum ever strength. - This can be any integer less than or equal to 31, or - greater than or equal to three. The higher the num- - ber, the stronger you are. The number in the paren- - theses is the maximum strength you have attained so - far this game. - -Arm Your current armor protection. This number indicates - how effective your armor is in stopping blows from - unfriendly creatures. The higher this number is, the - more effective the armor. - -Exp These two numbers give your current experience level - and experience points. As you do things, you gain - experience points. At certain experience point - totals, you gain an experience level. The more expe- - rienced you are, the better you are able to fight and - to withstand magical attacks. - -3.2. The top line - - The top line of the screen is reserved for printing -messages that describe things that are impossible to repre- -sent visually. If you see a "--More--" on the top line, -this means that rogue wants to print another message on the -screen, but it wants to make certain that you have read the -one that is there first. To read the next message, just - - - - - - - - - - -USD:33-4 A Guide to the Dungeons of Doom - - -type a space. - -3.3. The rest of the screen - - The rest of the screen is the map of the level as you -have explored it so far. Each symbol on the screen repre- -sents something. Here is a list of what the various symbols -mean: - -@ This symbol represents you, the adventurer. - --| These symbols represent the walls of rooms. - -+ A door to/from a room. - -. The floor of a room. - -# The floor of a passage between rooms. - -* A pile or pot of gold. - -) A weapon of some sort. - -] A piece of armor. - -! A flask containing a magic potion. - -? A piece of paper, usually a magic scroll. - -= A ring with magic properties - -/ A magical staff or wand - -^ A trap, watch out for these. - -% A staircase to other levels - -: A piece of food. - -A-Z The uppercase letters represent the various inhabitants - of the Dungeons of Doom. Watch out, they can be nasty - and vicious. - -4. Commands - - Commands are given to rogue by typing one or two char- -acters. Most commands can be preceded by a count to repeat -them (e.g. typing "10s" will do ten searches). Commands for -which counts make no sense have the count ignored. To can- -cel a count or a prefix, type . The list of com- -mands is rather long, but it can be read at any time during -the game with the "?" command. Here it is for reference, -with a short explanation of each command. - - - - - - - - - - -A Guide to the Dungeons of Doom USD:33-5 - - -? The help command. Asks for a character to give help - on. If you type a "*", it will list all the commands, - otherwise it will explain what the character you typed - does. - -/ This is the "What is that on the screen?" command. A - "/" followed by any character that you see on the - level, will tell you what that character is. For - instance, typing "/@" will tell you that the "@" symbol - represents you, the player. - -h, H, ^H - Move left. You move one space to the left. If you use - upper case "h", you will continue to move left until - you run into something. This works for all movement - commands (e.g. "L" means run in direction "l") If you - use the "control" "h", you will continue moving in the - specified direction until you pass something interest- - ing or run into a wall. You should experiment with - this, since it is a very useful command, but very dif- - ficult to describe. This also works for all movement - commands. - -j Move down. - -k Move up. - -l Move right. - -y Move diagonally up and left. - -u Move diagonally up and right. - -b Move diagonally down and left. - -n Move diagonally down and right. - -t Throw an object. This is a prefix command. When fol- - lowed with a direction it throws an object in the spec- - ified direction. (e.g. type "th" to throw something to - the left.) - -f Fight until someone dies. When followed with a direc- - tion this will force you to fight the creature in that - direction until either you or it bites the big one. - -m Move onto something without picking it up. This will - move you one space in the direction you specify and, if - there is an object there you can pick up, it won't do - it. - -z Zap prefix. Point a staff or wand in a given direction - and fire it. Even non-directional staves must be - - - - - - - - - - -USD:33-6 A Guide to the Dungeons of Doom - - - pointed in some direction to be used. - -^ Identify trap command. If a trap is on your map and - you can't remember what type it is, you can get rogue - to remind you by getting next to it and typing "^" fol- - lowed by the direction that would move you on top of - it. - -s Search for traps and secret doors. Examine each space - immediately adjacent to you for the existence of a trap - or secret door. There is a large chance that even if - there is something there, you won't find it, so you - might have to search a while before you find something. - -> Climb down a staircase to the next level. Not surpris- - ingly, this can only be done if you are standing on - staircase. - -< Climb up a staircase to the level above. This can't be - done without the Amulet of Yendor in your possession. - -. Rest. This is the "do nothing" command. This is good - for waiting and healing. - -, Pick up something. This picks up whatever you are cur- - rently standing on, if you are standing on anything at - all. - -i Inventory. List what you are carrying in your pack. - -I Selective inventory. Tells you what a single item in - your pack is. - -q Quaff one of the potions you are carrying. - -r Read one of the scrolls in your pack. - -e Eat food from your pack. - -w Wield a weapon. Take a weapon out of your pack and - carry it for use in combat, replacing the one you are - currently using (if any). - -W Wear armor. You can only wear one suit of armor at a - time. This takes extra time. - -T Take armor off. You can't remove armor that is cursed. - This takes extra time. - -P Put on a ring. You can wear only two rings at a time - (one on each hand). If you aren't wearing any rings, - this command will ask you which hand you want to wear - it on, otherwise, it will place it on the unused hand. - - - - - - - - - - -A Guide to the Dungeons of Doom USD:33-7 - - - The program assumes that you wield your sword in your - right hand. - -R Remove a ring. If you are only wearing one ring, this - command takes it off. If you are wearing two, it will - ask you which one you wish to remove, - -d Drop an object. Take something out of your pack and - leave it lying on the floor. Only one object can - occupy each space. You cannot drop a cursed object at - all if you are wielding or wearing it. - -c Call an object something. If you have a type of object - in your pack which you wish to remember something - about, you can use the call command to give a name to - that type of object. This is usually used when you - figure out what a potion, scroll, ring, or staff is - after you pick it up, or when you want to remember - which of those swords in your pack you were wielding. - -D Print out which things you've discovered something - about. This command will ask you what type of thing - you are interested in. If you type the character for a - given type of object (e.g. "!" for potion) it will - tell you which kinds of that type of object you've dis- - covered (i.e., figured out what they are). This com- - mand works for potions, scrolls, rings, and staves and - wands. - -o Examine and set options. This command is further - explained in the section on options. - -^R Redraws the screen. Useful if spurious messages or - transmission errors have messed up the display. - -^P Print last message. Useful when a message disappears - before you can read it. This only repeats the last - message that was not a mistyped command so that you - don't loose anything by accidentally typing the wrong - character instead of ^P. - - - Cancel a command, prefix, or count. - -! Escape to a shell for some commands. - -Q Quit. Leave the game. - -S Save the current game in a file. It will ask you - whether you wish to use the default save file. Caveat: - Rogue won't let you start up a copy of a saved game, - and it removes the save file as soon as you start up a - restored game. This is to prevent people from saving a - - - - - - - - - - -USD:33-8 A Guide to the Dungeons of Doom - - - game just before a dangerous position and then restart- - ing it if they die. To restore a saved game, give the - file name as an argument to rogue. As in - % rogue save_file - - To restart from the default save file (see below), run - % rogue -r - -v Prints the program version number. - -) Print the weapon you are currently wielding - -] Print the armor you are currently wearing - -= Print the rings you are currently wearing - -@ Reprint the status line on the message line - -5. Rooms - - Rooms in the dungeons are either lit or dark. If you -walk into a lit room, the entire room will be drawn on the -screen as soon as you enter. If you walk into a dark room, -it will only be displayed as you explore it. Upon leaving a -room, all monsters inside the room are erased from the -screen. In the darkness you can only see one space in all -directions around you. A corridor is always dark. - -6. Fighting - - If you see a monster and you wish to fight it, just -attempt to run into it. Many times a monster you find will -mind its own business unless you attack it. It is often the -case that discretion is the better part of valor. - -7. Objects you can find - - When you find something in the dungeon, it is common to -want to pick the object up. This is accomplished in rogue -by walking over the object (unless you use the "m" prefix, -see above). If you are carrying too many things, the pro- -gram will tell you and it won't pick up the object, other- -wise it will add it to your pack and tell you what you just -picked up. - - Many of the commands that operate on objects must -prompt you to find out which object you want to use. If you -change your mind and don't want to do that command after -all, just type an and the command will be aborted. - - Some objects, like armor and weapons, are easily dif- -ferentiated. Others, like scrolls and potions, are given -labels which vary according to type. During a game, any two - - - - - - - - - - -A Guide to the Dungeons of Doom USD:33-9 - - -of the same kind of object with the same label are the same -type. However, the labels will vary from game to game. - - When you use one of these labeled objects, if its -effect is obvious, rogue will remember what it is for you. -If it's effect isn't extremely obvious you will be asked -what you want to scribble on it so you will recognize it -later, or you can use the "call" command (see above). - -7.1. Weapons - - Some weapons, like arrows, come in bunches, but most -come one at a time. In order to use a weapon, you must -wield it. To fire an arrow out of a bow, you must first -wield the bow, then throw the arrow. You can only wield one -weapon at a time, but you can't change weapons if the one -you are currently wielding is cursed. The commands to use -weapons are "w" (wield) and "t" (throw). - -7.2. Armor - - There are various sorts of armor lying around in the -dungeon. Some of it is enchanted, some is cursed, and some -is just normal. Different armor types have different armor -protection. The higher the armor protection, the more pro- -tection the armor affords against the blows of monsters. -Here is a list of the various armor types and their normal -armor protection: - - - +-----------------------------------------+ - | Type Protection | - |None 0 | - |Leather armor 2 | - |Studded leather / Ring mail 3 | - |Scale mail 4 | - |Chain mail 5 | - |Banded mail / Splint mail 6 | - |Plate mail 7 | - +-----------------------------------------+ - - -If a piece of armor is enchanted, its armor protection will -be higher than normal. If a suit of armor is cursed, its -armor protection will be lower, and you will not be able to -remove it. However, not all armor with a protection that is -lower than normal is cursed. - - The commands to use weapons are "W" (wear) and "T" -(take off). - - - - - - - - - - - - - -USD:33-10 A Guide to the Dungeons of Doom - - -7.3. Scrolls - - Scrolls come with titles in an unknown tongue3. After -you read a scroll, it disappears from your pack. The com- -mand to use a scroll is "r" (read). - -7.4. Potions - - Potions are labeled by the color of the liquid inside -the flask. They disappear after being quaffed. The command -to use a scroll is "q" (quaff). - -7.5. Staves and Wands - - Staves and wands do the same kinds of things. Staves -are identified by a type of wood; wands by a type of metal -or bone. They are generally things you want to do to some- -thing over a long distance, so you must point them at what -you wish to affect to use them. Some staves are not -affected by the direction they are pointed, though. Staves -come with multiple magic charges, the number being random, -and when they are used up, the staff is just a piece of wood -or metal. - - The command to use a wand or staff is "z" (zap) - -7.6. Rings - - Rings are very useful items, since they are relatively -permanent magic, unlike the usually fleeting effects of -potions, scrolls, and staves. Of course, the bad rings are -also more powerful. Most rings also cause you to use up -food more rapidly, the rate varying with the type of ring. -Rings are differentiated by their stone settings. The com- -mands to use rings are "P" (put on) and "R" (remove). - -7.7. Food - - Food is necessary to keep you going. If you go too -long without eating you will faint, and eventually die of -starvation. The command to use food is "e" (eat). - -8. Options - - Due to variations in personal tastes and conceptions of -the way rogue should do things, there are a set of options -you can set that cause rogue to behave in various different -____________________ - 3 Actually, it's a dialect spoken only by the twenty-sev- -en members of a tribe in Outer Mongolia, but you're not sup- -posed to know that. - - - - - - - - - - - - -A Guide to the Dungeons of Doom USD:33-11 - - -ways. - -8.1. Setting the options - - There are two ways to set the options. The first is -with the "o" command of rogue; the second is with the -"ROGUEOPTS" environment variable4. - -8.1.1. Using the `o' command - - When you type "o" in rogue, it clears the screen and -displays the current settings for all the options. It then -places the cursor by the value of the first option and waits -for you to type. You can type a which means to go -to the next option, a "-" which means to go to the previous -option, an which means to return to the game, or -you can give the option a value. For boolean options this -merely involves typing "t" for true or "f" for false. For -string options, type the new value followed by a . - -8.1.2. Using the ROGUEOPTS variable - - The ROGUEOPTS variable is a string containing a comma -separated list of initial values for the various options. -Boolean variables can be turned on by listing their name or -turned off by putting a "no" in front of the name. Thus to -set up an environment variable so that jump is on, terse is -off, and the name is set to "Blue Meanie", use the command - % setenv ROGUEOPTS "jump,noterse,name=Blue Meanie"5 - -8.2. Option list - - Here is a list of the options and an explanation of -what each one is for. The default value for each is -enclosed in square brackets. For character string options, -input over fifty characters will be ignored. - -terse [noterse] - Useful for those who are tired of the sometimes lengthy - messages of rogue. This is a useful option for playing - on slow terminals, so this option defaults to terse if - you are on a slow (1200 baud or under) terminal. - - -____________________ - 4 On Version 6 systems, there is no equivalent of the -ROGUEOPTS feature. - 5 For those of you who use the Bourne shell sh (1), the -commands would be - $ ROGUEOPTS="jump,noterse,name=Blue Meanie" - $ export ROGUEOPTS - - - - - - - - - - - - -USD:33-12 A Guide to the Dungeons of Doom - - -jump [nojump] - If this option is set, running moves will not be dis- - played until you reach the end of the move. This saves - considerable cpu and display time. This option - defaults to jump if you are using a slow terminal. - -flush [noflush] - All typeahead is thrown away after each round of bat- - tle. This is useful for those who type far ahead and - then watch in dismay as a Bat kills them. - -seefloor [seefloor] - Display the floor around you on the screen as you move - through dark rooms. Due to the amount of characters - generated, this option defaults to noseefloor if you - are using a slow terminal. - -passgo [nopassgo] - Follow turnings in passageways. If you run in a pas- - sage and you run into stone or a wall, rogue will see - if it can turn to the right or left. If it can only - turn one way, it will turn that way. If it can turn - either or neither, it will stop. This algorithm can - sometimes lead to slightly confusing occurrences which - is why it defaults to nopassgo. - -tombstone [tombstone] - Print out the tombstone at the end if you get killed. - This is nice but slow, so you can turn it off if you - like. - -inven [overwrite] - Inventory type. This can have one of three values: - overwrite, slow, or clear. With overwrite the top - lines of the map are overwritten with the list when - inventory is requested or when "Which item do you wish - to . . .? " questions are answered with a "*". How- - ever, if the list is longer than a screenful, the - screen is cleared. With slow, lists are displayed one - item at a time on the top of the screen, and with - clear, the screen is cleared, the list is displayed, - and then the dungeon level is re-displayed. Due to - speed considerations, clear is the default for termi- - nals without clear-to-end-of-line capabilities. - -name [account name] - This is the name of your character. It is used if you - get on the top ten scorer's list. - -fruit [slime-mold] - This should hold the name of a fruit that you enjoy - eating. It is basically a whimsey that rogue uses in a - couple of places. - - - - - - - - - - -A Guide to the Dungeons of Doom USD:33-13 - - -file [~/rogue.save] - The default file name for saving the game. If your - phone is hung up by accident, rogue will automatically - save the game in this file. The file name may start - with the special character "~" which expands to be your - home directory. - -9. Scoring - - Rogue usually maintains a list of the top scoring peo- -ple or scores on your machine. Depending on how it is set -up, it can post either the top scores or the top players. -In the latter case, each account on the machine can post -only one non-winning score on this list. If you score -higher than someone else on this list, or better your previ- -ous score on the list, you will be inserted in the proper -place under your current name. How many scores are kept can -also be set up by whoever installs it on your machine. - - If you quit the game, you get out with all of your gold -intact. If, however, you get killed in the Dungeons of -Doom, your body is forwarded to your next-of-kin, along with -90% of your gold; ten percent of your gold is kept by the -Dungeons' wizard as a fee6. This should make you consider -whether you want to take one last hit at that monster and -possibly live, or quit and thus stop with whatever you have. -If you quit, you do get all your gold, but if you swing and -live, you might find more. - - If you just want to see what the current top play- -ers/games list is, you can type - % @PROGRAM@ -s - -10. Acknowledgements - - Rogue was originally conceived of by Glenn Wichman and -Michael Toy. Ken Arnold and Michael Toy then smoothed out -the user interface, and added jillions of new features. We -would like to thank Bob Arnold, Michelle Busch, Andy -Hatcher, Kipp Hickman, Mark Horton, Daniel Jensen, Bill Joy, -Joe Kalash, Steve Maurer, Marty McNary, Jan Miller, and -Scott Nelson for their ideas and assistance; and also the -teeming multitudes who graciously ignored work, school, and -social life to play rogue and send us bugs, complaints, sug- -gestions, and just plain flames. And also Mom. - - - -____________________ - 6 The Dungeon's wizard is named Wally the Wonder Badger. -Invocations should be accompanied by a sizable donation. - - - - - - - - diff --git a/src/cc/rogue/rogue.h b/src/cc/rogue/rogue.h deleted file mode 100644 index 522da8421..000000000 --- a/src/cc/rogue/rogue.h +++ /dev/null @@ -1,863 +0,0 @@ -// Copyright (c) 2016-2023 The Hush developers -// Distributed under the GPLv3 software license, see the accompanying -// file COPYING or https://www.gnu.org/licenses/gpl-3.0.en.html -/* - * Rogue definitions and variable declarations - * - * @(#)rogue.h 5.42 (Berkeley) 08/06/83 - * - * Rogue: Exploring the Dungeons of Doom - * Copyright (C) 1980-1983, 1985, 1999 Michael Toy, Ken Arnold and Glenn Wichman - * All rights reserved. - * - * See the file LICENSE.TXT for full copyright and licensing information. - */ - -#ifndef H_ROGUE_H -#define H_ROGUE_H -#include -#include -#include -#include -#include -#include -#include /* we need va_list */ -#include /* we want wchar_t */ -#include -#include - -#include -#include -#include -#include -#include - -#ifndef BUILD_ROGUE -#include -#else -#include "cursesd.h" -#endif - -#ifdef LINES -#undef LINES -#endif -#ifdef COLS -#undef COLS -#endif - -#define LINES 24 -#define COLS 80 - -#include "extern.h" - - -#undef lines - -#define NOOP(x) (x += 0) -#define CCHAR(x) ( (char) (x & A_CHARTEXT) ) -/* - * Maximum number of different things - */ -#define MAXROOMS 9 -#define MAXTHINGS 9 -#define MAXOBJ 9 -#define MAXPACK 23 -#define MAXTRAPS 10 -#define AMULETLEVEL 26 -#define NUMTHINGS 7 /* number of types of things */ -#define MAXPASS 13 /* upper limit on number of passages */ -#define NUMLINES 24 -#define NUMCOLS 80 -#define STATLINE (NUMLINES - 1) -#define BORE_LEVEL 50 - -/* - * return values for get functions - */ -#define NORM 0 /* normal exit */ -#define QUIT 1 /* quit option setting */ -#define MINUS 2 /* back up one option */ - -/* - * inventory types - */ -#define INV_OVER 0 -#define INV_SLOW 1 -#define INV_CLEAR 2 - -/* - * All the fun defines - */ -#define when break;case -#define otherwise break;default -#define until(expr) while(!(expr)) -#define next(ptr) (*ptr).l_next -#define prev(ptr) (*ptr).l_prev -#define winat(y,x) (moat(y,x) != NULL ? moat(y,x)->t_disguise : chat(y,x)) -#define ce(a,b) ((a).x == (b).x && (a).y == (b).y) -#define hero player.t_pos -#define pstats player.t_stats -#define pack player.t_pack -#define proom player.t_room -#define max_hp player.t_stats.s_maxhp -#define attach(a,b) _attach(&a,b) -#define detach(a,b) _detach(&a,b) -#define free_list(a) _free_list(&a) -#undef max -#define max(a,b) ((a) > (b) ? (a) : (b)) -#define on(thing,flag) ((bool)(((thing).t_flags & (flag)) != 0)) -#define GOLDCALC (rnd(50 + 10 * level) + 2) -#define ISRING(h,r) (cur_ring[h] != NULL && cur_ring[h]->o_which == r) -#define ISWEARING(r) (ISRING(LEFT, r) || ISRING(RIGHT, r)) -#define ISMULT(type) (type == POTION || type == SCROLL || type == FOOD) -#define INDEX(y,x) (&places[((x) << 5) + (y)]) -#define chat(y,x) (places[((x) << 5) + (y)].p_ch) -#define flat(y,x) (places[((x) << 5) + (y)].p_flags) -#define moat(y,x) (places[((x) << 5) + (y)].p_monst) -#define unc(cp) (cp).y, (cp).x -#ifdef MASTER -#define debug if (wizard) msg -#endif - -/* - * things that appear on the screens - */ -#define PASSAGE '#' -#define DOOR '+' -#define FLOOR '.' -#define PLAYER '@' -#define TRAP '^' -#define STAIRS '%' -#define GOLD '*' -#define POTION '!' -#define SCROLL '?' -#define MAGIC '$' -#define FOOD ':' -#define WEAPON ')' -#define ARMOR ']' -#define AMULET ',' -#define RING '=' -#define STICK '/' -#define CALLABLE -1 -#define R_OR_S -2 - -/* - * Various constants - */ -#define BEARTIME spread(3) -#define SLEEPTIME spread(5) -#define HOLDTIME spread(2) -#define WANDERTIME spread(70) -#define BEFORE spread(1) -#define AFTER spread(2) -#define HEALTIME 30 -#define HUHDURATION 20 -#define SEEDURATION 850 -#define HUNGERTIME 1300 -#define MORETIME 150 -#define STOMACHSIZE 2000 -#define STARVETIME 850 -#define ESCAPE 27 -#define LEFT 0 -#define RIGHT 1 -#define BOLT_LENGTH 6 -#define LAMPDIST 3 -#ifdef MASTER -#ifndef PASSWD -#define PASSWD "mTBellIQOsLNA" -#endif -#endif - -/* - * Save against things - */ -#define VS_POISON 00 -#define VS_PARALYZATION 00 -#define VS_DEATH 00 -#define VS_BREATH 02 -#define VS_MAGIC 03 - -/* - * Various flag bits - */ -/* flags for rooms */ -#define ISDARK 0000001 /* room is dark */ -#define ISGONE 0000002 /* room is gone (a corridor) */ -#define ISMAZE 0000004 /* room is gone (a corridor) */ - -/* flags for objects */ -#define ISCURSED 000001 /* object is cursed */ -#define ISKNOW 0000002 /* player knows details about the object */ -#define ISMISL 0000004 /* object is a missile type */ -#define ISMANY 0000010 /* object comes in groups */ -/* ISFOUND 0000020 ...is used for both objects and creatures */ -#define ISPROT 0000040 /* armor is permanently protected */ - -/* flags for creatures */ -#define CANHUH 0000001 /* creature can confuse */ -#define CANSEE 0000002 /* creature can see invisible creatures */ -#define ISBLIND 0000004 /* creature is blind */ -#define ISCANC 0000010 /* creature has special qualities cancelled */ -#define ISLEVIT 0000010 /* hero is levitating */ -#define ISFOUND 0000020 /* creature has been seen (used for objects) */ -#define ISGREED 0000040 /* creature runs to protect gold */ -#define ISHASTE 0000100 /* creature has been hastened */ -#define ISTARGET 000200 /* creature is the target of an 'f' command */ -#define ISHELD 0000400 /* creature has been held */ -#define ISHUH 0001000 /* creature is confused */ -#define ISINVIS 0002000 /* creature is invisible */ -#define ISMEAN 0004000 /* creature can wake when player enters room */ -#define ISHALU 0004000 /* hero is on acid trip */ -#define ISREGEN 0010000 /* creature can regenerate */ -#define ISRUN 0020000 /* creature is running at the player */ -#define SEEMONST 040000 /* hero can detect unseen monsters */ -#define ISFLY 0040000 /* creature can fly */ -#define ISSLOW 0100000 /* creature has been slowed */ - -/* - * Flags for level map - */ -#define F_PASS 0x80 /* is a passageway */ -#define F_SEEN 0x40 /* have seen this spot before */ -#define F_DROPPED 0x20 /* object was dropped here */ -#define F_LOCKED 0x20 /* door is locked */ -#define F_REAL 0x10 /* what you see is what you get */ -#define F_PNUM 0x0f /* passage number mask */ -#define F_TMASK 0x07 /* trap number mask */ - -/* - * Trap types - */ -#define T_DOOR 00 -#define T_ARROW 01 -#define T_SLEEP 02 -#define T_BEAR 03 -#define T_TELEP 04 -#define T_DART 05 -#define T_RUST 06 -#define T_MYST 07 -#define NTRAPS 8 - -/* - * Potion types - */ -#define P_CONFUSE 0 -#define P_LSD 1 -#define P_POISON 2 -#define P_STRENGTH 3 -#define P_SEEINVIS 4 -#define P_HEALING 5 -#define P_MFIND 6 -#define P_TFIND 7 -#define P_RAISE 8 -#define P_XHEAL 9 -#define P_HASTE 10 -#define P_RESTORE 11 -#define P_BLIND 12 -#define P_LEVIT 13 -#define MAXPOTIONS 14 - -/* - * Scroll types - */ -#define S_CONFUSE 0 -#define S_MAP 1 -#define S_HOLD 2 -#define S_SLEEP 3 -#define S_ARMOR 4 -#define S_ID_POTION 5 -#define S_ID_SCROLL 6 -#define S_ID_WEAPON 7 -#define S_ID_ARMOR 8 -#define S_ID_R_OR_S 9 -#define S_SCARE 10 -#define S_FDET 11 -#define S_TELEP 12 -#define S_ENCH 13 -#define S_CREATE 14 -#define S_REMOVE 15 -#define S_AGGR 16 -#define S_PROTECT 17 -#define MAXSCROLLS 18 - -/* - * Weapon types - */ -#define MACE 0 -#define SWORD 1 -#define BOW 2 -#define ARROW 3 -#define DAGGER 4 -#define TWOSWORD 5 -#define DART 6 -#define SHIRAKEN 7 -#define SPEAR 8 -#define FLAME 9 /* fake entry for dragon breath (ick) */ -#define MAXWEAPONS 9 /* this should equal FLAME */ - -/* - * Armor types - */ -#define LEATHER 0 -#define RING_MAIL 1 -#define STUDDED_LEATHER 2 -#define SCALE_MAIL 3 -#define CHAIN_MAIL 4 -#define SPLINT_MAIL 5 -#define BANDED_MAIL 6 -#define PLATE_MAIL 7 -#define MAXARMORS 8 - -/* - * Ring types - */ -#define R_PROTECT 0 -#define R_ADDSTR 1 -#define R_SUSTSTR 2 -#define R_SEARCH 3 -#define R_SEEINVIS 4 -#define R_NOP 5 -#define R_AGGR 6 -#define R_ADDHIT 7 -#define R_ADDDAM 8 -#define R_REGEN 9 -#define R_DIGEST 10 -#define R_TELEPORT 11 -#define R_STEALTH 12 -#define R_SUSTARM 13 -#define MAXRINGS 14 - -/* - * Rod/Wand/Staff types - */ -#define WS_LIGHT 0 -#define WS_INVIS 1 -#define WS_ELECT 2 -#define WS_FIRE 3 -#define WS_COLD 4 -#define WS_POLYMORPH 5 -#define WS_MISSILE 6 -#define WS_HASTE_M 7 -#define WS_SLOW_M 8 -#define WS_DRAIN 9 -#define WS_NOP 10 -#define WS_TELAWAY 11 -#define WS_TELTO 12 -#define WS_CANCEL 13 -#define MAXSTICKS 14 - -/* - * Now we define the structures and types - */ - -#define SMALLVAL 0.000000000000001 -#define SATOSHIDEN ((uint64_t)100000000L) -#define dstr(x) ((double)(x) / SATOSHIDEN) - -#ifndef _BITS256 -#define _BITS256 -union _bits256 { uint8_t bytes[32]; uint16_t ushorts[16]; uint32_t uints[8]; uint64_t ulongs[4]; uint64_t txid; }; -typedef union _bits256 bits256; -#endif - -#include "rogue_player.h" // interface to rpc - -struct rogue_state -{ - uint64_t seed; - char *keystrokes,*keystrokeshex; - uint32_t needflush,replaydone; - int32_t numkeys,ind,num,guiflag,counter,sleeptime,playersize,restoring,lastnum; - FILE *logfp; - struct rogue_player P; - char buffered[10000]; - uint8_t playerdata[10000]; -}; -extern struct rogue_state globalR; - -int rogue(int argc, char **argv, char **envp); -void rogueiterate(struct rogue_state *rs); -int32_t roguefname(char *fname,uint64_t seed,int32_t counter); -int32_t flushkeystrokes(struct rogue_state *rs,int32_t waitflag); -int32_t rogue_restorepack(struct rogue_state *rs); -void restore_player(struct rogue_state *rs); -int32_t rogue_replay2(uint8_t *newdata,uint64_t seed,char *keystrokes,int32_t num,struct rogue_player *player,int32_t sleepmillis); -void rogue_bailout(struct rogue_state *rs); -int32_t rogue_progress(struct rogue_state *rs,int32_t waitflag,uint64_t seed,char *keystrokes,int32_t num); -int32_t rogue_setplayerdata(struct rogue_state *rs,char *gametxidstr); - -#define ROGUE_MAXTOTAL (pstats.s_str*2) - -/* - * Help list - */ -struct h_list { - char h_ch; - char *h_desc; - bool h_print; -}; - -/* - * Coordinate data type - */ -typedef struct { - int x; - int y; -} coord; - -typedef unsigned int str_t; - -/* - * Stuff about objects - */ -struct obj_info { - char *oi_name; - int oi_prob; - int oi_worth; - char *oi_guess; - bool oi_know; -}; - -/* - * Room structure - */ -struct room { - coord r_pos; /* Upper left corner */ - coord r_max; /* Size of room */ - coord r_gold; /* Where the gold is */ - int r_goldval; /* How much the gold is worth */ - short r_flags; /* info about the room */ - int r_nexits; /* Number of exits */ - coord r_exit[12]; /* Where the exits are */ -}; - -/* - * Structure describing a fighting being - */ -struct stats { - str_t s_str; /* Strength */ - int s_exp; /* Experience */ - int s_lvl; /* level of mastery */ - int s_arm; /* Armor class */ - int s_hpt; /* Hit points */ - char s_dmg[13]; /* String describing damage done */ - int s_maxhp; /* Max hit points */ -}; - -/* - * Structure for monsters and player - */ -union thing { - struct { - union thing *_l_next, *_l_prev; /* Next pointer in link */ - coord _t_pos; /* Position */ - bool _t_turn; /* If slowed, is it a turn to move */ - char _t_type; /* What it is */ - char _t_disguise; /* What mimic looks like */ - char _t_oldch; /* Character that was where it was */ - coord *_t_dest; /* Where it is running to */ - short _t_flags; /* State word */ - struct stats _t_stats; /* Physical description */ - struct room *_t_room; /* Current room for thing */ - union thing *_t_pack; /* What the thing is carrying */ - int _t_reserved; - } _t; - struct { - union thing *_l_next, *_l_prev; /* Next pointer in link */ - int _o_type; /* What kind of object it is */ - coord _o_pos; /* Where it lives on the screen */ - char *_o_text; /* What it says if you read it */ - int _o_launch; /* What you need to launch it */ - char _o_packch; /* What character it is in the pack */ - char _o_damage[8]; /* Damage if used like sword */ - char _o_hurldmg[8]; /* Damage if thrown */ - int _o_count; /* count for plural objects */ - int _o_which; /* Which object of a type it is */ - int _o_hplus; /* Plusses to hit */ - int _o_dplus; /* Plusses to damage */ - int _o_arm; /* Armor protection */ - int _o_flags; /* information about objects */ - int _o_group; /* group number for this object */ - char *_o_label; /* Label for object */ - } _o; -}; - -typedef union thing THING; - -#define l_next _t._l_next -#define l_prev _t._l_prev -#define t_pos _t._t_pos -#define t_turn _t._t_turn -#define t_type _t._t_type -#define t_disguise _t._t_disguise -#define t_oldch _t._t_oldch -#define t_dest _t._t_dest -#define t_flags _t._t_flags -#define t_stats _t._t_stats -#define t_pack _t._t_pack -#define t_room _t._t_room -#define t_reserved _t._t_reserved -#define o_type _o._o_type -#define o_pos _o._o_pos -#define o_text _o._o_text -#define o_launch _o._o_launch -#define o_packch _o._o_packch -#define o_damage _o._o_damage -#define o_hurldmg _o._o_hurldmg -#define o_count _o._o_count -#define o_which _o._o_which -#define o_hplus _o._o_hplus -#define o_dplus _o._o_dplus -#define o_arm _o._o_arm -#define o_charges o_arm -#define o_goldval o_arm -#define o_flags _o._o_flags -#define o_group _o._o_group -#define o_label _o._o_label - -/* - * describe a place on the level map - */ -typedef struct { - char p_ch; - char p_flags; - THING *p_monst; -} PLACE; - -/* - * Array containing information on all the various types of monsters - */ -struct monster { - char *m_name; /* What to call the monster */ - int m_carry; /* Probability of carrying something */ - short m_flags; /* things about the monster */ - struct stats m_stats; /* Initial stats */ -}; - -/* - * External variables - */ -extern const char *tr_name[],*inv_t_name[]; -extern const int32_t a_class[], e_levels[]; -extern const struct h_list helpstr[]; -extern const char *h_names[],*m_names[]; - - -extern const struct monster origmonsters[26]; -extern const struct room origpassages[MAXPASS]; -extern const struct obj_info origthings[NUMTHINGS],origring_info[MAXRINGS],origpot_info[MAXPOTIONS],origarm_info[MAXARMORS],origscr_info[MAXSCROLLS],origws_info[MAXSTICKS],origweap_info[MAXWEAPONS + 1]; -extern struct monster monsters[26]; -extern struct room passages[MAXPASS]; -extern struct obj_info things[NUMTHINGS],ring_info[MAXRINGS],pot_info[MAXPOTIONS],arm_info[MAXARMORS],scr_info[MAXSCROLLS],weap_info[MAXWEAPONS + 1],ws_info[MAXSTICKS]; - -extern bool after, again, allscore, amulet, door_stop, fight_flush, - firstmove, has_hit, inv_describe, jump, kamikaze, - lower_msg, move_on, msg_esc, pack_used[], - passgo, playing, q_comm, running, save_msg, see_floor, - seenstairs, stat_msg, terse, to_death, tombstone; - -extern char dir_ch, file_name[], home[], huh[], - l_last_comm, l_last_dir, last_comm, last_dir, *Numname, - outbuf[], *release, *s_names[], runch, take; -extern const char *ws_made[], *r_stones[], *p_colors[], *ws_type[]; - -extern int count, food_left, hungry_state, inpack, - inv_type, lastscore, level, max_hit, max_level, mpos, - n_objs, no_command, no_food, no_move, noscore, ntraps, purse, - quiet, vf_hit; - -extern unsigned int numscores; - -extern uint64_t seed; - -extern WINDOW *hw; - -extern coord delta, oldpos, stairs; - -extern PLACE places[]; - -extern THING *cur_armor, *cur_ring[], *cur_weapon, *l_last_pick, - *last_pick, *lvl_obj, *mlist, player; - - -extern struct room *oldrp, rooms[]; - -extern struct stats max_stats; - - -/* - * Function types - */ -void _attach(THING **list, THING *item); -void _detach(THING **list, THING *item); -void _free_list(THING **ptr); -void addmsg(struct rogue_state *rs,char *fmt, ...); -bool add_haste(struct rogue_state *rs,bool potion); -char add_line(struct rogue_state *rs,char *fmt, char *arg); -void add_pack(struct rogue_state *rs,THING *obj, bool silent); -void add_pass(void); -void add_str(str_t *sp, int amt); -void accnt_maze(int y, int x, int ny, int nx); -void aggravate(struct rogue_state *rs); -int attack(struct rogue_state *rs,THING *mp); -void badcheck(char *name, struct obj_info *info, int bound); -void bounce(struct rogue_state *rs,THING *weap, char *mname, bool noend); -void call(struct rogue_state *rs); -void call_it(struct rogue_state *rs,struct obj_info *info); -bool cansee(struct rogue_state *rs,int y, int x); -int center(char *str); -void chg_str(int amt); -void check_level(struct rogue_state *rs); -void conn(struct rogue_state *rs,int r1, int r2); -void command(struct rogue_state *rs); -void create_obj(struct rogue_state *rs); - -void current(struct rogue_state *rs,THING *cur, char *how, char *where); -void d_level(struct rogue_state *rs); -void death(struct rogue_state *rs,char monst); -char death_monst(void); -void dig(struct rogue_state *rs,int y, int x); -void discard(THING *item); -void discovered(struct rogue_state *rs); -int dist(int y1, int x1, int y2, int x2); -int dist_cp(coord *c1, coord *c2); -int do_chase(struct rogue_state *rs,THING *th); -void do_daemons(struct rogue_state *rs,int flag); -void do_fuses(struct rogue_state *rs,int flag); -void do_maze(struct rogue_state *rs,struct room *rp); -void do_motion(struct rogue_state *rs,THING *obj, int ydelta, int xdelta); -void do_move(struct rogue_state *rs,int dy, int dx); -void do_passages(struct rogue_state *rs); -void do_pot(struct rogue_state *rs,int type, bool knowit); -void do_rooms(struct rogue_state *rs); -void do_run(char ch); -void do_zap(struct rogue_state *rs); -void doadd(struct rogue_state *rs,char *fmt, va_list args); -void door(struct room *rm, coord *cp); -void door_open(struct rogue_state *rs,struct room *rp); -void drain(struct rogue_state *rs); -void draw_room(struct rogue_state *rs,struct room *rp); -void drop(struct rogue_state *rs); -void eat(struct rogue_state *rs); -size_t encread(char *start, size_t size, FILE *inf); -size_t encwrite(char *start, size_t size, FILE *outf); -int endmsg(struct rogue_state *rs); -void enter_room(struct rogue_state *rs,coord *cp); -void erase_lamp(coord *pos, struct room *rp); -int exp_add(THING *tp); -void extinguish(void (*func)(struct rogue_state *rs,int)); -void fall(struct rogue_state *rs,THING *obj, bool pr); -void fire_bolt(struct rogue_state *rs,coord *start, coord *dir, char *name); -char floor_at(void); -void flush_type(void); -int fight(struct rogue_state *rs,coord *mp, THING *weap, bool thrown); -void fix_stick(THING *cur); -void fuse(void (*func)(struct rogue_state *rs,int), int arg, int time, int type); -bool get_dir(struct rogue_state *rs); -int gethand(struct rogue_state *rs); -void give_pack(struct rogue_state *rs,THING *tp); -void help(struct rogue_state *rs); -void hit(struct rogue_state *rs,char *er, char *ee, bool noend); -void horiz(struct room *rp, int starty); -void leave_room(struct rogue_state *rs,coord *cp); -void lengthen(void (*func)(struct rogue_state *rs,int), int xtime); -void look(struct rogue_state *rs,bool wakeup); -int hit_monster(struct rogue_state *rs,int y, int x, THING *obj); -void identify(struct rogue_state *rs); -void illcom(struct rogue_state *rs,int ch); -void init_check(void); -void init_colors(void); -void init_materials(void); -void init_names(void); -void init_player(struct rogue_state *rs); -void init_probs(void); -void init_stones(void); -void init_weapon(THING *weap, int which); -bool inventory(struct rogue_state *rs,THING *list, int type); -void invis_on(void); -void killed(struct rogue_state *rs,THING *tp, bool pr); -void kill_daemon(void (*func)(struct rogue_state *rs,int)); -bool lock_sc(void); -void miss(struct rogue_state *rs,char *er, char *ee, bool noend); -void missile(struct rogue_state *rs,int ydelta, int xdelta); -void money(struct rogue_state *rs,int value); -int move_monst(struct rogue_state *rs,THING *tp); -void move_msg(struct rogue_state *rs,THING *obj); -int msg(struct rogue_state *rs,char *fmt, ...); -void nameit(THING *obj, const char *type, const char *which, struct obj_info *op, char *(*prfunc)(THING *)); -void new_level(struct rogue_state *rs); -void new_monster(struct rogue_state *rs,THING *tp, char type, coord *cp); -void numpass(int y, int x); -void option(struct rogue_state *rs); -void open_score(void); -void parse_opts(char *str); -void passnum(void); -char *pick_color(char *col); -int pick_one(struct rogue_state *rs,struct obj_info *info, int nitems); -void pick_up(struct rogue_state *rs,char ch); -void picky_inven(struct rogue_state *rs); -void pr_spec(struct obj_info *info, int nitems); -void pr_list(void); -void put_bool(void *b); -void put_inv_t(void *ip); -void put_str(void *str); -void put_things(struct rogue_state *rs); -void putpass(coord *cp); -void print_disc(struct rogue_state *rs,char); -void quaff(struct rogue_state *rs); -void raise_level(struct rogue_state *rs); -char randmonster(bool wander); -void read_scroll(struct rogue_state *rs); -void relocate(struct rogue_state *rs,THING *th, coord *new_loc); -void remove_mon(struct rogue_state *rs,coord *mp, THING *tp, bool waskill); -void reset_last(void); -bool restore(struct rogue_state *rs,char *file, char **envp); -int ring_eat(int hand); -void ring_on(struct rogue_state *rs); -void ring_off(struct rogue_state *rs); -int rnd(int range); -int rnd_room(void); -int roll(int number, int sides); -int rs_save_file(struct rogue_state *rs,FILE *savef); -int rs_restore_file(FILE *inf); -void runto(struct rogue_state *rs,coord *runner); -void rust_armor(struct rogue_state *rs,THING *arm); -int save(int which); -void save_file(struct rogue_state *rs,FILE *savef,int32_t guiflag); -void save_game(struct rogue_state *rs); -int save_throw(int which, THING *tp); -void score(struct rogue_state *rs,int amount, int flags, char monst); -void search(struct rogue_state *rs); -void set_know(THING *obj, struct obj_info *info); -void set_oldch(THING *tp, coord *cp); -void setup(void); -void shell(struct rogue_state *rs); -bool show_floor(void); -void show_map(void); -void show_win(struct rogue_state *rs,char *message); -int sign(int nm); -int spread(int nm); -void start_daemon(void (*func)(struct rogue_state *rs,int), int arg, int type); -void start_score(void); -void status(struct rogue_state *rs); -int step_ok(int ch); -void strucpy(char *s1, char *s2, int len); -int swing(int at_lvl, int op_arm, int wplus); -void take_off(struct rogue_state *rs); -void teleport(struct rogue_state *rs); -void total_winner(struct rogue_state *rs); -void thunk(struct rogue_state *rs,THING *weap, char *mname, bool noend); -void treas_room(struct rogue_state *rs); -void turnref(void); -void u_level(struct rogue_state *rs); -void uncurse(THING *obj); -void unlock_sc(void); -void vert(struct room *rp, int startx); -void wait_for(struct rogue_state *rs,int ch); -THING *wake_monster(struct rogue_state *rs,int y, int x); -void wanderer(struct rogue_state *rs); -void waste_time(struct rogue_state *rs); -void wear(struct rogue_state *rs); -void whatis(struct rogue_state *rs,bool insist, int type); -void wield(struct rogue_state *rs); - -bool chase(THING *tp, coord *ee); -bool diag_ok(coord *sp, coord *ep); -bool dropcheck(struct rogue_state *rs,THING *obj); -bool fallpos(coord *pos, coord *newpos); -bool find_floor(struct rogue_state *rs,struct room *rp, coord *cp, int limit, bool monst); -bool is_magic(THING *obj); -bool is_symlink(char *sp); -bool levit_check(struct rogue_state *rs); -bool pack_room(struct rogue_state *rs,bool from_floor, THING *obj); -bool roll_em(THING *thatt, THING *thdef, THING *weap, bool hurl); -bool see_monst(THING *mp); -bool seen_stairs(void); -bool turn_ok(int y, int x); -bool turn_see(struct rogue_state *rs,bool turn_off); -bool is_current(struct rogue_state *rs,THING *obj); -int passwd(void); - -char be_trapped(struct rogue_state *rs,coord *tc); -char floor_ch(void); -char pack_char(void); -char readchar(struct rogue_state *rs); -char rnd_thing(void); - -char *charge_str(THING *obj); -char *choose_str(char *ts, char *ns); -char *inv_name(THING *obj, bool drop); -char *nullstr(THING *ignored); -char *num(int n1, int n2, char type); -char *ring_num(THING *obj); -char *set_mname(THING *tp); -char *vowelstr(char *str); - -int get_bool(struct rogue_state *rs,void *vp, WINDOW *win); -int get_inv_t(struct rogue_state *rs,void *vp, WINDOW *win); -int get_num(struct rogue_state *rs,void *vp, WINDOW *win); -int get_sf(struct rogue_state *rs,void *vp, WINDOW *win); -int get_str(struct rogue_state *rs,void *vopt, WINDOW *win); -int trip_ch(int y, int x, int ch); - -coord *find_dest(struct rogue_state *rs,THING *tp); -coord *rndmove(THING *who); - -THING *find_obj(struct rogue_state *rs,int y, int x); -THING *get_item(struct rogue_state *rs,char *purpose, int type); -THING *leave_pack(struct rogue_state *rs,THING *obj, bool newobj, bool all); -THING *new_item(void); -THING *new_thing(struct rogue_state *rs); -void end_line(struct rogue_state *rs); -int32_t num_packitems(struct rogue_state *rs); -int32_t rogue_total(THING *o); - -void runners(struct rogue_state *rs,int); -void land(struct rogue_state *rs,int); -void visuals(struct rogue_state *rs,int); -void come_down(struct rogue_state *rs,int); -void stomach(struct rogue_state *rs,int); -void nohaste(struct rogue_state *rs,int); -void sight(struct rogue_state *rs,int); -void unconfuse(struct rogue_state *rs,int); -void rollwand(struct rogue_state *rs,int); -void unsee(struct rogue_state *rs,int); -void swander(struct rogue_state *rs,int); -void doctor(struct rogue_state *rs,int); - -void playit(struct rogue_state *rs); - -struct room *roomin(struct rogue_state *rs,coord *cp); -int32_t thing_find(THING *ptr); - -#define MAXDAEMONS 20 - -extern struct delayed_action { - int d_type; - void (*d_func)(struct rogue_state *rs,int); - int d_arg; - int d_time; -} d_list[MAXDAEMONS]; - -typedef struct { - char *st_name; - int st_value; -} STONE; - -extern int total; -extern int between; -extern int group; -extern coord nh; -extern const char *rainbow[]; -extern int cNCOLORS; -extern const STONE stones[]; -extern int cNSTONES; -extern const char *wood[]; -extern int cNWOOD; -extern const char *metal[]; -extern int cNMETAL; - -//extern WINDOW *stdscr,*curscr; - -#endif - diff --git a/src/cc/rogue/rogue.html b/src/cc/rogue/rogue.html deleted file mode 100644 index 00dab46bf..000000000 --- a/src/cc/rogue/rogue.html +++ /dev/null @@ -1,1060 +0,0 @@ - - - - - - - - - - -

A Guide to the Dungeons of Doom

- -

Michael C. Toy
-Kenneth C. R. C. Arnold

- -

Computer Systems Research -Group
-Department of Electrical Engineering and Computer -Science
-University of California
-Berkeley, California 94720

- - -

ABSTRACT

- -
-
-

Rogue is a visual CRT based fantasy game which runs under the - UNIX† timesharing system. This paper describes how - to play rogue, and gives a few hints for those who might otherwise get - lost in the Dungeons of Doom.

-
-
- -

1. Introduction

- -

You have just finished your years as a -student at the local fighter’s guild. After much -practice and sweat you have finally completed your training -and are ready to embark upon a perilous adventure. As a test -of your skills, the local guildmasters have sent you into -the Dungeons of Doom. Your task is to return with the Amulet -of Yendor. Your reward for the completion of this task will -be a full membership in the local guild. In addition, you -are allowed to keep all the loot you bring back from the -dungeons.

- -

In preparation for your journey, you are -given an enchanted mace, a bow, and a quiver of arrows taken -from a dragon’s hoard in the far off Dark Mountains. -You are also outfitted with elf-crafted armor and given -enough food to reach the dungeons. You say goodbye to family -and friends for what may be the last time and head up the -road.

- -

You set out on your way to the dungeons and -after several days of uneventful travel, you see the -ancient ruins that mark the entrance to the Dungeons of -Doom. It is late at night, so you make camp at the entrance -and spend the night sleeping under the open skies. In the -morning you gather your weapons, put on your armor, eat what -is almost your last food, and enter the -dungeons.

- -

2. What is going on here?

-

You have just begun a game of rogue. Your -goal is to grab as much treasure as you can, find the Amulet -of Yendor, and get out of the Dungeons of Doom alive. On the -screen, a map of where you have been and what you have seen -on the current dungeon level is kept. As you explore more of -the level, it appears on the screen in front of -you.

-

Rogue differs from most computer fantasy -games in that it is screen oriented. Commands are all one or -two keystrokes1 and the -results of your commands are displayed graphically on the -screen rather than being explained in words2.

-

Another major difference between rogue and other computer fantasy games is that once you have solved -all the puzzles in a standard fantasy game, it has lost most -of its excitement and it ceases to be fun. Rogue, on the -other hand, generates a new dungeon every time you play it -and even the author finds it an entertaining and exciting -game.

- -

3. What do all those things on the screen mean?

-

In order to understand what is going on in -rogue you have to first get some grasp of what rogue is -doing with the screen. The rogue screen is intended to -replace the “You can see ...” descriptions of -standard fantasy games. Figure 1 is a sample of what a -rogue screen might look like.

- -
- -
-
-____________________________________________________________
-
-
-                        ------------
-                        |..........+
-                        |..@....]..|
-                        |....B.....|
-                        |..........|
-                        -----+------
-
-
-
-Level: 1  Gold: 0      Hp: 12(12)  Str: 16(16)  Arm: 4  Exp: 1/0
-
-                          Figure 1
-____________________________________________________________
-
-
-
-

3.1. The bottom line

-

At the bottom line of the screen are a few -pieces of cryptic information describing your current -status. Here is an explanation of what these things -mean:
- 

- - - - - - - - - - - - - - - - - - - - - - - - - - -
-

Level

 -

This number indicates how deep you -have gone in the dungeon. It starts at one and goes up as -you go deeper into the dungeon.

-

Gold

 -

The number of gold pieces you have managed to find and keep with you - so far.

-

Hp

 -

Your current and maximum health points. -Health points indicate how much damage you can take before -you die. The more you get hit in a fight, the lower they -get. You can regain health points by resting. The number in -parentheses is the maximum number your health points can -reach.

- -
-

Str

 - -

Your current strength and maximum ever -strength. This can be any integer less than or equal to 31, -or greater than or equal to three. The higher the num- ber, -the stronger you are. The number in the parentheses is the -maximum strength you have attained so far this -game.

- -
-

Arm

 -

Your current armor protection. This -number indicates how effective your armor is in stopping -blows from unfriendly creatures. The higher this number is, -the more effective the armor.

- -
-

Exp

 -

These two numbers give your current -experience level and experience points. As you do things, -you gain experience points. At certain experience point -totals, you gain an experience level. The more experienced -you are, the better you are able to fight and to withstand -magical attacks.

- -
- -

 

- -

3.2. The top line

-

The top line of the screen is reserved for -printing messages that describe things that are impossible -to represent visually. If you see a “--More--” -on the top line, this means that rogue wants to print -another message on the screen, but it wants to make certain -that you have read the one that is there first. To read the -next message, just type a space.

- - -

3.3. The rest of the screen

-

The rest of the screen is the map of the -level as you have explored it so far. Each symbol on the -screen repre- sents something. Here is a list of what the -various symbols mean:

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-

@

 -

This symbol represents you, the adventurer.

-

- |

 -

These symbols represent the walls of rooms.

-

+

 -

A door to/from a room.

-

.

 -

The floor of a room.

-

#

 -

The floor of a passage between rooms.

-

*

 -

A pile or pot of gold.

-

)

 -

A weapon of some sort.

-

]

 -

A piece of armor.

-

!

 -

A flask containing a magic potion.

-

?

 -

A piece of paper, usually a magic scroll.

-

=

 -

A ring with magic properties

-

/

 -

A magical staff or wand

-

^

 -

A trap, watch out for these.

-

%

 -

A staircase to other levels

-

:

 -

A piece of food.

-

A-Z

 -

The uppercase letters represent the various - inhabitants of the Dungeons of Doom. Watch out, they can be nasty and - vicious.

- - -

4. Commands

-

Commands are given to rogue by typing one or two characters. -Most commands can be preceded by a count to repeat them (e.g. typing “10s” will -do ten searches). Commands for which counts make no sense have the count -ignored. To cancel a count or a prefix, type <ESCAPE> . The list of commands is -rather long, but it can be read at any time during the game -with the “?” command. Here it is for reference, -with a short explanation of each -command.
- 

- -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-

?

 -

The help command. Asks for a character to give help - on. If you type a “*”, it will list all the commands, otherwise it will - explain what the character you typed does.

-

/

 -

This is the “What is that on the screen?” command. A - “/” followed by any character that you see on the level, will tell you - what that character is. For instance, typing “/@” will tell you that the - “@” symbol represents you, the player.

-

h, H, ^H

-   -

Move left. You move one space to the left. If you use - upper case “h”, you will continue to move left until you run into - something. This works for all movement commands (e.g. “L” means run in - direction “l”) If you use the “control” “h”, you will continue moving in - the specified direction until you pass something interesting or run into - a wall. You should experiment with this, since it is a very useful - command, but very difficult to describe. This also works for all movement -commands.

-

j

 -

Move down.

-

k

 -

Move up.

-

l

 -

Move right.

-

y

 -

Move diagonally up and left.

-

u

 -

Move diagonally up and right.

-

b

 -

Move diagonally down and left.

-

n

 -

Move diagonally down and right.

-

t

 -

Throw an object. This is a prefix command. When followed with a - direction it throws an object in the specified direction. (e.g. type -“th” to throw something to the -left.)

-

f

 -

Fight until someone dies. When followed with a direction this will force you to fight the creature -in that direction until either you or it bites the big -one.

-

m

 -

Move onto something without picking it up. This will move you one - space in the direction you specify and, if there is an object there you - can pick up, it won’t do it.

-

z

 -

Zap prefix. Point a staff or wand in a given direction and fire it. - Even non-directional staves must be pointed in some direction to be - used.

-

^

 -

Identify trap command. If a trap is on your map and you can’t - remember what type it is, you can get rogue to remind you by getting - next to it and typing “^” followed by the direction that would move -you on top of it.

-

s

 -

Search for traps and secret doors. Examine each space immediately - adjacent to you for the existence of a trap or secret door. There is a - large chance that even if there is something there, you won’t find it, - so you might have to search a while before you find something.

-

>

 -

Climb down a staircase to the next level. Not surprisingly, this can only be done if you are -standing on staircase.

-

<

 -

Climb up a staircase to the level above. This can’t be done without - the Amulet of Yendor -in your possession.

-

.

 -

Rest. This is the “do nothing” command. This is good for waiting and - healing.

-

,

 -

Pick up something. This picks up whatever you are currently standing on, if you are -standing on anything at all.

-

i

 -

Inventory. List what you are carrying in -your pack.

-

I

 -

Selective inventory. Tells you what a single item in your pack is.

-

q

 -

Quaff one of the potions you are carrying.

-

r

 -

Read one of the scrolls in your pack.

-

e

 -

Eat food from your pack.

-

w

 -

Wield a weapon. Take a weapon out of your pack and carry it for use - in combat, replacing the one you are currently using (if any).

-

W

 -

Wear armor. You can only wear one suit of armor at a time. This - takes extra time.

-

T

 -

Take armor off. You can’t remove armor that is cursed. This takes - extra time.

-

P

 -

Put on a ring. You can wear only two rings at a time (one on each - hand). If you aren’t wearing any rings, this command will ask you which - hand you want to wear it on, otherwise, it will place it on the unused - hand. The program assumes that you wield your sword in your right hand.

-

R

 -

Remove a ring. If you are only wearing one ring, this command takes - it off. If you are wearing two, it will ask you which one you wish to - remove,

-

d

 -

Drop an object. Take something out of your pack and leave it lying - on the floor. Only one object can occupy each space. You cannot drop a - cursed object at all if you are wielding or wearing it.

-

c

 -

Call an object something. If you have a type of object in your pack - which you wish to remember something about, you can use the call command - to give a name to that type of object. This is usually used when you - figure out what a potion, scroll, ring, or staff is after you pick it - up, or when you want to remember which of those swords in your pack you - were wielding.

-

D

 -

Print out which things you’ve discovered something about. This - command will ask you what type of thing you are interested in. If you - type the character for a given type of object (e.g. -“!” for potion) it will tell you which kinds of -that type of object you’ve discovered (i.e., figured out what they - are). This command works for -potions, scrolls, rings, and staves and -wands.

-

o

 -

Examine and set options. This command is further explained in the - section on options.

-

^R

 -

Redraws the screen. Useful if spurious messages or transmission - errors have messed up the display.

-

^P

 -

Print last message. Useful when a message disappears before you can - read it. This only repeats the last message that was not a mistyped - command so that you don’t loose anything by accidentally typing the - wrong character instead of ^P.

-

<ESCAPE>

-   - Cancel a command, prefix, or count.
-

!

 -

Escape to a shell for some commands.

-

Q

 -

Quit. Leave the game.

-

S

 -

Save the current game in a file. It will ask you whether you wish to - use the default save file. -Caveat: Rogue won’t let you start up a copy of -a saved game, and it removes the save file as soon as you -start up a restored game. This is to prevent people from -saving a game just before a dangerous position and then -restart- ing it if they die. To restore a saved game, give -the file name as an argument to rogue. As -in

-

% rogue -save_file

-

To restart from the default save file (see below), run

-

% rogue -r

-

v

 -

Prints the program version number.

-

)

 -

Print the weapon you are currently wielding

-

]

 -

Print the armor you are currently wearing

-

=

 -

Print the rings you are currently wearing

-

@

 -

Reprint the status line on the message line

- -
- -

5. Rooms

-

Rooms in the dungeons are either lit or -dark. If you walk into a lit room, the entire room will be -drawn on the screen as soon as you enter. If you walk into a -dark room, it will only be displayed as you explore it. Upon -leaving a room, all monsters inside the room are erased from -the screen. In the darkness you can only see one space in -all directions around you. A corridor is always -dark.

- -

6. Fighting

-

If you see a monster and you wish to fight -it, just attempt to run into it. Many times a monster you -find will mind its own business unless you attack it. It is -often the case that discretion is the better part of -valor.

- -

7. Objects you can find

-

When you find something in the dungeon, it -is common to want to pick the object up. This is -accomplished in rogue by walking over the object (unless you -use the “m” prefix, see above). If you are -carrying too many things, the pro- gram will tell you and it -won’t pick up the object, other- wise it will add it -to your pack and tell you what you just picked -up.

- -

Many of the commands that operate on -objects must prompt you to find out which object you want to -use. If you change your mind and don’t want to do that -command after all, just type an -<ESCAPE> and the command will be -aborted.

- -

Some objects, like armor and weapons, are -easily dif- ferentiated. Others, like scrolls and potions, -are given labels which vary according to type. During a -game, any two of the same kind of object with the same label -are the same type. However, the labels will vary from game -to game.

- -

When you use one of these labeled objects, -if its effect is obvious, rogue will remember what it is for -you. If it’s effect isn’t extremely obvious you -will be asked what you want to scribble on it so you will -recognize it later, or you can use the “call” -command (see above).

- -

7.1. Weapons

-

Some weapons, like arrows, come in bunches, -but most come one at a time. In order to use a weapon, you -must wield it. To fire an arrow out of a bow, you must first -wield the bow, then throw the arrow. You can only wield one -weapon at a time, but you can’t change weapons if the -one you are currently wielding is cursed. The commands to -use weapons are “w” (wield) and “t” -(throw).

- -

7.2. Armor

- -

There are various sorts of armor lying around in the dungeon. Some of it is -enchanted, some is cursed, and some is just normal. Different armor types have -different armor protection. The higher the armor protection, the more protection the armor affords against the blows of -monsters. Here is a list of the various armor types and -their normal armor protection:

-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
TypeProtection
None0
Leather armor2
Studded leather / Ring mail3
Scale mail 4
Chain mail  5
Banded mail / Splint mail6
Plate mail     7
-

 

-

-If a piece of armor is enchanted, its -armor protection will be higher than normal. If a suit of -armor is cursed, its armor protection will be lower, and you -will not be able to remove it. However, not all armor with a -protection that is lower than normal is -cursed. - -

- -

The commands to use weapons are -“W” (wear) and “T” (take -off).

- -

- -7.3. Scrolls

-

Scrolls come with titles in an unknown tongue3. After you read a scroll, it -disappears from your pack. The com mand to use a -scroll is “r” (read).

- -

- -7.4. Potions - -

- -

Potions are labeled by the color of the -liquid inside the flask. They disappear after being quaffed. -The command to use a scroll is “q” -(quaff).

- -

7.5. Staves and Wands

-

Staves and wands do the same kinds of -things. Staves are identified by a type of wood; wands by a -type of metal or bone. They are generally things you want to -do to some- thing over a long distance, so you must point -them at what you wish to affect to use them. Some staves are -not affected by the direction they are pointed, though. -Staves come with multiple magic charges, the number being -random, and when they are used up, the staff is just a piece -of wood or metal.

- -

The command to use a wand or staff is -“z” (zap)

- -

7.6. Rings

- -

Rings are very useful items, since they are -relatively permanent magic, unlike the usually fleeting -effects of potions, scrolls, and staves. Of course, the bad -rings are also more powerful. Most rings also cause you to -use up food more rapidly, the rate varying with the type of -ring. Rings are differentiated by their stone settings. The -com- mands to use rings are “P” (put on) and -“R” (remove).

- -

7.7. Food

- -

Food is necessary to keep you going. If you -go too long without eating you will faint, and eventually -die of starvation. The command to use food is -“e” (eat).

- -

8. Options

-

Due to variations in personal tastes and -conceptions of the way rogue should do things, there are a -set of options you can set that cause rogue to behave in -various different ways.

- -

8.1 Setting the options

- -

There are two ways to set the options. The -first is with the “o” command of rogue; the -second is with the “ROGUEOPTS” environment -variable.

- -

8.1.1. Using the ‘o’ command

- -

When you type “o” in rogue, it -clears the screen and displays the current settings for all -the options. It then places the cursor by the value of the -first option and waits for you to type. You can type a -<RETURN> which means to go to the next -option, a “−” which means to go to the -previous option, an <ESCAPE> which -means to return to the game, or you can give the option a -value. For boolean options this merely involves typing -“t” for true or “f” for false. For -string options, type the new value followed by a -<RETURN> .

- -

8.1.2. Using the ROGUEOPTS variable

- -

The ROGUEOPTS variable is a string -containing a comma separated list of initial values for the -various options. Boolean variables can be turned on by -listing their name or turned off by putting a -“no” in front of the name. Thus to set up an -environment variable so that jump is on, terse -is off, and the name is set to “Blue -Meanie”, use the command

- -

% setenv ROGUEOPTS -"jump,noterse,name=Blue Meanie"4

- -

8.2. Option list

- -

Here is a list of the options and an -explanation of what each one is for. The default value for -each is enclosed in square brackets. For character string -options, input over fifty characters will be -ignored.

- -

terse -[noterse]

-
-

- Useful for those who are tired of the -sometimes lengthy messages of rogue. This is a useful option -for playing on slow terminals, so this option defaults to -terse if you are on a slow (1200 baud or under) -terminal.

-
- -

jump -[nojump]

-
-

If this option is set, running moves will -not be displayed until you reach the end of the move. This -saves considerable cpu and display time. This option -defaults to jump if you are using a slow -terminal.

-
-

flush -[noflush]

-
-

All typeahead is thrown away after each round of battle. This is useful for those who type far -ahead and then watch in dismay as a Bat kills -them.

-
-

seefloor -[seefloor]

-
-

Display the floor around you on the screen -as you move through dark rooms. Due to the amount of -characters generated, this option defaults to -noseefloor if you are using a slow -terminal.

-
-

passgo -[nopassgo]

-
-

Follow turnings in passageways. If you run -in a pas- sage and you run into stone or a wall, rogue will -see if it can turn to the right or left. If it can only turn -one way, it will turn that way. If it can turn either or -neither, it will stop. This algorithm can sometimes lead to -slightly confusing occurrences which is why it defaults to -nopassgo.

-
-

tombstone -[tombstone]

-
-

Print out the tombstone at the end if you -get killed. This is nice but slow, so you can turn it off if -you like.

-
-

inven -[overwrite]

-
-

Inventory type. This can have one of three -values: overwrite, slow, or clear. With -overwrite the top lines of the map are overwritten -with the list when inventory is requested or when -“Which item do you wish to . . .? ” -questions are answered with a “*”. How- ever, if -the list is longer than a screenful, the screen is cleared. -With slow, lists are displayed one item at a time on -the top of the screen, and with clear, the screen is -cleared, the list is displayed, and then the dungeon level -is re-displayed. Due to speed considerations, clear -is the default for terminals without clear-to-end-of-line -capabilities.

-
-

name [account -name]

-
-

This is the name of your character. It is -used if you get on the top ten scorer’s -list.

-
-

fruit -[slime-mold]

-
-

This should hold the name of a fruit that -you enjoy eating. It is basically a whimsy that rogue uses -in a couple of places.

-
-

file -[~/rogue.save]

-
-

The default file name for saving the game. -If your phone is hung up by accident, rogue will -automatically save the game in this file. The file name may -start with the special character “~” which -expands to be your home directory.

-
-

9. Scoring

- -

Rogue usually maintains a list of the top -scoring people or scores on your machine. Depending on how -it is set up, it can post either the top scores or the top -players. In the latter case, each account on the machine can -post only one non-winning score on this list. If you score -higher than someone else on this list, or better your previous score on the list, you will be inserted in the proper -place under your current name. How many scores are kept can -also be set up by whoever installs it on your -machine.

- -

If you quit the game, you get out with all -of your gold intact. If, however, you get killed in the -Dungeons of Doom, your body is forwarded to your -next-of-kin, along with 90% of your gold; ten percent of -your gold is kept by the Dungeons’ wizard as a fee5. This should make you -consider whether you want to take one last hit at that -monster and possibly live, or quit and thus stop with -whatever you have. If you quit, you do get all your gold, -but if you swing and live, you might find -more.

- -

If you just want to see what the current top players/games list is, you can -type

-

% rogue −s

- -

10. Acknowledgements

- -

Rogue was originally conceived of by Glenn -Wichman and Michael Toy. Ken Arnold and Michael Toy then -smoothed out the user interface, and added jillions of new -features. We would like to thank Bob Arnold, Michelle Busch, -Andy Hatcher, Kipp Hickman, Mark Horton, Daniel Jensen, Bill -Joy, Joe Kalash, Steve Maurer, Marty McNary, Jan Miller, and -Scott Nelson for their ideas and assistance; and also the -teeming multitudes who graciously ignored work, school, and -social life to play rogue and send us bugs, complaints, suggestions, and just plain flames. And also -Mom.

- - - - - - - - - - - - - - - - - - - - - - - - - -
†UNIX is a registered trademark of The Open Group
1As opposed to pseudo English sentences.
2A minimum screen size of 24 lines by 80 columns is required. If the - screen is larger, only the 24x80 section -will be used for the map.
3Actually, it's a dialect spoken only by the twenty-seven members of - a tribe in Outer Mongolia, but you're not supposed to know that.
4For those of you who use the Bourne shell sh (1), the commands would be

$ ROGUEOPTS="jump,noterse,name=Blue Meanie"
-$ export ROGUEOPTS
- 

5The Dungeon's wizard is named Wally the Wonder Badger. Invocations - should be accompanied by a sizable donation.
- - diff --git a/src/cc/rogue/rogue.html.in b/src/cc/rogue/rogue.html.in deleted file mode 100644 index 260cb7a4d..000000000 --- a/src/cc/rogue/rogue.html.in +++ /dev/null @@ -1,1060 +0,0 @@ - - - - - - - - - - -

A Guide to the Dungeons of Doom

- -

Michael C. Toy
-Kenneth C. R. C. Arnold

- -

Computer Systems Research -Group
-Department of Electrical Engineering and Computer -Science
-University of California
-Berkeley, California 94720

- - -

ABSTRACT

- -
-
-

Rogue is a visual CRT based fantasy game which runs under the - UNIX† timesharing system. This paper describes how - to play rogue, and gives a few hints for those who might otherwise get - lost in the Dungeons of Doom.

-
-
- -

1. Introduction

- -

You have just finished your years as a -student at the local fighter’s guild. After much -practice and sweat you have finally completed your training -and are ready to embark upon a perilous adventure. As a test -of your skills, the local guildmasters have sent you into -the Dungeons of Doom. Your task is to return with the Amulet -of Yendor. Your reward for the completion of this task will -be a full membership in the local guild. In addition, you -are allowed to keep all the loot you bring back from the -dungeons.

- -

In preparation for your journey, you are -given an enchanted mace, a bow, and a quiver of arrows taken -from a dragon’s hoard in the far off Dark Mountains. -You are also outfitted with elf-crafted armor and given -enough food to reach the dungeons. You say goodbye to family -and friends for what may be the last time and head up the -road.

- -

You set out on your way to the dungeons and -after several days of uneventful travel, you see the -ancient ruins that mark the entrance to the Dungeons of -Doom. It is late at night, so you make camp at the entrance -and spend the night sleeping under the open skies. In the -morning you gather your weapons, put on your armor, eat what -is almost your last food, and enter the -dungeons.

- -

2. What is going on here?

-

You have just begun a game of rogue. Your -goal is to grab as much treasure as you can, find the Amulet -of Yendor, and get out of the Dungeons of Doom alive. On the -screen, a map of where you have been and what you have seen -on the current dungeon level is kept. As you explore more of -the level, it appears on the screen in front of -you.

-

Rogue differs from most computer fantasy -games in that it is screen oriented. Commands are all one or -two keystrokes1 and the -results of your commands are displayed graphically on the -screen rather than being explained in words2.

-

Another major difference between rogue and other computer fantasy games is that once you have solved -all the puzzles in a standard fantasy game, it has lost most -of its excitement and it ceases to be fun. Rogue, on the -other hand, generates a new dungeon every time you play it -and even the author finds it an entertaining and exciting -game.

- -

3. What do all those things on the screen mean?

-

In order to understand what is going on in -rogue you have to first get some grasp of what rogue is -doing with the screen. The rogue screen is intended to -replace the “You can see ...” descriptions of -standard fantasy games. Figure 1 is a sample of what a -rogue screen might look like.

- -
- -
-
-____________________________________________________________
-
-
-                        ------------
-                        |..........+
-                        |..@....]..|
-                        |....B.....|
-                        |..........|
-                        -----+------
-
-
-
-Level: 1  Gold: 0      Hp: 12(12)  Str: 16(16)  Arm: 4  Exp: 1/0
-
-                          Figure 1
-____________________________________________________________
-
-
-
-

3.1. The bottom line

-

At the bottom line of the screen are a few -pieces of cryptic information describing your current -status. Here is an explanation of what these things -mean:
- 

- - - - - - - - - - - - - - - - - - - - - - - - - - -
-

Level

 -

This number indicates how deep you -have gone in the dungeon. It starts at one and goes up as -you go deeper into the dungeon.

-

Gold

 -

The number of gold pieces you have managed to find and keep with you - so far.

-

Hp

 -

Your current and maximum health points. -Health points indicate how much damage you can take before -you die. The more you get hit in a fight, the lower they -get. You can regain health points by resting. The number in -parentheses is the maximum number your health points can -reach.

- -
-

Str

 - -

Your current strength and maximum ever -strength. This can be any integer less than or equal to 31, -or greater than or equal to three. The higher the num- ber, -the stronger you are. The number in the parentheses is the -maximum strength you have attained so far this -game.

- -
-

Arm

 -

Your current armor protection. This -number indicates how effective your armor is in stopping -blows from unfriendly creatures. The higher this number is, -the more effective the armor.

- -
-

Exp

 -

These two numbers give your current -experience level and experience points. As you do things, -you gain experience points. At certain experience point -totals, you gain an experience level. The more experienced -you are, the better you are able to fight and to withstand -magical attacks.

- -
- -

 

- -

3.2. The top line

-

The top line of the screen is reserved for -printing messages that describe things that are impossible -to represent visually. If you see a “--More--” -on the top line, this means that rogue wants to print -another message on the screen, but it wants to make certain -that you have read the one that is there first. To read the -next message, just type a space.

- - -

3.3. The rest of the screen

-

The rest of the screen is the map of the -level as you have explored it so far. Each symbol on the -screen repre- sents something. Here is a list of what the -various symbols mean:

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-

@

 -

This symbol represents you, the adventurer.

-

- |

 -

These symbols represent the walls of rooms.

-

+

 -

A door to/from a room.

-

.

 -

The floor of a room.

-

#

 -

The floor of a passage between rooms.

-

*

 -

A pile or pot of gold.

-

)

 -

A weapon of some sort.

-

]

 -

A piece of armor.

-

!

 -

A flask containing a magic potion.

-

?

 -

A piece of paper, usually a magic scroll.

-

=

 -

A ring with magic properties

-

/

 -

A magical staff or wand

-

^

 -

A trap, watch out for these.

-

%

 -

A staircase to other levels

-

:

 -

A piece of food.

-

A-Z

 -

The uppercase letters represent the various - inhabitants of the Dungeons of Doom. Watch out, they can be nasty and - vicious.

- - -

4. Commands

-

Commands are given to rogue by typing one or two characters. -Most commands can be preceded by a count to repeat them (e.g. typing “10s” will -do ten searches). Commands for which counts make no sense have the count -ignored. To cancel a count or a prefix, type <ESCAPE> . The list of commands is -rather long, but it can be read at any time during the game -with the “?” command. Here it is for reference, -with a short explanation of each -command.
- 

- -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-

?

 -

The help command. Asks for a character to give help - on. If you type a “*”, it will list all the commands, otherwise it will - explain what the character you typed does.

-

/

 -

This is the “What is that on the screen?” command. A - “/” followed by any character that you see on the level, will tell you - what that character is. For instance, typing “/@” will tell you that the - “@” symbol represents you, the player.

-

h, H, ^H

-   -

Move left. You move one space to the left. If you use - upper case “h”, you will continue to move left until you run into - something. This works for all movement commands (e.g. “L” means run in - direction “l”) If you use the “control” “h”, you will continue moving in - the specified direction until you pass something interesting or run into - a wall. You should experiment with this, since it is a very useful - command, but very difficult to describe. This also works for all movement -commands.

-

j

 -

Move down.

-

k

 -

Move up.

-

l

 -

Move right.

-

y

 -

Move diagonally up and left.

-

u

 -

Move diagonally up and right.

-

b

 -

Move diagonally down and left.

-

n

 -

Move diagonally down and right.

-

t

 -

Throw an object. This is a prefix command. When followed with a - direction it throws an object in the specified direction. (e.g. type -“th” to throw something to the -left.)

-

f

 -

Fight until someone dies. When followed with a direction this will force you to fight the creature -in that direction until either you or it bites the big -one.

-

m

 -

Move onto something without picking it up. This will move you one - space in the direction you specify and, if there is an object there you - can pick up, it won’t do it.

-

z

 -

Zap prefix. Point a staff or wand in a given direction and fire it. - Even non-directional staves must be pointed in some direction to be - used.

-

^

 -

Identify trap command. If a trap is on your map and you can’t - remember what type it is, you can get rogue to remind you by getting - next to it and typing “^” followed by the direction that would move -you on top of it.

-

s

 -

Search for traps and secret doors. Examine each space immediately - adjacent to you for the existence of a trap or secret door. There is a - large chance that even if there is something there, you won’t find it, - so you might have to search a while before you find something.

-

>

 -

Climb down a staircase to the next level. Not surprisingly, this can only be done if you are -standing on staircase.

-

<

 -

Climb up a staircase to the level above. This can’t be done without - the Amulet of Yendor -in your possession.

-

.

 -

Rest. This is the “do nothing” command. This is good for waiting and - healing.

-

,

 -

Pick up something. This picks up whatever you are currently standing on, if you are -standing on anything at all.

-

i

 -

Inventory. List what you are carrying in -your pack.

-

I

 -

Selective inventory. Tells you what a single item in your pack is.

-

q

 -

Quaff one of the potions you are carrying.

-

r

 -

Read one of the scrolls in your pack.

-

e

 -

Eat food from your pack.

-

w

 -

Wield a weapon. Take a weapon out of your pack and carry it for use - in combat, replacing the one you are currently using (if any).

-

W

 -

Wear armor. You can only wear one suit of armor at a time. This - takes extra time.

-

T

 -

Take armor off. You can’t remove armor that is cursed. This takes - extra time.

-

P

 -

Put on a ring. You can wear only two rings at a time (one on each - hand). If you aren’t wearing any rings, this command will ask you which - hand you want to wear it on, otherwise, it will place it on the unused - hand. The program assumes that you wield your sword in your right hand.

-

R

 -

Remove a ring. If you are only wearing one ring, this command takes - it off. If you are wearing two, it will ask you which one you wish to - remove,

-

d

 -

Drop an object. Take something out of your pack and leave it lying - on the floor. Only one object can occupy each space. You cannot drop a - cursed object at all if you are wielding or wearing it.

-

c

 -

Call an object something. If you have a type of object in your pack - which you wish to remember something about, you can use the call command - to give a name to that type of object. This is usually used when you - figure out what a potion, scroll, ring, or staff is after you pick it - up, or when you want to remember which of those swords in your pack you - were wielding.

-

D

 -

Print out which things you’ve discovered something about. This - command will ask you what type of thing you are interested in. If you - type the character for a given type of object (e.g. -“!” for potion) it will tell you which kinds of -that type of object you’ve discovered (i.e., figured out what they - are). This command works for -potions, scrolls, rings, and staves and -wands.

-

o

 -

Examine and set options. This command is further explained in the - section on options.

-

^R

 -

Redraws the screen. Useful if spurious messages or transmission - errors have messed up the display.

-

^P

 -

Print last message. Useful when a message disappears before you can - read it. This only repeats the last message that was not a mistyped - command so that you don’t loose anything by accidentally typing the - wrong character instead of ^P.

-

<ESCAPE>

-   - Cancel a command, prefix, or count.
-

!

 -

Escape to a shell for some commands.

-

Q

 -

Quit. Leave the game.

-

S

 -

Save the current game in a file. It will ask you whether you wish to - use the default save file. -Caveat: Rogue won’t let you start up a copy of -a saved game, and it removes the save file as soon as you -start up a restored game. This is to prevent people from -saving a game just before a dangerous position and then -restart- ing it if they die. To restore a saved game, give -the file name as an argument to rogue. As -in

-

% rogue -save_file

-

To restart from the default save file (see below), run

-

% rogue -r

-

v

 -

Prints the program version number.

-

)

 -

Print the weapon you are currently wielding

-

]

 -

Print the armor you are currently wearing

-

=

 -

Print the rings you are currently wearing

-

@

 -

Reprint the status line on the message line

- -
- -

5. Rooms

-

Rooms in the dungeons are either lit or -dark. If you walk into a lit room, the entire room will be -drawn on the screen as soon as you enter. If you walk into a -dark room, it will only be displayed as you explore it. Upon -leaving a room, all monsters inside the room are erased from -the screen. In the darkness you can only see one space in -all directions around you. A corridor is always -dark.

- -

6. Fighting

-

If you see a monster and you wish to fight -it, just attempt to run into it. Many times a monster you -find will mind its own business unless you attack it. It is -often the case that discretion is the better part of -valor.

- -

7. Objects you can find

-

When you find something in the dungeon, it -is common to want to pick the object up. This is -accomplished in rogue by walking over the object (unless you -use the “m” prefix, see above). If you are -carrying too many things, the pro- gram will tell you and it -won’t pick up the object, other- wise it will add it -to your pack and tell you what you just picked -up.

- -

Many of the commands that operate on -objects must prompt you to find out which object you want to -use. If you change your mind and don’t want to do that -command after all, just type an -<ESCAPE> and the command will be -aborted.

- -

Some objects, like armor and weapons, are -easily dif- ferentiated. Others, like scrolls and potions, -are given labels which vary according to type. During a -game, any two of the same kind of object with the same label -are the same type. However, the labels will vary from game -to game.

- -

When you use one of these labeled objects, -if its effect is obvious, rogue will remember what it is for -you. If it’s effect isn’t extremely obvious you -will be asked what you want to scribble on it so you will -recognize it later, or you can use the “call” -command (see above).

- -

7.1. Weapons

-

Some weapons, like arrows, come in bunches, -but most come one at a time. In order to use a weapon, you -must wield it. To fire an arrow out of a bow, you must first -wield the bow, then throw the arrow. You can only wield one -weapon at a time, but you can’t change weapons if the -one you are currently wielding is cursed. The commands to -use weapons are “w” (wield) and “t” -(throw).

- -

7.2. Armor

- -

There are various sorts of armor lying around in the dungeon. Some of it is -enchanted, some is cursed, and some is just normal. Different armor types have -different armor protection. The higher the armor protection, the more protection the armor affords against the blows of -monsters. Here is a list of the various armor types and -their normal armor protection:

-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
TypeProtection
None0
Leather armor2
Studded leather / Ring mail3
Scale mail 4
Chain mail  5
Banded mail / Splint mail6
Plate mail     7
-

 

-

-If a piece of armor is enchanted, its -armor protection will be higher than normal. If a suit of -armor is cursed, its armor protection will be lower, and you -will not be able to remove it. However, not all armor with a -protection that is lower than normal is -cursed. - -

- -

The commands to use weapons are -“W” (wear) and “T” (take -off).

- -

- -7.3. Scrolls

-

Scrolls come with titles in an unknown tongue3. After you read a scroll, it -disappears from your pack. The com mand to use a -scroll is “r” (read).

- -

- -7.4. Potions - -

- -

Potions are labeled by the color of the -liquid inside the flask. They disappear after being quaffed. -The command to use a scroll is “q” -(quaff).

- -

7.5. Staves and Wands

-

Staves and wands do the same kinds of -things. Staves are identified by a type of wood; wands by a -type of metal or bone. They are generally things you want to -do to some- thing over a long distance, so you must point -them at what you wish to affect to use them. Some staves are -not affected by the direction they are pointed, though. -Staves come with multiple magic charges, the number being -random, and when they are used up, the staff is just a piece -of wood or metal.

- -

The command to use a wand or staff is -“z” (zap)

- -

7.6. Rings

- -

Rings are very useful items, since they are -relatively permanent magic, unlike the usually fleeting -effects of potions, scrolls, and staves. Of course, the bad -rings are also more powerful. Most rings also cause you to -use up food more rapidly, the rate varying with the type of -ring. Rings are differentiated by their stone settings. The -com- mands to use rings are “P” (put on) and -“R” (remove).

- -

7.7. Food

- -

Food is necessary to keep you going. If you -go too long without eating you will faint, and eventually -die of starvation. The command to use food is -“e” (eat).

- -

8. Options

-

Due to variations in personal tastes and -conceptions of the way rogue should do things, there are a -set of options you can set that cause rogue to behave in -various different ways.

- -

8.1 Setting the options

- -

There are two ways to set the options. The -first is with the “o” command of rogue; the -second is with the “ROGUEOPTS” environment -variable.

- -

8.1.1. Using the ‘o’ command

- -

When you type “o” in rogue, it -clears the screen and displays the current settings for all -the options. It then places the cursor by the value of the -first option and waits for you to type. You can type a -<RETURN> which means to go to the next -option, a “−” which means to go to the -previous option, an <ESCAPE> which -means to return to the game, or you can give the option a -value. For boolean options this merely involves typing -“t” for true or “f” for false. For -string options, type the new value followed by a -<RETURN> .

- -

8.1.2. Using the ROGUEOPTS variable

- -

The ROGUEOPTS variable is a string -containing a comma separated list of initial values for the -various options. Boolean variables can be turned on by -listing their name or turned off by putting a -“no” in front of the name. Thus to set up an -environment variable so that jump is on, terse -is off, and the name is set to “Blue -Meanie”, use the command

- -

% setenv ROGUEOPTS -"jump,noterse,name=Blue Meanie"4

- -

8.2. Option list

- -

Here is a list of the options and an -explanation of what each one is for. The default value for -each is enclosed in square brackets. For character string -options, input over fifty characters will be -ignored.

- -

terse -[noterse]

-
-

- Useful for those who are tired of the -sometimes lengthy messages of rogue. This is a useful option -for playing on slow terminals, so this option defaults to -terse if you are on a slow (1200 baud or under) -terminal.

-
- -

jump -[nojump]

-
-

If this option is set, running moves will -not be displayed until you reach the end of the move. This -saves considerable cpu and display time. This option -defaults to jump if you are using a slow -terminal.

-
-

flush -[noflush]

-
-

All typeahead is thrown away after each round of battle. This is useful for those who type far -ahead and then watch in dismay as a Bat kills -them.

-
-

seefloor -[seefloor]

-
-

Display the floor around you on the screen -as you move through dark rooms. Due to the amount of -characters generated, this option defaults to -noseefloor if you are using a slow -terminal.

-
-

passgo -[nopassgo]

-
-

Follow turnings in passageways. If you run -in a pas- sage and you run into stone or a wall, rogue will -see if it can turn to the right or left. If it can only turn -one way, it will turn that way. If it can turn either or -neither, it will stop. This algorithm can sometimes lead to -slightly confusing occurrences which is why it defaults to -nopassgo.

-
-

tombstone -[tombstone]

-
-

Print out the tombstone at the end if you -get killed. This is nice but slow, so you can turn it off if -you like.

-
-

inven -[overwrite]

-
-

Inventory type. This can have one of three -values: overwrite, slow, or clear. With -overwrite the top lines of the map are overwritten -with the list when inventory is requested or when -“Which item do you wish to . . .? ” -questions are answered with a “*”. How- ever, if -the list is longer than a screenful, the screen is cleared. -With slow, lists are displayed one item at a time on -the top of the screen, and with clear, the screen is -cleared, the list is displayed, and then the dungeon level -is re-displayed. Due to speed considerations, clear -is the default for terminals without clear-to-end-of-line -capabilities.

-
-

name [account -name]

-
-

This is the name of your character. It is -used if you get on the top ten scorer’s -list.

-
-

fruit -[slime-mold]

-
-

This should hold the name of a fruit that -you enjoy eating. It is basically a whimsy that rogue uses -in a couple of places.

-
-

file -[~/rogue.save]

-
-

The default file name for saving the game. -If your phone is hung up by accident, rogue will -automatically save the game in this file. The file name may -start with the special character “~” which -expands to be your home directory.

-
-

9. Scoring

- -

Rogue usually maintains a list of the top -scoring people or scores on your machine. Depending on how -it is set up, it can post either the top scores or the top -players. In the latter case, each account on the machine can -post only one non-winning score on this list. If you score -higher than someone else on this list, or better your previous score on the list, you will be inserted in the proper -place under your current name. How many scores are kept can -also be set up by whoever installs it on your -machine.

- -

If you quit the game, you get out with all -of your gold intact. If, however, you get killed in the -Dungeons of Doom, your body is forwarded to your -next-of-kin, along with 90% of your gold; ten percent of -your gold is kept by the Dungeons’ wizard as a fee5. This should make you -consider whether you want to take one last hit at that -monster and possibly live, or quit and thus stop with -whatever you have. If you quit, you do get all your gold, -but if you swing and live, you might find -more.

- -

If you just want to see what the current top players/games list is, you can -type

-

% @PROGRAM@ −s

- -

10. Acknowledgements

- -

Rogue was originally conceived of by Glenn -Wichman and Michael Toy. Ken Arnold and Michael Toy then -smoothed out the user interface, and added jillions of new -features. We would like to thank Bob Arnold, Michelle Busch, -Andy Hatcher, Kipp Hickman, Mark Horton, Daniel Jensen, Bill -Joy, Joe Kalash, Steve Maurer, Marty McNary, Jan Miller, and -Scott Nelson for their ideas and assistance; and also the -teeming multitudes who graciously ignored work, school, and -social life to play rogue and send us bugs, complaints, suggestions, and just plain flames. And also -Mom.

- - - - - - - - - - - - - - - - - - - - - - - - - -
†UNIX is a registered trademark of The Open Group
1As opposed to pseudo English sentences.
2A minimum screen size of 24 lines by 80 columns is required. If the - screen is larger, only the 24x80 section -will be used for the map.
3Actually, it's a dialect spoken only by the twenty-seven members of - a tribe in Outer Mongolia, but you're not supposed to know that.
4For those of you who use the Bourne shell sh (1), the commands would be

$ ROGUEOPTS="jump,noterse,name=Blue Meanie"
-$ export ROGUEOPTS
- 

5The Dungeon's wizard is named Wally the Wonder Badger. Invocations - should be accompanied by a sizable donation.
- - diff --git a/src/cc/rogue/rogue.me b/src/cc/rogue/rogue.me deleted file mode 100644 index 1a2568477..000000000 --- a/src/cc/rogue/rogue.me +++ /dev/null @@ -1,892 +0,0 @@ -.\" -.\" @(#)rogue.me 6.2 (Berkeley) 4/28/86 -.\" -.\" Rogue: Exploring the Dungeons of Doom -.\" Copyright (C) 1980-1983, 1985, 1986 Michael Toy, Ken Arnold and Glenn Wichman -.\" All rights reserved. -.\" -.\" See the file LICENSE.TXT for full copyright and licensing information. -.\" -.ds E \s-2\s0 -.ds R \s-2\s0 -.ds U \s-2UNIX\s0 -.ie t .ds _ \d\(mi\u -.el .ds _ _ -.de Cs -\&\\$3\*(lq\\$1\*(rq\\$2 -.. -.sp 5 -.ce 1000 -.ps +4 -.vs +4p -.b -A Guide to the Dungeons of Doom -.r -.vs -.ps -.sp 2 -.i -Michael C. Toy -Kenneth C. R. C. Arnold -.r -.sp 2 -Computer Systems Research Group -Department of Electrical Engineering and Computer Science -University of California -Berkeley, California 94720 -.sp 4 -.i ABSTRACT -.ce 0 -.(b I F -.bi Rogue -is a visual CRT based fantasy game -which runs under the \*U\(dg timesharing system. -.(f -\fR\(dg\*U is a trademark of Bell Laboratories\fP -.)f -This paper describes how to play rogue, -and gives a few hints -for those who might otherwise get lost in the Dungeons of Doom. -.)b -\".he '''\fBA Guide to the Dungeons of Doom\fP' -\" .fo ''- % -'' -.eh 'USD:33-%''A Guide to the Dungeons of Doom' -.oh 'A Guide to the Dungeons of Doom''USD:33-%' -.sh 1 Introduction -.pp -You have just finished your years as a student at the local fighter's guild. -After much practice and sweat you have finally completed your training -and are ready to embark upon a perilous adventure. -As a test of your skills, -the local guildmasters have sent you into the Dungeons of Doom. -Your task is to return with the Amulet of Yendor. -Your reward for the completion of this task -will be a full membership in the local guild. -In addition, -you are allowed to keep all the loot you bring back from the dungeons. -.pp -In preparation for your journey, -you are given an enchanted mace, -a bow, and a quiver of arrows -taken from a dragon's hoard in the far off Dark Mountains. -You are also outfitted with elf-crafted armor -and given enough food to reach the dungeons. -You say goodbye to family and friends for what may be the last time -and head up the road. -.pp -You set out on your way to the dungeons -and after several days of uneventful travel, -you see the ancient ruins -that mark the entrance to the Dungeons of Doom. -It is late at night, -so you make camp at the entrance -and spend the night sleeping under the open skies. -In the morning you gather your weapons, -put on your armor, -eat what is almost your last food, -and enter the dungeons. -.sh 1 "What is going on here?" -.pp -You have just begun a game of rogue. -Your goal is to grab as much treasure as you can, -find the Amulet of Yendor, -and get out of the Dungeons of Doom alive. -On the screen, -a map of where you have been -and what you have seen on the current dungeon level is kept. -As you explore more of the level, -it appears on the screen in front of you. -.pp -Rogue differs from most computer fantasy games in that it is screen oriented. -Commands are all one or two keystrokes\** -.(f -\** As opposed to pseudo English sentences. -.)f -and the results of your commands -are displayed graphically on the screen rather -than being explained in words.\** -.(f -\** A minimum screen size of 24 lines by 80 columns is required. -If the screen is larger, only the 24x80 section will be used -for the map. -.)f -.pp -Another major difference between rogue and other computer fantasy games -is that once you have solved all the puzzles in a standard fantasy game, -it has lost most of its excitement and it ceases to be fun. -Rogue, -on the other hand, -generates a new dungeon every time you play it -and even the author finds it an entertaining and exciting game. -.sh 1 "What do all those things on the screen mean?" -.pp -In order to understand what is going on in rogue -you have to first get some grasp of what rogue is doing with the screen. -The rogue screen is intended -to replace the \*(lqYou can see ...\*(rq descriptions -of standard fantasy games. -Figure 1 is a sample of what a rogue screen might look like. -.(z -.hl -.nf -.TS -center; -ce0 ce0 ce0 ce0 ce0 ce0 ce0 ce0 ce0 ce0 ce0 ce. -- - - - - - - - - - - - -| . . . . . . . . . . + -| . . @ . . . . ] . . | -| . . . . B . . . . . | -| . . . . . . . . . . | -- - - - - + - - - - - - -.TE - - -.ce 1000 -Level: 1 Gold: 0 Hp: 12(12) Str: 16(16) Arm: 4 Exp: 1/0 - -Figure 1 -.ce -.hl -.)z -.sh 2 "The bottom line" -.pp -At the bottom line of the screen -are a few pieces of cryptic information -describing your current status. -Here is an explanation of what these things mean: -.ip Level \w'Level\ \ 'u -This number indicates how deep you have gone in the dungeon. -It starts at one and goes up as you go deeper into the dungeon. -.ip Gold \w'Level\ \ 'u -The number of gold pieces you have managed to find -and keep with you so far. -.ip Hp \w'Level\ \ 'u -Your current and maximum health points. -Health points indicate how much damage you can take before you die. -The more you get hit in a fight, -the lower they get. -You can regain health points by resting. -The number in parentheses -is the maximum number your health points can reach. -.ip Str \w'Level\ \ 'u -Your current strength and maximum ever strength. -This can be any integer less than or equal to 31, -or greater than or equal to three. -The higher the number, -the stronger you are. -The number in the parentheses -is the maximum strength you have attained so far this game. -.ip Arm \w'Level\ \ 'u -Your current armor protection. -This number indicates how effective your armor is -in stopping blows from unfriendly creatures. -The higher this number is, -the more effective the armor. -.ip Exp \w'Level\ \ 'u -These two numbers give your current experience level -and experience points. -As you do things, -you gain experience points. -At certain experience point totals, -you gain an experience level. -The more experienced you are, -the better you are able to fight and to withstand magical attacks. -.sh 2 "The top line" -.pp -The top line of the screen is reserved -for printing messages that describe things -that are impossible to represent visually. -If you see a \*(lq--More--\*(rq on the top line, -this means that rogue wants to print another message on the screen, -but it wants to make certain -that you have read the one that is there first. -To read the next message, -just type a space. -.sh 2 "The rest of the screen" -.pp -The rest of the screen is the map of the level -as you have explored it so far. -Each symbol on the screen represents something. -Here is a list of what the various symbols mean: -.ip @ -This symbol represents you, the adventurer. -.ip "-\^|" -These symbols represent the walls of rooms. -.ip + -A door to/from a room. -.ip . -The floor of a room. -.ip # -The floor of a passage between rooms. -.ip * -A pile or pot of gold. -.ip ) -A weapon of some sort. -.ip ] -A piece of armor. -.ip ! -A flask containing a magic potion. -.ip ? -A piece of paper, usually a magic scroll. -.ip = -A ring with magic properties -.ip / -A magical staff or wand -.ip ^ -A trap, watch out for these. -.ip % -A staircase to other levels -.ip : -A piece of food. -.ip A-Z -The uppercase letters -represent the various inhabitants of the Dungeons of Doom. -Watch out, they can be nasty and vicious. -.sh 1 Commands -.pp -Commands are given to rogue by typing one or two characters. -Most commands can be preceded by a count to repeat them -(e.g. typing -.Cs 10s -will do ten searches). -Commands for which counts make no sense -have the count ignored. -To cancel a count or a prefix, -type \*E. -The list of commands is rather long, -but it can be read at any time during the game with the -.Cs ? -command. -Here it is for reference, -with a short explanation of each command. -.ip ? -The help command. -Asks for a character to give help on. -If you type a -.Cs * , -it will list all the commands, -otherwise it will explain what the character you typed does. -.ip / -This is the \*(lqWhat is that on the screen?\*(rq command. -A -.Cs / -followed by any character that you see on the level, -will tell you what that character is. -For instance, -typing -.Cs /@ -will tell you that the -.Cs @ -symbol represents you, the player. -.ip "h, H, ^H" -Move left. -You move one space to the left. -If you use upper case -.Cs h , -you will continue to move left until you run into something. -This works for all movement commands -(e.g. -.Cs L -means run in direction -.Cs l ) -If you use the \*(lqcontrol\*(rq -.Cs h , -you will continue moving in the specified direction -until you pass something interesting or run into a wall. -You should experiment with this, -since it is a very useful command, -but very difficult to describe. -This also works for all movement commands. -.ip j -Move down. -.ip k -Move up. -.ip l -Move right. -.ip y -Move diagonally up and left. -.ip u -Move diagonally up and right. -.ip b -Move diagonally down and left. -.ip n -Move diagonally down and right. -.ip t -Throw an object. -This is a prefix command. -When followed with a direction -it throws an object in the specified direction. -(e.g. type -.Cs th -to throw -something to the left.) -.ip f -Fight until someone dies. -When followed with a direction -this will force you to fight the creature in that direction -until either you or it bites the big one. -.ip m -Move onto something without picking it up. -This will move you one space in the direction you specify and, -if there is an object there you can pick up, -it won't do it. -.ip z -Zap prefix. -Point a staff or wand in a given direction -and fire it. -Even non-directional staves must be pointed in some direction -to be used. -.ip ^ -Identify trap command. -If a trap is on your map -and you can't remember what type it is, -you can get rogue to remind you -by getting next to it and typing -.Cs ^ -followed by the direction that would move you on top of it. -.ip s -Search for traps and secret doors. -Examine each space immediately adjacent to you -for the existence of a trap or secret door. -There is a large chance that even if there is something there, -you won't find it, -so you might have to search a while before you find something. -.ip > -Climb down a staircase to the next level. -Not surprisingly, this can only be done if you are standing on staircase. -.ip < -Climb up a staircase to the level above. -This can't be done without the Amulet of Yendor in your possession. -.ip "." -Rest. -This is the \*(lqdo nothing\*(rq command. -This is good for waiting and healing. -.ip , -Pick up something. -This picks up whatever you are currently standing on, -if you are standing on anything at all. -.ip i -Inventory. -List what you are carrying in your pack. -.ip I -Selective inventory. -Tells you what a single item in your pack is. -.ip q -Quaff one of the potions you are carrying. -.ip r -Read one of the scrolls in your pack. -.ip e -Eat food from your pack. -.ip w -Wield a weapon. -Take a weapon out of your pack and carry it for use in combat, -replacing the one you are currently using (if any). -.ip W -Wear armor. -You can only wear one suit of armor at a time. -This takes extra time. -.ip T -Take armor off. -You can't remove armor that is cursed. -This takes extra time. -.ip P -Put on a ring. -You can wear only two rings at a time -(one on each hand). -If you aren't wearing any rings, -this command will ask you which hand you want to wear it on, -otherwise, it will place it on the unused hand. -The program assumes that you wield your sword in your right hand. -.ip R -Remove a ring. -If you are only wearing one ring, -this command takes it off. -If you are wearing two, -it will ask you which one you wish to remove, -.ip d -Drop an object. -Take something out of your pack and leave it lying on the floor. -Only one object can occupy each space. -You cannot drop a cursed object at all -if you are wielding or wearing it. -.ip c -Call an object something. -If you have a type of object in your pack -which you wish to remember something about, -you can use the call command to give a name to that type of object. -This is usually used when you figure out what a -potion, scroll, ring, or staff is -after you pick it up, -or when you want to remember -which of those swords in your pack you were wielding. -.ip D -Print out which things you've discovered something about. -This command will ask you what type of thing you are interested in. -If you type the character for a given type of object -(\fIe.g.\fP -.Cs ! -for potion) -it will tell you which kinds of that type of object you've discovered -(\fIi.e.\fP, figured out what they are). -This command works for potions, scrolls, rings, and staves and wands. -.ip o -Examine and set options. -This command is further explained in the section on options. -.ip ^R -Redraws the screen. -Useful if spurious messages or transmission errors -have messed up the display. -.ip ^P -Print last message. -Useful when a message disappears before you can read it. -This only repeats the last message -that was not a mistyped command -so that you don't loose anything by accidentally typing -the wrong character instead of ^P. -.ip \*E -Cancel a command, prefix, or count. -.ip ! -Escape to a shell for some commands. -.ip Q -Quit. -Leave the game. -.ip S -Save the current game in a file. -It will ask you whether you wish to use the default save file. -.i Caveat : -Rogue won't let you start up a copy of a saved game, -and it removes the save file as soon as you start up a restored game. -This is to prevent people from saving a game just before a dangerous position -and then restarting it if they die. -To restore a saved game, -give the file name as an argument to rogue. -As in -.ti +1i -.nf -% rogue \fIsave\*_file\fP -.ip -To restart from the default save file (see below), -run -.ti +1i -.nf -% rogue \-r -.ip v -Prints the program version number. -.ip ) -Print the weapon you are currently wielding -.ip ] -Print the armor you are currently wearing -.ip = -Print the rings you are currently wearing -.ip @ -Reprint the status line on the message line -.sh 1 Rooms -.pp -Rooms in the dungeons are either lit or dark. -If you walk into a lit room, -the entire room will be drawn on the screen as soon as you enter. -If you walk into a dark room, -it will only be displayed as you explore it. -Upon leaving a room, -all monsters inside the room -are erased from the screen. -In the darkness you can only see one space -in all directions around you. -A corridor is always dark. -.sh 1 Fighting -.pp -If you see a monster and you wish to fight it, -just attempt to run into it. -Many times a monster you find will mind its own business -unless you attack it. -It is often the case that discretion is the better part of valor. -.sh 1 "Objects you can find" -.pp -When you find something in the dungeon, -it is common to want to pick the object up. -This is accomplished in rogue by walking over the object -(unless you use the -.Cs m -prefix, see above). -If you are carrying too many things, -the program will tell you and it won't pick up the object, -otherwise it will add it to your pack -and tell you what you just picked up. -.pp -Many of the commands that operate on objects must prompt you -to find out which object you want to use. -If you change your mind and don't want to do that command after all, -just type an \*E and the command will be aborted. -.pp -Some objects, like armor and weapons, -are easily differentiated. -Others, like scrolls and potions, -are given labels which vary according to type. -During a game, -any two of the same kind of object -with the same label -are the same type. -However, -the labels will vary from game to game. -.pp -When you use one of these labeled objects, -if its effect is obvious, -rogue will remember what it is for you. -If it's effect isn't extremely obvious -you will be asked what you want to scribble on it -so you will recognize it later, -or you can use the -.Cs call -command -(see above). -.sh 2 Weapons -.pp -Some weapons, -like arrows, -come in bunches, -but most come one at a time. -In order to use a weapon, -you must wield it. -To fire an arrow out of a bow, -you must first wield the bow, -then throw the arrow. -You can only wield one weapon at a time, -but you can't change weapons if the one -you are currently wielding is cursed. -The commands to use weapons are -.Cs w -(wield) -and -.Cs t -(throw). -.sh 2 Armor -.pp -There are various sorts of armor lying around in the dungeon. -Some of it is enchanted, -some is cursed, -and some is just normal. -Different armor types have different armor protection. -The higher the armor protection, -the more protection the armor affords against the blows of monsters. -Here is a list of the various armor types and their normal armor protection: -.(b -.TS -box center; -l r. -\ \ \fIType Protection\fP -None 0 -Leather armor 2 -Studded leather / Ring mail 3 -Scale mail 4 -Chain mail 5 -Banded mail / Splint mail 6 -Plate mail 7 -.TE -.)b -.lp -If a piece of armor is enchanted, -its armor protection will be higher than normal. -If a suit of armor is cursed, -its armor protection will be lower, -and you will not be able to remove it. -However, not all armor with a protection that is lower than normal is cursed. -.pp -The commands to use weapons are -.Cs W -(wear) -and -.Cs T -(take off). -.sh 2 Scrolls -.pp -Scrolls come with titles in an unknown tongue\**. -.(f -\** Actually, it's a dialect spoken only by the twenty-seven members -of a tribe in Outer Mongolia, -but you're not supposed to -.i know -that. -.)f -After you read a scroll, -it disappears from your pack. -The command to use a scroll is -.Cs r -(read). -.sh 2 Potions -.pp -Potions are labeled by the color of the liquid inside the flask. -They disappear after being quaffed. -The command to use a scroll is -.Cs q -(quaff). -.sh 2 "Staves and Wands" -.pp -Staves and wands do the same kinds of things. -Staves are identified by a type of wood; -wands by a type of metal or bone. -They are generally things you want to do to something -over a long distance, -so you must point them at what you wish to affect -to use them. -Some staves are not affected by the direction they are pointed, though. -Staves come with multiple magic charges, -the number being random, -and when they are used up, -the staff is just a piece of wood or metal. -.pp -The command to use a wand or staff is -.Cs z -(zap) -.sh 2 Rings -.pp -Rings are very useful items, -since they are relatively permanent magic, -unlike the usually fleeting effects of potions, scrolls, and staves. -Of course, -the bad rings are also more powerful. -Most rings also cause you to use up food more rapidly, -the rate varying with the type of ring. -Rings are differentiated by their stone settings. -The commands to use rings are -.Cs P -(put on) -and -.Cs R -(remove). -.sh 2 Food -.pp -Food is necessary to keep you going. -If you go too long without eating you will faint, -and eventually die of starvation. -The command to use food is -.Cs e -(eat). -.sh 1 Options -.pp -Due to variations in personal tastes -and conceptions of the way rogue should do things, -there are a set of options you can set -that cause rogue to behave in various different ways. -.sh 2 "Setting the options" -.pp -There are two ways to set the options. -The first is with the -.Cs o -command of rogue; -the second is with the -.Cs ROGUEOPTS -environment variable\**. -.(f -\** On Version 6 systems, -there is no equivalent of the ROGUEOPTS feature. -.br -.)f -.br -.sh 3 "Using the `o' command" -.pp -When you type -.Cs o -in rogue, -it clears the screen -and displays the current settings for all the options. -It then places the cursor by the value of the first option -and waits for you to type. -You can type a \*R -which means to go to the next option, -a -.Cs \- -which means to go to the previous option, -an \*E -which means to return to the game, -or you can give the option a value. -For boolean options this merely involves typing -.Cs t -for true or -.Cs f -for false. -For string options, -type the new value followed by a \*R. -.sh 3 "Using the ROGUEOPTS variable" -.pp -The ROGUEOPTS variable is a string -containing a comma separated list of initial values -for the various options. -Boolean variables can be turned on by listing their name -or turned off by putting a -.Cs no -in front of the name. -Thus to set up an environment variable so that -.b jump -is on, -.b terse -is off, -and the -.b name -is set to \*(lqBlue Meanie\*(rq, -use the command -.nf -.ti +3n -% setenv ROGUEOPTS "jump,noterse,name=Blue Meanie"\** -.fi -.(f -\** -For those of you who use the Bourne shell sh (1), the commands would be -.in +3 -.nf -$ ROGUEOPTS="jump,noterse,name=Blue Meanie" -$ export ROGUEOPTS -.fi -.in +0 -.)f -.sh 2 "Option list" -.pp -Here is a list of the options -and an explanation of what each one is for. -The default value for each is enclosed in square brackets. -For character string options, -input over fifty characters will be ignored. -.ip "\fBterse\fP [\fI\^noterse\^\fP]" -Useful for those who are tired of the sometimes lengthy messages of rogue. -This is a useful option for playing on slow terminals, -so this option defaults to -.i terse -if you -are on a slow (1200 baud or under) terminal. -.ip "\fBjump\fP [\fI\^nojump\^\fP]" -If this option is set, -running moves will not be displayed -until you reach the end of the move. -This saves considerable cpu and display time. -This option defaults to -.i jump -if you are using a slow terminal. -.ip "\fBflush\fP [\fI\^noflush\^\fP]" -All typeahead is thrown away after each round of battle. -This is useful for those who type far ahead -and then watch in dismay as a Bat kills them. -.ip "\fBseefloor\fP [\fI\^seefloor\^\fP]" -Display the floor around you on the screen -as you move through dark rooms. -Due to the amount of characters generated, -this option defaults to -.i noseefloor -if you are using a slow terminal. -.ip "\fBpassgo\fP [\fI\^nopassgo\^\fP]" -Follow turnings in passageways. -If you run in a passage -and you run into stone or a wall, -rogue will see if it can turn to the right or left. -If it can only turn one way, -it will turn that way. -If it can turn either or neither, -it will stop. -This algorithm can sometimes lead to slightly confusing occurrences -which is why it defaults to \fInopassgo\fP. -.ip "\fBtombstone\fP [\fI\^tombstone\^\fP]" -Print out the tombstone at the end if you get killed. -This is nice but slow, so you can turn it off if you like. -.ip "\fBinven\fP [\fI\^overwrite\^\fP]" -Inventory type. -This can have one of three values: -.i overwrite , -.i slow , -or -.i clear . -With -.i overwrite -the top lines of the map are overwritten -with the list -when inventory is requested -or when -\*(lqWhich item do you wish to \fB. . .\fP? \*(rq questions -are answered with a -.Cs * . -However, if the list is longer than a screenful, -the screen is cleared. -With -.i slow , -lists are displayed one item at a time on the top of the screen, -and with -.i clear , -the screen is cleared, -the list is displayed, -and then the dungeon level is re-displayed. -Due to speed considerations, -.i clear -is the default for terminals without -clear-to-end-of-line capabilities. -.ip "\fBname\fP [account name]" -This is the name of your character. -It is used if you get on the top ten scorer's list. -.ip "\fBfruit\fP [\fI\^slime-mold\^\fP]" -This should hold the name of a fruit that you enjoy eating. -It is basically a whimsey that rogue uses in a couple of places. -.ip "\fBfile\fP [\fI\^~/rogue.save\^\fP]" -The default file name for saving the game. -If your phone is hung up by accident, -rogue will automatically save the game in this file. -The file name may start with the special character -.Cs ~ -which expands to be your home directory. -.sh 1 Scoring -.pp -Rogue usually maintains a list -of the top scoring people or scores on your machine. -Depending on how it is set up, -it can post either the top scores -or the top players. -In the latter case, -each account on the machine -can post only one non-winning score on this list. -If you score higher than someone else on this list, -or better your previous score on the list, -you will be inserted in the proper place -under your current name. -How many scores are kept -can also be set up by whoever installs it on your machine. -.pp -If you quit the game, you get out with all of your gold intact. -If, however, you get killed in the Dungeons of Doom, -your body is forwarded to your next-of-kin, -along with 90% of your gold; -ten percent of your gold is kept by the Dungeons' wizard as a fee\**. -.(f -\** The Dungeon's wizard is named Wally the Wonder Badger. -Invocations should be accompanied by a sizable donation. -.)f -This should make you consider whether you want to take one last hit -at that monster and possibly live, -or quit and thus stop with whatever you have. -If you quit, you do get all your gold, -but if you swing and live, you might find more. -.pp -If you just want to see what the current top players/games list is, -you can type -.ti +1i -.nf -% rogue \-s -.br -.sh 1 Acknowledgements -.pp -Rogue was originally conceived of by Glenn Wichman and Michael Toy. -Ken Arnold and Michael Toy then smoothed out the user interface, -and added jillions of new features. -We would like to thank -Bob Arnold, -Michelle Busch, -Andy Hatcher, -Kipp Hickman, -Mark Horton, -Daniel Jensen, -Bill Joy, -Joe Kalash, -Steve Maurer, -Marty McNary, -Jan Miller, -and -Scott Nelson -for their ideas and assistance; -and also the teeming multitudes -who graciously ignored work, school, and social life to play rogue -and send us bugs, complaints, suggestions, and just plain flames. -And also Mom. diff --git a/src/cc/rogue/rogue.me.in b/src/cc/rogue/rogue.me.in deleted file mode 100644 index a73d1504e..000000000 --- a/src/cc/rogue/rogue.me.in +++ /dev/null @@ -1,892 +0,0 @@ -.\" -.\" @(#)rogue.me 6.2 (Berkeley) 4/28/86 -.\" -.\" Rogue: Exploring the Dungeons of Doom -.\" Copyright (C) 1980-1983, 1985, 1986 Michael Toy, Ken Arnold and Glenn Wichman -.\" All rights reserved. -.\" -.\" See the file LICENSE.TXT for full copyright and licensing information. -.\" -.ds E \s-2\s0 -.ds R \s-2\s0 -.ds U \s-2UNIX\s0 -.ie t .ds _ \d\(mi\u -.el .ds _ _ -.de Cs -\&\\$3\*(lq\\$1\*(rq\\$2 -.. -.sp 5 -.ce 1000 -.ps +4 -.vs +4p -.b -A Guide to the Dungeons of Doom -.r -.vs -.ps -.sp 2 -.i -Michael C. Toy -Kenneth C. R. C. Arnold -.r -.sp 2 -Computer Systems Research Group -Department of Electrical Engineering and Computer Science -University of California -Berkeley, California 94720 -.sp 4 -.i ABSTRACT -.ce 0 -.(b I F -.bi Rogue -is a visual CRT based fantasy game -which runs under the \*U\(dg timesharing system. -.(f -\fR\(dg\*U is a trademark of Bell Laboratories\fP -.)f -This paper describes how to play rogue, -and gives a few hints -for those who might otherwise get lost in the Dungeons of Doom. -.)b -\".he '''\fBA Guide to the Dungeons of Doom\fP' -\" .fo ''- % -'' -.eh 'USD:33-%''A Guide to the Dungeons of Doom' -.oh 'A Guide to the Dungeons of Doom''USD:33-%' -.sh 1 Introduction -.pp -You have just finished your years as a student at the local fighter's guild. -After much practice and sweat you have finally completed your training -and are ready to embark upon a perilous adventure. -As a test of your skills, -the local guildmasters have sent you into the Dungeons of Doom. -Your task is to return with the Amulet of Yendor. -Your reward for the completion of this task -will be a full membership in the local guild. -In addition, -you are allowed to keep all the loot you bring back from the dungeons. -.pp -In preparation for your journey, -you are given an enchanted mace, -a bow, and a quiver of arrows -taken from a dragon's hoard in the far off Dark Mountains. -You are also outfitted with elf-crafted armor -and given enough food to reach the dungeons. -You say goodbye to family and friends for what may be the last time -and head up the road. -.pp -You set out on your way to the dungeons -and after several days of uneventful travel, -you see the ancient ruins -that mark the entrance to the Dungeons of Doom. -It is late at night, -so you make camp at the entrance -and spend the night sleeping under the open skies. -In the morning you gather your weapons, -put on your armor, -eat what is almost your last food, -and enter the dungeons. -.sh 1 "What is going on here?" -.pp -You have just begun a game of rogue. -Your goal is to grab as much treasure as you can, -find the Amulet of Yendor, -and get out of the Dungeons of Doom alive. -On the screen, -a map of where you have been -and what you have seen on the current dungeon level is kept. -As you explore more of the level, -it appears on the screen in front of you. -.pp -Rogue differs from most computer fantasy games in that it is screen oriented. -Commands are all one or two keystrokes\** -.(f -\** As opposed to pseudo English sentences. -.)f -and the results of your commands -are displayed graphically on the screen rather -than being explained in words.\** -.(f -\** A minimum screen size of 24 lines by 80 columns is required. -If the screen is larger, only the 24x80 section will be used -for the map. -.)f -.pp -Another major difference between rogue and other computer fantasy games -is that once you have solved all the puzzles in a standard fantasy game, -it has lost most of its excitement and it ceases to be fun. -Rogue, -on the other hand, -generates a new dungeon every time you play it -and even the author finds it an entertaining and exciting game. -.sh 1 "What do all those things on the screen mean?" -.pp -In order to understand what is going on in rogue -you have to first get some grasp of what rogue is doing with the screen. -The rogue screen is intended -to replace the \*(lqYou can see ...\*(rq descriptions -of standard fantasy games. -Figure 1 is a sample of what a rogue screen might look like. -.(z -.hl -.nf -.TS -center; -ce0 ce0 ce0 ce0 ce0 ce0 ce0 ce0 ce0 ce0 ce0 ce. -- - - - - - - - - - - - -| . . . . . . . . . . + -| . . @ . . . . ] . . | -| . . . . B . . . . . | -| . . . . . . . . . . | -- - - - - + - - - - - - -.TE - - -.ce 1000 -Level: 1 Gold: 0 Hp: 12(12) Str: 16(16) Arm: 4 Exp: 1/0 - -Figure 1 -.ce -.hl -.)z -.sh 2 "The bottom line" -.pp -At the bottom line of the screen -are a few pieces of cryptic information -describing your current status. -Here is an explanation of what these things mean: -.ip Level \w'Level\ \ 'u -This number indicates how deep you have gone in the dungeon. -It starts at one and goes up as you go deeper into the dungeon. -.ip Gold \w'Level\ \ 'u -The number of gold pieces you have managed to find -and keep with you so far. -.ip Hp \w'Level\ \ 'u -Your current and maximum health points. -Health points indicate how much damage you can take before you die. -The more you get hit in a fight, -the lower they get. -You can regain health points by resting. -The number in parentheses -is the maximum number your health points can reach. -.ip Str \w'Level\ \ 'u -Your current strength and maximum ever strength. -This can be any integer less than or equal to 31, -or greater than or equal to three. -The higher the number, -the stronger you are. -The number in the parentheses -is the maximum strength you have attained so far this game. -.ip Arm \w'Level\ \ 'u -Your current armor protection. -This number indicates how effective your armor is -in stopping blows from unfriendly creatures. -The higher this number is, -the more effective the armor. -.ip Exp \w'Level\ \ 'u -These two numbers give your current experience level -and experience points. -As you do things, -you gain experience points. -At certain experience point totals, -you gain an experience level. -The more experienced you are, -the better you are able to fight and to withstand magical attacks. -.sh 2 "The top line" -.pp -The top line of the screen is reserved -for printing messages that describe things -that are impossible to represent visually. -If you see a \*(lq--More--\*(rq on the top line, -this means that rogue wants to print another message on the screen, -but it wants to make certain -that you have read the one that is there first. -To read the next message, -just type a space. -.sh 2 "The rest of the screen" -.pp -The rest of the screen is the map of the level -as you have explored it so far. -Each symbol on the screen represents something. -Here is a list of what the various symbols mean: -.ip @ -This symbol represents you, the adventurer. -.ip "-\^|" -These symbols represent the walls of rooms. -.ip + -A door to/from a room. -.ip . -The floor of a room. -.ip # -The floor of a passage between rooms. -.ip * -A pile or pot of gold. -.ip ) -A weapon of some sort. -.ip ] -A piece of armor. -.ip ! -A flask containing a magic potion. -.ip ? -A piece of paper, usually a magic scroll. -.ip = -A ring with magic properties -.ip / -A magical staff or wand -.ip ^ -A trap, watch out for these. -.ip % -A staircase to other levels -.ip : -A piece of food. -.ip A-Z -The uppercase letters -represent the various inhabitants of the Dungeons of Doom. -Watch out, they can be nasty and vicious. -.sh 1 Commands -.pp -Commands are given to rogue by typing one or two characters. -Most commands can be preceded by a count to repeat them -(e.g. typing -.Cs 10s -will do ten searches). -Commands for which counts make no sense -have the count ignored. -To cancel a count or a prefix, -type \*E. -The list of commands is rather long, -but it can be read at any time during the game with the -.Cs ? -command. -Here it is for reference, -with a short explanation of each command. -.ip ? -The help command. -Asks for a character to give help on. -If you type a -.Cs * , -it will list all the commands, -otherwise it will explain what the character you typed does. -.ip / -This is the \*(lqWhat is that on the screen?\*(rq command. -A -.Cs / -followed by any character that you see on the level, -will tell you what that character is. -For instance, -typing -.Cs /@ -will tell you that the -.Cs @ -symbol represents you, the player. -.ip "h, H, ^H" -Move left. -You move one space to the left. -If you use upper case -.Cs h , -you will continue to move left until you run into something. -This works for all movement commands -(e.g. -.Cs L -means run in direction -.Cs l ) -If you use the \*(lqcontrol\*(rq -.Cs h , -you will continue moving in the specified direction -until you pass something interesting or run into a wall. -You should experiment with this, -since it is a very useful command, -but very difficult to describe. -This also works for all movement commands. -.ip j -Move down. -.ip k -Move up. -.ip l -Move right. -.ip y -Move diagonally up and left. -.ip u -Move diagonally up and right. -.ip b -Move diagonally down and left. -.ip n -Move diagonally down and right. -.ip t -Throw an object. -This is a prefix command. -When followed with a direction -it throws an object in the specified direction. -(e.g. type -.Cs th -to throw -something to the left.) -.ip f -Fight until someone dies. -When followed with a direction -this will force you to fight the creature in that direction -until either you or it bites the big one. -.ip m -Move onto something without picking it up. -This will move you one space in the direction you specify and, -if there is an object there you can pick up, -it won't do it. -.ip z -Zap prefix. -Point a staff or wand in a given direction -and fire it. -Even non-directional staves must be pointed in some direction -to be used. -.ip ^ -Identify trap command. -If a trap is on your map -and you can't remember what type it is, -you can get rogue to remind you -by getting next to it and typing -.Cs ^ -followed by the direction that would move you on top of it. -.ip s -Search for traps and secret doors. -Examine each space immediately adjacent to you -for the existence of a trap or secret door. -There is a large chance that even if there is something there, -you won't find it, -so you might have to search a while before you find something. -.ip > -Climb down a staircase to the next level. -Not surprisingly, this can only be done if you are standing on staircase. -.ip < -Climb up a staircase to the level above. -This can't be done without the Amulet of Yendor in your possession. -.ip "." -Rest. -This is the \*(lqdo nothing\*(rq command. -This is good for waiting and healing. -.ip , -Pick up something. -This picks up whatever you are currently standing on, -if you are standing on anything at all. -.ip i -Inventory. -List what you are carrying in your pack. -.ip I -Selective inventory. -Tells you what a single item in your pack is. -.ip q -Quaff one of the potions you are carrying. -.ip r -Read one of the scrolls in your pack. -.ip e -Eat food from your pack. -.ip w -Wield a weapon. -Take a weapon out of your pack and carry it for use in combat, -replacing the one you are currently using (if any). -.ip W -Wear armor. -You can only wear one suit of armor at a time. -This takes extra time. -.ip T -Take armor off. -You can't remove armor that is cursed. -This takes extra time. -.ip P -Put on a ring. -You can wear only two rings at a time -(one on each hand). -If you aren't wearing any rings, -this command will ask you which hand you want to wear it on, -otherwise, it will place it on the unused hand. -The program assumes that you wield your sword in your right hand. -.ip R -Remove a ring. -If you are only wearing one ring, -this command takes it off. -If you are wearing two, -it will ask you which one you wish to remove, -.ip d -Drop an object. -Take something out of your pack and leave it lying on the floor. -Only one object can occupy each space. -You cannot drop a cursed object at all -if you are wielding or wearing it. -.ip c -Call an object something. -If you have a type of object in your pack -which you wish to remember something about, -you can use the call command to give a name to that type of object. -This is usually used when you figure out what a -potion, scroll, ring, or staff is -after you pick it up, -or when you want to remember -which of those swords in your pack you were wielding. -.ip D -Print out which things you've discovered something about. -This command will ask you what type of thing you are interested in. -If you type the character for a given type of object -(\fIe.g.\fP -.Cs ! -for potion) -it will tell you which kinds of that type of object you've discovered -(\fIi.e.\fP, figured out what they are). -This command works for potions, scrolls, rings, and staves and wands. -.ip o -Examine and set options. -This command is further explained in the section on options. -.ip ^R -Redraws the screen. -Useful if spurious messages or transmission errors -have messed up the display. -.ip ^P -Print last message. -Useful when a message disappears before you can read it. -This only repeats the last message -that was not a mistyped command -so that you don't loose anything by accidentally typing -the wrong character instead of ^P. -.ip \*E -Cancel a command, prefix, or count. -.ip ! -Escape to a shell for some commands. -.ip Q -Quit. -Leave the game. -.ip S -Save the current game in a file. -It will ask you whether you wish to use the default save file. -.i Caveat : -Rogue won't let you start up a copy of a saved game, -and it removes the save file as soon as you start up a restored game. -This is to prevent people from saving a game just before a dangerous position -and then restarting it if they die. -To restore a saved game, -give the file name as an argument to rogue. -As in -.ti +1i -.nf -% rogue \fIsave\*_file\fP -.ip -To restart from the default save file (see below), -run -.ti +1i -.nf -% rogue \-r -.ip v -Prints the program version number. -.ip ) -Print the weapon you are currently wielding -.ip ] -Print the armor you are currently wearing -.ip = -Print the rings you are currently wearing -.ip @ -Reprint the status line on the message line -.sh 1 Rooms -.pp -Rooms in the dungeons are either lit or dark. -If you walk into a lit room, -the entire room will be drawn on the screen as soon as you enter. -If you walk into a dark room, -it will only be displayed as you explore it. -Upon leaving a room, -all monsters inside the room -are erased from the screen. -In the darkness you can only see one space -in all directions around you. -A corridor is always dark. -.sh 1 Fighting -.pp -If you see a monster and you wish to fight it, -just attempt to run into it. -Many times a monster you find will mind its own business -unless you attack it. -It is often the case that discretion is the better part of valor. -.sh 1 "Objects you can find" -.pp -When you find something in the dungeon, -it is common to want to pick the object up. -This is accomplished in rogue by walking over the object -(unless you use the -.Cs m -prefix, see above). -If you are carrying too many things, -the program will tell you and it won't pick up the object, -otherwise it will add it to your pack -and tell you what you just picked up. -.pp -Many of the commands that operate on objects must prompt you -to find out which object you want to use. -If you change your mind and don't want to do that command after all, -just type an \*E and the command will be aborted. -.pp -Some objects, like armor and weapons, -are easily differentiated. -Others, like scrolls and potions, -are given labels which vary according to type. -During a game, -any two of the same kind of object -with the same label -are the same type. -However, -the labels will vary from game to game. -.pp -When you use one of these labeled objects, -if its effect is obvious, -rogue will remember what it is for you. -If it's effect isn't extremely obvious -you will be asked what you want to scribble on it -so you will recognize it later, -or you can use the -.Cs call -command -(see above). -.sh 2 Weapons -.pp -Some weapons, -like arrows, -come in bunches, -but most come one at a time. -In order to use a weapon, -you must wield it. -To fire an arrow out of a bow, -you must first wield the bow, -then throw the arrow. -You can only wield one weapon at a time, -but you can't change weapons if the one -you are currently wielding is cursed. -The commands to use weapons are -.Cs w -(wield) -and -.Cs t -(throw). -.sh 2 Armor -.pp -There are various sorts of armor lying around in the dungeon. -Some of it is enchanted, -some is cursed, -and some is just normal. -Different armor types have different armor protection. -The higher the armor protection, -the more protection the armor affords against the blows of monsters. -Here is a list of the various armor types and their normal armor protection: -.(b -.TS -box center; -l r. -\ \ \fIType Protection\fP -None 0 -Leather armor 2 -Studded leather / Ring mail 3 -Scale mail 4 -Chain mail 5 -Banded mail / Splint mail 6 -Plate mail 7 -.TE -.)b -.lp -If a piece of armor is enchanted, -its armor protection will be higher than normal. -If a suit of armor is cursed, -its armor protection will be lower, -and you will not be able to remove it. -However, not all armor with a protection that is lower than normal is cursed. -.pp -The commands to use weapons are -.Cs W -(wear) -and -.Cs T -(take off). -.sh 2 Scrolls -.pp -Scrolls come with titles in an unknown tongue\**. -.(f -\** Actually, it's a dialect spoken only by the twenty-seven members -of a tribe in Outer Mongolia, -but you're not supposed to -.i know -that. -.)f -After you read a scroll, -it disappears from your pack. -The command to use a scroll is -.Cs r -(read). -.sh 2 Potions -.pp -Potions are labeled by the color of the liquid inside the flask. -They disappear after being quaffed. -The command to use a scroll is -.Cs q -(quaff). -.sh 2 "Staves and Wands" -.pp -Staves and wands do the same kinds of things. -Staves are identified by a type of wood; -wands by a type of metal or bone. -They are generally things you want to do to something -over a long distance, -so you must point them at what you wish to affect -to use them. -Some staves are not affected by the direction they are pointed, though. -Staves come with multiple magic charges, -the number being random, -and when they are used up, -the staff is just a piece of wood or metal. -.pp -The command to use a wand or staff is -.Cs z -(zap) -.sh 2 Rings -.pp -Rings are very useful items, -since they are relatively permanent magic, -unlike the usually fleeting effects of potions, scrolls, and staves. -Of course, -the bad rings are also more powerful. -Most rings also cause you to use up food more rapidly, -the rate varying with the type of ring. -Rings are differentiated by their stone settings. -The commands to use rings are -.Cs P -(put on) -and -.Cs R -(remove). -.sh 2 Food -.pp -Food is necessary to keep you going. -If you go too long without eating you will faint, -and eventually die of starvation. -The command to use food is -.Cs e -(eat). -.sh 1 Options -.pp -Due to variations in personal tastes -and conceptions of the way rogue should do things, -there are a set of options you can set -that cause rogue to behave in various different ways. -.sh 2 "Setting the options" -.pp -There are two ways to set the options. -The first is with the -.Cs o -command of rogue; -the second is with the -.Cs ROGUEOPTS -environment variable\**. -.(f -\** On Version 6 systems, -there is no equivalent of the ROGUEOPTS feature. -.br -.)f -.br -.sh 3 "Using the `o' command" -.pp -When you type -.Cs o -in rogue, -it clears the screen -and displays the current settings for all the options. -It then places the cursor by the value of the first option -and waits for you to type. -You can type a \*R -which means to go to the next option, -a -.Cs \- -which means to go to the previous option, -an \*E -which means to return to the game, -or you can give the option a value. -For boolean options this merely involves typing -.Cs t -for true or -.Cs f -for false. -For string options, -type the new value followed by a \*R. -.sh 3 "Using the ROGUEOPTS variable" -.pp -The ROGUEOPTS variable is a string -containing a comma separated list of initial values -for the various options. -Boolean variables can be turned on by listing their name -or turned off by putting a -.Cs no -in front of the name. -Thus to set up an environment variable so that -.b jump -is on, -.b terse -is off, -and the -.b name -is set to \*(lqBlue Meanie\*(rq, -use the command -.nf -.ti +3n -% setenv ROGUEOPTS "jump,noterse,name=Blue Meanie"\** -.fi -.(f -\** -For those of you who use the Bourne shell sh (1), the commands would be -.in +3 -.nf -$ ROGUEOPTS="jump,noterse,name=Blue Meanie" -$ export ROGUEOPTS -.fi -.in +0 -.)f -.sh 2 "Option list" -.pp -Here is a list of the options -and an explanation of what each one is for. -The default value for each is enclosed in square brackets. -For character string options, -input over fifty characters will be ignored. -.ip "\fBterse\fP [\fI\^noterse\^\fP]" -Useful for those who are tired of the sometimes lengthy messages of rogue. -This is a useful option for playing on slow terminals, -so this option defaults to -.i terse -if you -are on a slow (1200 baud or under) terminal. -.ip "\fBjump\fP [\fI\^nojump\^\fP]" -If this option is set, -running moves will not be displayed -until you reach the end of the move. -This saves considerable cpu and display time. -This option defaults to -.i jump -if you are using a slow terminal. -.ip "\fBflush\fP [\fI\^noflush\^\fP]" -All typeahead is thrown away after each round of battle. -This is useful for those who type far ahead -and then watch in dismay as a Bat kills them. -.ip "\fBseefloor\fP [\fI\^seefloor\^\fP]" -Display the floor around you on the screen -as you move through dark rooms. -Due to the amount of characters generated, -this option defaults to -.i noseefloor -if you are using a slow terminal. -.ip "\fBpassgo\fP [\fI\^nopassgo\^\fP]" -Follow turnings in passageways. -If you run in a passage -and you run into stone or a wall, -rogue will see if it can turn to the right or left. -If it can only turn one way, -it will turn that way. -If it can turn either or neither, -it will stop. -This algorithm can sometimes lead to slightly confusing occurrences -which is why it defaults to \fInopassgo\fP. -.ip "\fBtombstone\fP [\fI\^tombstone\^\fP]" -Print out the tombstone at the end if you get killed. -This is nice but slow, so you can turn it off if you like. -.ip "\fBinven\fP [\fI\^overwrite\^\fP]" -Inventory type. -This can have one of three values: -.i overwrite , -.i slow , -or -.i clear . -With -.i overwrite -the top lines of the map are overwritten -with the list -when inventory is requested -or when -\*(lqWhich item do you wish to \fB. . .\fP? \*(rq questions -are answered with a -.Cs * . -However, if the list is longer than a screenful, -the screen is cleared. -With -.i slow , -lists are displayed one item at a time on the top of the screen, -and with -.i clear , -the screen is cleared, -the list is displayed, -and then the dungeon level is re-displayed. -Due to speed considerations, -.i clear -is the default for terminals without -clear-to-end-of-line capabilities. -.ip "\fBname\fP [account name]" -This is the name of your character. -It is used if you get on the top ten scorer's list. -.ip "\fBfruit\fP [\fI\^slime-mold\^\fP]" -This should hold the name of a fruit that you enjoy eating. -It is basically a whimsey that rogue uses in a couple of places. -.ip "\fBfile\fP [\fI\^~/rogue.save\^\fP]" -The default file name for saving the game. -If your phone is hung up by accident, -rogue will automatically save the game in this file. -The file name may start with the special character -.Cs ~ -which expands to be your home directory. -.sh 1 Scoring -.pp -Rogue usually maintains a list -of the top scoring people or scores on your machine. -Depending on how it is set up, -it can post either the top scores -or the top players. -In the latter case, -each account on the machine -can post only one non-winning score on this list. -If you score higher than someone else on this list, -or better your previous score on the list, -you will be inserted in the proper place -under your current name. -How many scores are kept -can also be set up by whoever installs it on your machine. -.pp -If you quit the game, you get out with all of your gold intact. -If, however, you get killed in the Dungeons of Doom, -your body is forwarded to your next-of-kin, -along with 90% of your gold; -ten percent of your gold is kept by the Dungeons' wizard as a fee\**. -.(f -\** The Dungeon's wizard is named Wally the Wonder Badger. -Invocations should be accompanied by a sizable donation. -.)f -This should make you consider whether you want to take one last hit -at that monster and possibly live, -or quit and thus stop with whatever you have. -If you quit, you do get all your gold, -but if you swing and live, you might find more. -.pp -If you just want to see what the current top players/games list is, -you can type -.ti +1i -.nf -% @PROGRAM@ \-s -.br -.sh 1 Acknowledgements -.pp -Rogue was originally conceived of by Glenn Wichman and Michael Toy. -Ken Arnold and Michael Toy then smoothed out the user interface, -and added jillions of new features. -We would like to thank -Bob Arnold, -Michelle Busch, -Andy Hatcher, -Kipp Hickman, -Mark Horton, -Daniel Jensen, -Bill Joy, -Joe Kalash, -Steve Maurer, -Marty McNary, -Jan Miller, -and -Scott Nelson -for their ideas and assistance; -and also the teeming multitudes -who graciously ignored work, school, and social life to play rogue -and send us bugs, complaints, suggestions, and just plain flames. -And also Mom. diff --git a/src/cc/rogue/rogue.png b/src/cc/rogue/rogue.png deleted file mode 100644 index fc3779e83223dbb46ec33f8c1d936e6db202eb86..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1005 zcmVWFU8GbZ8({Xk{QrNlj4iWF>9@00U7;L_t(o!`0VYjGa>y z2k_rGt+py1)hR8ZqY@&nbx+ZVh>{5LU|uwR5FrvTgb00*z7V8O8YD#GiMU4*f+q=? zc6dPyQW`bN(90M#opOek^~uW4cg}n>m56_`bJqU$UVE>-?uY*vJ+t6B0_Wgj^kYe! zGlm~9h#~CxHwB%CtMMd$#b48mNj#4mLf}KfaoB{>1{arOAD+O9*_hxkoR8o;2)+xi ze-US5b(m;v>{*Vt(s|oDoc9kl6l%M%##vY6i(+3JA7V%3gs~71u1))X!}Z;w;;XcI zYt5c(;?>iI;Qn+`557!mo4dt)e%0N@`uv*6*c@7$D!vcnti=0NVb)pFP- zU}IW;rx4&}EJ*8jq_v-NvdQRA^sX2cPQZ0(J`}I2@O^RCUKW^L9AurSdR#S1RO;Yqmn3f?mkJ%X=`^iyj0E25;|p60{&q*ESPlVWwe2)iw5 z?b~?O`yI02XSf;nM{AbT_4;mgpce-c!=|)$YZRSMsduVDdVZ}iWi4JUTB_x#v_4*Q z(PR{%%ke@7LB``TeNAfk`f!wr`N0$oOYv}+U^1GPyHW@qAKlP!M8jUZf}4sQ(-lkc zMiO8Qch)#;Q!Ky*cr40tBV18b#oggl^Jj2z3+Lk5&{$Ok8~+!%r)VtOkzfX*%r1^_ z>xth!oD!YTy^(C%g)g*mWz)92H&p*X@qHp1lAY0X{1HB~DBAKB!CRg^il?K0*fkRy zuB&N6nvMgZwT+>%S)qkf!@GAhym(L8ejQHC<@ZqkoVKE>t-@)M8|Fl190_L|j8c5i b{{epk<~&Tog&~z@00000NkvXXu0mjfa>>^0 diff --git a/src/cc/rogue/rogue.spec b/src/cc/rogue/rogue.spec deleted file mode 100644 index 6c8770fdc..000000000 --- a/src/cc/rogue/rogue.spec +++ /dev/null @@ -1,107 +0,0 @@ -Name: rogue -Version: 5.4.4 -Release: 1%{?dist} -Summary: The original graphical adventure game - -Group: Amusements/Games -License: BSD -URL: http://rogue.rogueforge.net/ -Source0: http://rogue.rogueforge.net/files/rogue5.4/rogue5.4.4-src.tar.gz -Source1: rogue.desktop -Source2: rogue.png -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - -BuildRequires: desktop-file-utils -BuildRequires: ncurses-devel - -%description -The one, the only, the original graphical adventure game that spawned -an entire genre. - -%prep -%setup -q -n %{name}%{version} - - -%build -%configure --enable-setgid=games --enable-scorefile=%{_var}/games/roguelike/rogue54.scr --enable-lockfile=%{_var}/games/roguelike/rogue54.lck -make %{_smp_mflags} - - -%install -rm -rf $RPM_BUILD_ROOT - -make install DESTDIR=$RPM_BUILD_ROOT - -desktop-file-install --vendor fedora \ - --dir ${RPM_BUILD_ROOT}%{_datadir}/applications \ - %{SOURCE1} -mkdir -p $RPM_BUILD_ROOT/%{_datadir}/icons/hicolor/32x32/apps/ -install -p -m 644 %{SOURCE2} $RPM_BUILD_ROOT/%{_datadir}/icons/hicolor/32x32/apps/ - - -%clean -rm -rf $RPM_BUILD_ROOT - -%post -touch --no-create %{_datadir}/icons/hicolor || : -if [ -x %{_bindir}/gtk-update-icon-cache ]; then - %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : -fi - -%postun -touch --no-create %{_datadir}/icons/hicolor || : -if [ -x %{_bindir}/gtk-update-icon-cache ]; then - %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : -fi - - -%files -%defattr(-,root,root,-) -%attr(2755,games,games) %{_bindir}/rogue -%{_mandir}/man6/rogue.6.gz -%{_datadir}/applications/fedora-%{name}.desktop -%{_datadir}/icons/hicolor/32x32/apps/rogue.png -%dir %attr(0775,games,games) %{_var}/games/roguelike -%config(noreplace) %attr(0664,games,games) %{_var}/games/roguelike/rogue54.scr -%doc %{_docdir}/%{name}-%{version} - - -%changelog -* Sun Sep 2 2007 Wart 5.4.4-1 -- Update to 5.4.4 - -* Mon Aug 20 2007 Wart 5.4.3-1 -- Update to 5.4.3 - -* Sun Jul 15 2007 Wart 5.4.2-9 -- New upstream home page and download URL -- Add patch when reading long values from the save file on 64-bit arch - (BZ #248283) -- Add patch removing many compiler warnings -- Use proper version in the .desktop file - -* Sat Mar 3 2007 Wart 5.4.2-8 -- Use better sourceforge download url -- Use more precise desktop file categories - -* Mon Aug 28 2006 Wart 5.4.2-7 -- Rebuild for Fedora Extras - -* Tue May 16 2006 Wart 5.4.2-6 -- Added empty initial scoreboard file. - -* Mon May 15 2006 Wart 5.4.2-5 -- Better setuid/setgid handling (again) (BZ #187392) - -* Thu Mar 30 2006 Wart 5.4.2-4 -- Better setuid/setgid handling (BZ #187392) -- Resize desktop icon to match directory name - -* Mon Mar 13 2006 Wart 5.4.2-3 -- Added icon for .desktop file. - -* Sun Mar 12 2006 Wart 5.4.2-2 -- Added missing BR: ncurses-devel, desktop-file-utils - -* Sat Feb 25 2006 Wart 5.4.2-1 -- Initial spec file. diff --git a/src/cc/rogue/rogue54.sln b/src/cc/rogue/rogue54.sln deleted file mode 100644 index 751959465..000000000 --- a/src/cc/rogue/rogue54.sln +++ /dev/null @@ -1,27 +0,0 @@ -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 14 -VisualStudioVersion = 14.0.25420.1 -MinimumVisualStudioVersion = 10.0.40219.1 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "rogue54", "rogue54.vcxproj", "{9EA0D326-8097-4ADA-82EA-4DB1F5CAA8F6}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Win32 = Debug|Win32 - Debug|x64 = Debug|x64 - Release|Win32 = Release|Win32 - Release|x64 = Release|x64 - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {9EA0D326-8097-4ADA-82EA-4DB1F5CAA8F6}.Debug|Win32.ActiveCfg = Debug|Win32 - {9EA0D326-8097-4ADA-82EA-4DB1F5CAA8F6}.Debug|Win32.Build.0 = Debug|Win32 - {9EA0D326-8097-4ADA-82EA-4DB1F5CAA8F6}.Debug|x64.ActiveCfg = Debug|x64 - {9EA0D326-8097-4ADA-82EA-4DB1F5CAA8F6}.Debug|x64.Build.0 = Debug|x64 - {9EA0D326-8097-4ADA-82EA-4DB1F5CAA8F6}.Release|Win32.ActiveCfg = Release|Win32 - {9EA0D326-8097-4ADA-82EA-4DB1F5CAA8F6}.Release|Win32.Build.0 = Release|Win32 - {9EA0D326-8097-4ADA-82EA-4DB1F5CAA8F6}.Release|x64.ActiveCfg = Release|x64 - {9EA0D326-8097-4ADA-82EA-4DB1F5CAA8F6}.Release|x64.Build.0 = Release|x64 - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection -EndGlobal diff --git a/src/cc/rogue/rogue54.vcproj b/src/cc/rogue/rogue54.vcproj deleted file mode 100644 index 7e39b98dd..000000000 --- a/src/cc/rogue/rogue54.vcproj +++ /dev/null @@ -1,396 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/cc/rogue/rogue54.vcxproj b/src/cc/rogue/rogue54.vcxproj deleted file mode 100644 index 344598dd8..000000000 --- a/src/cc/rogue/rogue54.vcxproj +++ /dev/null @@ -1,257 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - - - {9EA0D326-8097-4ADA-82EA-4DB1F5CAA8F6} - Win32Proj - 8.1 - - - - Application - v140 - MultiByte - - - Application - v140 - MultiByte - false - - - Application - v140 - MultiByte - - - Application - v140 - MultiByte - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>14.0.25431.1 - - - Debug\ - Debug\ - true - - - true - - - Release\ - Release\ - false - - - false - - - - Disabled - Default - ../pdcurses;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;ALLSCORES;MASTER;SCOREFILE="rogue54.scr";LOCKFILE="rogue54.lck";%(PreprocessorDefinitions) - true - false - - EnableFastChecks - MultiThreaded - true - true - false - true - - - Level4 - EditAndContinue - CompileAsC - - - Ws2_32.lib;pdcurses.lib;advapi32.lib;shfolder.lib;user32.lib;%(AdditionalDependencies) - $(OutDir)rogue54.exe - ..\pdcurses;%(AdditionalLibraryDirectories) - false - true - $(OutDir)rogue54.pdb - Console - MachineX86 - - - - - Disabled - Default - $(ProjectDir)x86_64-w64-msvc\deps\install\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;PDC_DLL_BUILD;PDC_WIDE;PDCDEBUG;_CRT_SECURE_NO_DEPRECATE;ALLSCORES;SCOREFILE="rogue54.scr";LOCKFILE="rogue54.lck";%(PreprocessorDefinitions) - true - false - - - EnableFastChecks - MultiThreaded - true - true - false - true - - - - - Level4 - ProgramDatabase - CompileAsC - - - Ws2_32.lib;wincon\pdcurses.lib;libcurl_imp.lib;advapi32.lib;shfolder.lib;user32.lib;%(AdditionalDependencies) - $(OutDir)rogue54.exe - $(ProjectDir)x86_64-w64-msvc\deps\install\lib;$(ProjectDir)x86_64-w64-msvc\deps\install\Release\lib;%(AdditionalLibraryDirectories) - false - true - $(OutDir)rogue54.pdb - Console - - - - - MaxSpeed - OnlyExplicitInline - true - WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions) - true - MultiThreaded - true - NotUsing - Level3 - ProgramDatabase - $(ProjectDir)\x86_64-w64-msvc\include\ncursesw;$(ProjectDir)\x86_64-w64-msvc\include;%(AdditionalIncludeDirectories) - - - $(OutDir)rogue54.exe - true - Windows - true - true - MachineX86 - %(AdditionalLibraryDirectories) - %(AdditionalDependencies) - - - - - MaxSpeed - OnlyExplicitInline - true - WIN32;_WINDOWS;NDEBUG;PDC_DLL_BUILD;PDC_WIDE;PDCDEBUG;_CRT_SECURE_NO_DEPRECATE;ALLSCORES;SCOREFILE="rogue54.scr";LOCKFILE="rogue54.lck";%(PreprocessorDefinitions) - true - MultiThreaded - true - - - Level3 - ProgramDatabase - $(ProjectDir)x86_64-w64-msvc\deps\install\include;%(AdditionalIncludeDirectories) - stdafx.h - CompileAsC - - - - - $(OutDir)rogue54.exe - true - Console - true - true - $(ProjectDir)x86_64-w64-msvc\deps\install\lib;$(ProjectDir)x86_64-w64-msvc\deps\install\Release\lib;%(AdditionalLibraryDirectories) - Ws2_32.lib;wincon\pdcurses.lib;libcurl_imp.lib;advapi32.lib;shfolder.lib;user32.lib;%(AdditionalDependencies) - %(IgnoreSpecificDefaultLibraries) - false - %(ForceSymbolReferences) - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/cc/rogue/rogue_build_msvc.cmd b/src/cc/rogue/rogue_build_msvc.cmd deleted file mode 100644 index 77e7cd852..000000000 --- a/src/cc/rogue/rogue_build_msvc.cmd +++ /dev/null @@ -1,64 +0,0 @@ -@echo off -echo Rogue Build Script by Decker (c) 2019 - -@REM Check for Visual Studio -call set "VSPATH=" -if defined VS140COMNTOOLS ( if not defined VSPATH ( - call set "VSPATH=%%VS140COMNTOOLS%%" -) ) - -@REM check if we already have the tools in the environment -if exist "%VCINSTALLDIR%" ( - goto compile -) - -if not defined VSPATH ( - echo You need Microsoft Visual Studio 15 installed - pause - exit -) - -@REM set up the environment -if exist "%VSPATH%..\..\vc\vcvarsall.bat" ( - call "%%VSPATH%%..\..\vc\vcvarsall.bat" amd64 - goto compile -) - -echo Unable to set up the environment -pause -exit - -:compile - -mkdir x86_64-w64-msvc\deps -mkdir x86_64-w64-msvc\deps\install - -pushd x86_64-w64-msvc\deps - -:compile_pdcurses -rem git clone https://github.com/wmcbrine/PDCurses PDCurses.org -git clone https://github.com/Bill-Gray/PDCurses - -set PREFIX_DIR=%CD%\install - -pushd PDCurses -mkdir build64 & pushd build64 -rem cmake -G"Visual Studio 14 2015 Win64" -DPDC_WIDE=ON -DCMAKE_INSTALL_PREFIX=%PREFIX_DIR% -DCMAKE_BUILD_TYPE=Debug -DPDCDEBUG=ON .. -cmake -G"Visual Studio 14 2015 Win64" -DPDC_WIDE=ON -DCMAKE_INSTALL_PREFIX=%PREFIX_DIR% -DCMAKE_BUILD_TYPE=Release .. -popd -rem cmake --build build64 --config Debug --target install -cmake --build build64 --config Release --target install -popd - -:compile_curl - -git clone https://github.com/curl/curl -pushd curl - -mkdir build64 & pushd build64 -cmake -G "Visual Studio 14 2015 Win64" -DCMAKE_INSTALL_PREFIX=%PREFIX_DIR% -DCMAKE_USE_WINSSL:BOOL=ON .. -cmake --build . --config Release --target libcurl -cmake --build . --config Release --target install -popd -popd - diff --git a/src/cc/rogue/rogue_player.h b/src/cc/rogue/rogue_player.h deleted file mode 100644 index 82003237c..000000000 --- a/src/cc/rogue/rogue_player.h +++ /dev/null @@ -1,38 +0,0 @@ -// Copyright (c) 2016-2023 The Hush developers -// Distributed under the GPLv3 software license, see the accompanying -// file COPYING or https://www.gnu.org/licenses/gpl-3.0.en.html -/****************************************************************************** - * Copyright © 2014-2019 The SuperNET Developers. * - * * - * See the AUTHORS, DEVELOPER-AGREEMENT and LICENSE files at * - * the top-level directory of this distribution for the individual copyright * - * holder information and the developer policies on copyright and licensing. * - * * - * Unless otherwise agreed in a custom licensing agreement, no part of the * - * SuperNET software, including this file may be copied, modified, propagated * - * or distributed except according to the terms contained in the LICENSE file * - * * - * Removal or modification of this copyright notice is prohibited. * - * * - ******************************************************************************/ - -#ifndef ROGUE_DECLARED_PACK -#define ROGUE_DECLARED_PACK - - -#define MAXPACK 23 -struct rogue_packitem -{ - int32_t type,launch,count,which,hplus,dplus,arm,flags,group; - char damage[8],hurldmg[8]; -}; -struct rogue_player -{ - int32_t gold,hitpoints,strength,level,experience,packsize,dungeonlevel,amulet; - struct rogue_packitem roguepack[MAXPACK]; -}; -int32_t rogue_replay2(uint8_t *newdata,uint64_t seed,char *keystrokes,int32_t num,struct rogue_player *player,int32_t sleepmillis); -void rogue_packitemstr(char *packitemstr,struct rogue_packitem *item); - -#endif - diff --git a/src/cc/rogue/rooms.c b/src/cc/rogue/rooms.c deleted file mode 100644 index b5109f466..000000000 --- a/src/cc/rogue/rooms.c +++ /dev/null @@ -1,479 +0,0 @@ -// Copyright (c) 2016-2023 The Hush developers -// Distributed under the GPLv3 software license, see the accompanying -// file COPYING or https://www.gnu.org/licenses/gpl-3.0.en.html -/* - * Create the layout for the new level - * - * @(#)rooms.c 4.45 (Berkeley) 02/05/99 - * - * Rogue: Exploring the Dungeons of Doom - * Copyright (C) 1980-1983, 1985, 1999 Michael Toy, Ken Arnold and Glenn Wichman - * All rights reserved. - * - * See the file LICENSE.TXT for full copyright and licensing information. - */ - -//#include -//#include -#include "rogue.h" - -typedef struct spot { /* position matrix for maze positions */ - int nexits; - coord exits[4]; - int used; -} SPOT; - -#define GOLDGRP 1 - -/* - * do_rooms: - * Create rooms and corridors with a connectivity graph - */ - -void -do_rooms(struct rogue_state *rs) -{ - int i; - struct room *rp; - THING *tp; - int left_out; - static coord top; - coord bsze; /* maximum room size */ - coord mp; - - bsze.x = NUMCOLS / 3; - bsze.y = NUMLINES / 3; - /* - * Clear things for a new level - */ - for (rp = rooms; rp < &rooms[MAXROOMS]; rp++) - { - rp->r_goldval = 0; - rp->r_nexits = 0; - rp->r_flags = 0; - } - /* - * Put the gone rooms, if any, on the level - */ - left_out = rnd(4); - for (i = 0; i < left_out; i++) - rooms[rnd_room()].r_flags |= ISGONE; - /* - * dig and populate all the rooms on the level - */ - for (i = 0, rp = rooms; i < MAXROOMS; rp++, i++) - { - /* - * Find upper left corner of box that this room goes in - */ - top.x = (i % 3) * bsze.x + 1; - top.y = (i / 3) * bsze.y; - if (rp->r_flags & ISGONE) - { - /* - * Place a gone room. Make certain that there is a blank line - * for passage drawing. - */ - do - { - rp->r_pos.x = top.x + rnd(bsze.x - 2) + 1; - rp->r_pos.y = top.y + rnd(bsze.y - 2) + 1; - rp->r_max.x = -NUMCOLS; - rp->r_max.y = -NUMLINES; - } until (rp->r_pos.y > 0 && rp->r_pos.y < NUMLINES-1); - continue; - } - /* - * set room type - */ - if (rnd(10) < level - 1) - { - rp->r_flags |= ISDARK; /* dark room */ - if (rnd(15) == 0) - rp->r_flags = ISMAZE; /* maze room */ - } - /* - * Find a place and size for a random room - */ - if (rp->r_flags & ISMAZE) - { - rp->r_max.x = bsze.x - 1; - rp->r_max.y = bsze.y - 1; - if ((rp->r_pos.x = top.x) == 1) - rp->r_pos.x = 0; - if ((rp->r_pos.y = top.y) == 0) - { - rp->r_pos.y++; - rp->r_max.y--; - } - } - else - do - { - rp->r_max.x = rnd(bsze.x - 4) + 4; - rp->r_max.y = rnd(bsze.y - 4) + 4; - rp->r_pos.x = top.x + rnd(bsze.x - rp->r_max.x); - rp->r_pos.y = top.y + rnd(bsze.y - rp->r_max.y); - } until (rp->r_pos.y != 0); - draw_room(rs,rp); - /* - * Put the gold in - */ - if (rnd(2) == 0 && (!amulet || level >= max_level)) - { - THING *gold; - - gold = new_item(); - gold->o_goldval = rp->r_goldval = GOLDCALC; - find_floor(rs,rp, &rp->r_gold, FALSE, FALSE); - gold->o_pos = rp->r_gold; - chat(rp->r_gold.y, rp->r_gold.x) = GOLD; - gold->o_flags = ISMANY; - gold->o_group = GOLDGRP; - gold->o_type = GOLD; - attach(lvl_obj, gold); - } - /* - * Put the monster in - */ - if (rnd(100) < (rp->r_goldval > 0 ? 80 : 25)) - { - tp = new_item(); - find_floor(rs,rp, &mp, FALSE, TRUE); - new_monster(rs,tp, randmonster(FALSE), &mp); - give_pack(rs,tp); - } - } -} - -/* - * draw_room: - * Draw a box around a room and lay down the floor for normal - * rooms; for maze rooms, draw maze. - */ - -void -draw_room(struct rogue_state *rs,struct room *rp) -{ - int y, x; - - if (rp->r_flags & ISMAZE) - do_maze(rs,rp); - else - { - vert(rp, rp->r_pos.x); /* Draw left side */ - vert(rp, rp->r_pos.x + rp->r_max.x - 1); /* Draw right side */ - horiz(rp, rp->r_pos.y); /* Draw top */ - horiz(rp, rp->r_pos.y + rp->r_max.y - 1); /* Draw bottom */ - - /* - * Put the floor down - */ - for (y = rp->r_pos.y + 1; y < rp->r_pos.y + rp->r_max.y - 1; y++) - for (x = rp->r_pos.x + 1; x < rp->r_pos.x + rp->r_max.x - 1; x++) - chat(y, x) = FLOOR; - } -} - -/* - * vert: - * Draw a vertical line - */ - -void -vert(struct room *rp, int startx) -{ - int y; - - for (y = rp->r_pos.y + 1; y <= rp->r_max.y + rp->r_pos.y - 1; y++) - chat(y, startx) = '|'; -} - -/* - * horiz: - * Draw a horizontal line - */ - -void -horiz(struct room *rp, int starty) -{ - int x; - - for (x = rp->r_pos.x; x <= rp->r_pos.x + rp->r_max.x - 1; x++) - chat(starty, x) = '-'; -} - -/* - * do_maze: - * Dig a maze - */ - -static int Maxy, Maxx, Starty, Startx; - -static SPOT maze[NUMLINES/3+1][NUMCOLS/3+1]; - - -void -do_maze(struct rogue_state *rs,struct room *rp) -{ - SPOT *sp; - int starty, startx; - static coord pos; - - for (sp = &maze[0][0]; sp <= &maze[NUMLINES / 3][NUMCOLS / 3]; sp++) - { - sp->used = FALSE; - sp->nexits = 0; - } - - Maxy = rp->r_max.y; - Maxx = rp->r_max.x; - Starty = rp->r_pos.y; - Startx = rp->r_pos.x; - starty = (rnd(rp->r_max.y) / 2) * 2; - startx = (rnd(rp->r_max.x) / 2) * 2; - pos.y = starty + Starty; - pos.x = startx + Startx; - putpass(&pos); - dig(rs,starty, startx); -} - -/* - * dig: - * Dig out from around where we are now, if possible - */ - -void -dig(struct rogue_state *rs,int y, int x) -{ - coord *cp; - int cnt, newy, newx, nexty = 0, nextx = 0; - static coord pos; - static coord del[4] = { - {2, 0}, {-2, 0}, {0, 2}, {0, -2} - }; - - for (;;) - { - if ( rs->replaydone != 0 ) - return; - cnt = 0; - for (cp = del; cp <= &del[3]; cp++) - { - newy = y + cp->y; - newx = x + cp->x; - if (newy < 0 || newy > Maxy || newx < 0 || newx > Maxx) - continue; - if (flat(newy + Starty, newx + Startx) & F_PASS) - continue; - if (rnd(++cnt) == 0) - { - nexty = newy; - nextx = newx; - } - } - if (cnt == 0) - return; - accnt_maze(y, x, nexty, nextx); - accnt_maze(nexty, nextx, y, x); - if (nexty == y) - { - pos.y = y + Starty; - if (nextx - x < 0) - pos.x = nextx + Startx + 1; - else - pos.x = nextx + Startx - 1; - } - else - { - pos.x = x + Startx; - if (nexty - y < 0) - pos.y = nexty + Starty + 1; - else - pos.y = nexty + Starty - 1; - } - putpass(&pos); - pos.y = nexty + Starty; - pos.x = nextx + Startx; - putpass(&pos); - dig(rs,nexty, nextx); - } -} - -/* - * accnt_maze: - * Account for maze exits - */ - -void -accnt_maze(int y, int x, int ny, int nx) -{ - SPOT *sp; - coord *cp; - - sp = &maze[y][x]; - for (cp = sp->exits; cp < &sp->exits[sp->nexits]; cp++) - if (cp->y == ny && cp->x == nx) - return; - cp->y = ny; - cp->x = nx; -} - -/* - * rnd_pos: - * Pick a random spot in a room - */ - -void -rnd_pos(struct room *rp, coord *cp) -{ - cp->x = rp->r_pos.x + rnd(rp->r_max.x - 2) + 1; - cp->y = rp->r_pos.y + rnd(rp->r_max.y - 2) + 1; -} - -/* - * find_floor: - * Find a valid floor spot in this room. If rp is NULL, then - * pick a new room each time around the loop. - */ -bool -find_floor(struct rogue_state *rs,struct room *rp, coord *cp, int limit, bool monst) -{ - PLACE *pp; - int cnt; - char compchar = 0; - bool pickroom; - - pickroom = (bool)(rp == NULL); - - if (!pickroom) - compchar = ((rp->r_flags & ISMAZE) ? PASSAGE : FLOOR); - cnt = limit; - for (;;) - { - if ( rs->replaydone != 0 ) - return(FALSE); - if (limit && cnt-- == 0) - return FALSE; - if (pickroom) - { - rp = &rooms[rnd_room()]; - compchar = ((rp->r_flags & ISMAZE) ? PASSAGE : FLOOR); - } - rnd_pos(rp, cp); - pp = INDEX(cp->y, cp->x); - if (monst) - { - if (pp->p_monst == NULL && step_ok(pp->p_ch)) - return TRUE; - } - else if (pp->p_ch == compchar) - return TRUE; - } -} - -/* - * enter_room: - * Code that is executed whenver you appear in a room - */ - -void -enter_room(struct rogue_state *rs,coord *cp) -{ - struct room *rp; - THING *tp; - int y, x; - char ch; - - rp = proom = roomin(rs,cp); - door_open(rs,rp); - if (!(rp->r_flags & ISDARK) && !on(player, ISBLIND)) - for (y = rp->r_pos.y; y < rp->r_max.y + rp->r_pos.y; y++) - { - move(y, rp->r_pos.x); - for (x = rp->r_pos.x; x < rp->r_max.x + rp->r_pos.x; x++) - { - tp = moat(y, x); - ch = chat(y, x); - if (tp == NULL) - if (CCHAR(inch()) != ch) - addch(ch); - else - move(y, x + 1); - else - { - tp->t_oldch = ch; - if (!see_monst(tp)) - if (on(player, SEEMONST)) - { - standout(); - addch(tp->t_disguise); - standend(); - } - else - addch(ch); - else - addch(tp->t_disguise); - } - } - } -} - -/* - * leave_room: - * Code for when we exit a room - */ - -void -leave_room(struct rogue_state *rs,coord *cp) -{ - PLACE *pp; - struct room *rp; - int y, x; - char floor; - char ch; - - rp = proom; - - if (rp->r_flags & ISMAZE) - return; - - if (rp->r_flags & ISGONE) - floor = PASSAGE; - else if (!(rp->r_flags & ISDARK) || on(player, ISBLIND)) - floor = FLOOR; - else - floor = ' '; - - proom = &passages[flat(cp->y, cp->x) & F_PNUM]; - for (y = rp->r_pos.y; y < rp->r_max.y + rp->r_pos.y; y++) - for (x = rp->r_pos.x; x < rp->r_max.x + rp->r_pos.x; x++) - { - move(y, x); - switch ( ch = CCHAR(inch()) ) - { - case FLOOR: - if (floor == ' ' && ch != ' ') - addch(' '); - break; - default: - /* - * to check for monster, we have to strip out - * standout bit - */ - if (isupper(toascii(ch))) - { - if (on(player, SEEMONST)) - { - standout(); - addch(ch); - standend(); - break; - } - pp = INDEX(y,x); - addch(pp->p_ch == DOOR ? DOOR : floor); - } - } - } - door_open(rs,rp); -} diff --git a/src/cc/rogue/save.c b/src/cc/rogue/save.c deleted file mode 100644 index cd11d9d54..000000000 --- a/src/cc/rogue/save.c +++ /dev/null @@ -1,465 +0,0 @@ -// Copyright (c) 2016-2023 The Hush developers -// Distributed under the GPLv3 software license, see the accompanying -// file COPYING or https://www.gnu.org/licenses/gpl-3.0.en.html -/* - * save and restore routines - * - * @(#)save.c 4.33 (Berkeley) 06/01/83 - * - * Rogue: Exploring the Dungeons of Doom - * Copyright (C) 1980-1983, 1985, 1999 Michael Toy, Ken Arnold and Glenn Wichman - * All rights reserved. - * - * See the file LICENSE.TXT for full copyright and licensing information. - */ - -//#include -//#include -//#include -//#include -//#include -//#include -//#include -#include "rogue.h" -#include "score.h" - -typedef struct stat STAT; - -extern char *version, *encstr; - -static STAT sbuf; - -/* - * save_game: - * Implement the "save game" command - */ - -void -save_game(struct rogue_state *rs) -{ - FILE *savef; - int c; - //auto - char buf[MAXSTR]; - - /* - * get file name - */ - mpos = 0; -over: - if (file_name[0] != '\0') - { - for (;;) - { - msg(rs,"save file (%s)? ", file_name); - c = readchar(rs); - mpos = 0; - if (c == ESCAPE) - { - msg(rs,""); - return; - } - else if (c == 'n' || c == 'N' || c == 'y' || c == 'Y') - break; - else - msg(rs,"please answer Y or N"); - } - if (c == 'y' || c == 'Y') - { - addstr("Yes\n"); - if ( rs->sleeptime != 0 ) - refresh(); - strcpy(buf, file_name); - goto gotfile; - } - } - - do - { - mpos = 0; - msg(rs,"file name: "); - buf[0] = '\0'; - if (get_str(rs,buf, stdscr) == QUIT) - { -quit_it: - msg(rs,""); - return; - } - mpos = 0; -gotfile: - /* - * test to see if the file exists - */ - if (stat(buf, &sbuf) >= 0) - { - for (;;) - { - msg(rs,"File exists. Do you wish to overwrite it?"); - mpos = 0; - if ((c = readchar(rs)) == ESCAPE) - goto quit_it; - if (c == 'y' || c == 'Y') - break; - else if (c == 'n' || c == 'N') - goto over; - else - msg(rs,"Please answer Y or N"); - } - msg(rs,"file name: %s", buf); - md_unlink(file_name); - } - strcpy(file_name, buf); - if ((savef = fopen(file_name, "w")) == NULL) - msg(rs,strerror(errno)); - } while (savef == NULL); - - save_file(rs,savef,1); - /* NOTREACHED */ -} - -/* - * auto_save: - * Automatically save a file. This is used if a HUP signal is - * recieved - */ - -void -auto_save(int sig) -{ - FILE *savef; - NOOP(sig); - - md_ignoreallsignals(); - if (file_name[0] != '\0' && ((savef = fopen(file_name, "w")) != NULL || - (md_unlink_open_file(file_name, savef) >= 0 && (savef = fopen(file_name, "w")) != NULL))) - save_file(&globalR,savef,1); - my_exit(0); -} - -/* - * save_file: - * Write the saved game on the file - */ - -char *rogue_packfname(struct rogue_state *rs,char *fname) -{ - sprintf(fname,"rogue.%llu.pack",(long long)rs->seed); - return(fname); -} - -void -save_file(struct rogue_state *rs,FILE *savef,int32_t guiflag) -{ - char buf[80],fname[512]; int32_t i,n,nonz,histo[0x100]; FILE *fp; - if ( rs->guiflag != 0 ) - { - mvcur(0, COLS - 1, LINES - 1, 0); - putchar('\n'); - endwin(); - resetltchars(); - md_chmod(file_name, 0400); - if ( guiflag != 0 ) - { - encwrite(version, strlen(version)+1, savef); - sprintf(buf,"%d x %d\n", LINES, COLS); - encwrite(buf,80,savef); - } - } - memset(&rs->P,0,sizeof(rs->P)); - rs_save_file(rs,savef); // sets rs->P - //fprintf(stderr,"gold.%d hp.%d strength.%d level.%d exp.%d %d\n",rs->P.gold,rs->P.hitpoints,rs->P.strength,rs->P.level,rs->P.experience,rs->P.dungeonlevel); - - n = sizeof(rs->P) - sizeof(rs->P.roguepack) + sizeof(rs->P.roguepack[0])*rs->P.packsize; - memset(histo,0,sizeof(histo)); - for (i=0; iP)[i]); - histo[((uint8_t *)&rs->P)[i]]++; - rs->playerdata[i] = ((uint8_t *)&rs->P)[i]; - } - rs->playersize = n; - //fprintf(stderr," packsize.%d playersize.%d\n",rs->P.packsize,n); - if ( (fp= fopen(rogue_packfname(rs,fname),"wb")) != 0 ) - { - fwrite(&rs->P,1,n,fp); - fclose(fp); - } - if ( 0 ) - { - for (i=nonz=0; i<0x100; i++) - if ( histo[i] != 0 ) - fprintf(stderr,"(%d %d) ",i,histo[i]), nonz++; - fprintf(stderr,"nonz.%d\n",nonz); - } - fflush(savef); - fclose(savef); - if ( guiflag != 0 ) - my_exit(0); -} - -int32_t rogue_restorepack(struct rogue_state *rs) -{ - FILE *fp; char fname[512]; int32_t retflag = -1; - memset(&rs->P,0,sizeof(rs->P)); - if ( (fp= fopen(rogue_packfname(rs,fname),"rb")) != 0 ) - { - if ( fread(&rs->P,1,sizeof(rs->P) - sizeof(rs->P.roguepack),fp) == sizeof(rs->P) - sizeof(rs->P.roguepack) ) - { - if ( rs->P.packsize > 0 && rs->P.packsize <= MAXPACK ) - { - if ( fread(&rs->P.roguepack,1,rs->P.packsize*sizeof(rs->P.roguepack[0]),fp) == rs->P.packsize*sizeof(rs->P.roguepack[0]) ) - { - fprintf(stderr,"roguepack[%d] restored\n",rs->P.packsize); - retflag = 0; - } - } - } - } - if ( retflag < 0 ) - memset(&rs->P,0,sizeof(rs->P)); - return(retflag); -} - -/* - * restore: - * Restore a saved game from a file with elaborate checks for file - * integrity from cheaters - */ -bool -restore(struct rogue_state *rs,char *file, char **envp) -{ - FILE *inf; - int syml,l, cols; - extern char **environ; - //auto - char buf[MAXSTR]; - //auto - STAT sbuf2; - if ( rs->guiflag == 0 ) - return(0); - - if (strcmp(file, "-r") == 0) - file = file_name; - - md_tstphold(); - - if ((inf = fopen(file,"r")) == NULL) - { - perror(file); - return FALSE; - } - stat(file, &sbuf2); - syml = is_symlink(file); - - fflush(stdout); - encread(buf, (unsigned) strlen(version) + 1, inf); - if (strcmp(buf, version) != 0) - { - printf("Sorry, saved game is out of date.\n"); - return FALSE; - } - encread(buf,80,inf); - sscanf(buf,"%d x %d\n", &l, &cols); - - initscr(); /* Start up cursor package */ - keypad(stdscr, 1); - - if (l > LINES) - { - endwin(); - printf("Sorry, original game was played on a screen with %d lines.\n",l); - printf("Current screen only has %d lines. Unable to restore game\n",LINES); - return(FALSE); - } - if (cols > COLS) - { - endwin(); - printf("Sorry, original game was played on a screen with %d columns.\n",cols); - printf("Current screen only has %d columns. Unable to restore game\n",COLS); - return(FALSE); - } - - hw = newwin(LINES, COLS, 0, 0); - setup(); - - rs_restore_file(inf); - /* - * we do not close the file so that we will have a hold of the - * inode for as long as possible - */ - - if ( -#ifdef MASTER - !wizard && -#endif - md_unlink_open_file(file, inf) < 0) - { - printf("Cannot unlink file\n"); - return FALSE; - } - mpos = 0; -/* printw(0, 0, "%s: %s", file, ctime(&sbuf2.st_mtime)); */ -/* - printw("%s: %s", file, ctime(&sbuf2.st_mtime)); -*/ - clearok(stdscr,TRUE); - /* - * defeat multiple restarting from the same place - */ -#ifdef MASTER - if (!wizard) -#endif - if (sbuf2.st_nlink != 1 || syml) - { - endwin(); - printf("\nCannot restore from a linked file\n"); - return FALSE; - } - - if (pstats.s_hpt <= 0) - { - endwin(); - printf("\n\"He's dead, Jim\"\n"); - return FALSE; - } - - md_tstpresume(); - - environ = envp; - strcpy(file_name, file); - clearok(curscr, TRUE); - srand((int32_t)rs->seed);//md_getpid()); - msg(rs,"file name: %s", file); - playit(rs); - /*NOTREACHED*/ - return(0); -} - -/* - * encwrite: - * Perform an encrypted write - */ -#define CRYPT_ENABLE 0 - -size_t -encwrite(char *start, size_t size, FILE *outf) -{ - char *e1, *e2, fb; - int temp; - extern char *statlist; - size_t o_size = size; - e1 = encstr; - e2 = statlist; - fb = 0; - - while(size) - { - if ( CRYPT_ENABLE ) - { - if (putc(*start++ ^ *e1 ^ *e2 ^ fb, outf) == EOF) - break; - - temp = *e1++; - fb = fb + ((char) (temp * *e2++)); - if (*e1 == '\0') - e1 = encstr; - if (*e2 == '\0') - e2 = statlist; - } - else if ( putc(*start++,outf) == EOF ) - break; - size--; - } - - return(o_size - size); -} - -/* - * encread: - * Perform an encrypted read - */ -size_t -encread(char *start, size_t size, FILE *inf) -{ - char *e1, *e2, fb; - int temp; - size_t read_size; - extern char *statlist; - - fb = 0; - - if ((read_size = fread(start,1,size,inf)) == 0 || read_size == -1) - return(read_size); - if ( CRYPT_ENABLE ) - { - e1 = encstr; - e2 = statlist; - while (size--) - { - *start++ ^= *e1 ^ *e2 ^ fb; - temp = *e1++; - fb = fb + (char)(temp * *e2++); - if (*e1 == '\0') - e1 = encstr; - if (*e2 == '\0') - e2 = statlist; - } - } - return(read_size); -} - -static char scoreline[100]; -/* - * read_scrore - * Read in the score file - */ -void -rd_score(SCORE *top_ten) -{ - unsigned int i; - - if (scoreboard == NULL) - return; - - rewind(scoreboard); - - for(i = 0; i < numscores; i++) - { - encread(top_ten[i].sc_name, MAXSTR, scoreboard); - encread(scoreline, 100, scoreboard); - sscanf(scoreline, " %u %d %u %hu %d %x \n", - &top_ten[i].sc_uid, &top_ten[i].sc_score, - &top_ten[i].sc_flags, &top_ten[i].sc_monster, - &top_ten[i].sc_level, &top_ten[i].sc_time); - } - - rewind(scoreboard); -} - -/* - * write_scrore - * Read in the score file - */ -void -wr_score(SCORE *top_ten) -{ - unsigned int i; - - if (scoreboard == NULL) - return; - - rewind(scoreboard); - - for(i = 0; i < numscores; i++) - { - memset(scoreline,0,100); - encwrite(top_ten[i].sc_name, MAXSTR, scoreboard); - sprintf(scoreline, " %u %d %u %hu %d %x \n", - top_ten[i].sc_uid, top_ten[i].sc_score, - top_ten[i].sc_flags, top_ten[i].sc_monster, - top_ten[i].sc_level, top_ten[i].sc_time); - encwrite(scoreline,100,scoreboard); - } - - rewind(scoreboard); -} diff --git a/src/cc/rogue/score.h b/src/cc/rogue/score.h deleted file mode 100644 index 8b3aa9cd1..000000000 --- a/src/cc/rogue/score.h +++ /dev/null @@ -1,32 +0,0 @@ -// Copyright (c) 2016-2023 The Hush developers -// Distributed under the GPLv3 software license, see the accompanying -// file COPYING or https://www.gnu.org/licenses/gpl-3.0.en.html -/* - * Score file structure - * - * @(#)score.h 4.6 (Berkeley) 02/05/99 - * - * Rogue: Exploring the Dungeons of Doom - * Copyright (C) 1980-1983, 1985, 1999 Michael Toy, Ken Arnold and Glenn Wichman - * All rights reserved. - * - * See the file LICENSE.TXT for full copyright and licensing information. - */ -#ifndef H_SCORE_H -#define H_SCORE_H - -struct sc_ent { - unsigned int sc_uid; - int sc_score; - unsigned int sc_flags; - unsigned short sc_monster; - char sc_name[MAXSTR]; - int sc_level; - unsigned int sc_time; -}; - -typedef struct sc_ent SCORE; - -void rd_score(SCORE *top_ten); -void wr_score(SCORE *top_ten); -#endif diff --git a/src/cc/rogue/scrolls.c b/src/cc/rogue/scrolls.c deleted file mode 100644 index a06d4bb1e..000000000 --- a/src/cc/rogue/scrolls.c +++ /dev/null @@ -1,332 +0,0 @@ -// Copyright (c) 2016-2023 The Hush developers -// Distributed under the GPLv3 software license, see the accompanying -// file COPYING or https://www.gnu.org/licenses/gpl-3.0.en.html -/* - * Read a scroll and let it happen - * - * @(#)scrolls.c 4.44 (Berkeley) 02/05/99 - * - * Rogue: Exploring the Dungeons of Doom - * Copyright (C) 1980-1983, 1985, 1999 Michael Toy, Ken Arnold and Glenn Wichman - * All rights reserved. - * - * See the file LICENSE.TXT for full copyright and licensing information. - */ - -//#include -//#include -#include "rogue.h" - -/* - * read_scroll: - * Read a scroll from the pack and do the appropriate thing - */ - -void -read_scroll(struct rogue_state *rs) -{ - THING *obj; - PLACE *pp; - int y, x; - char ch; - int i; - bool discardit = FALSE; - struct room *cur_room; - THING *orig_obj; - static coord mp; - - obj = get_item(rs,"read", SCROLL); - if (obj == NULL) - return; - if (obj->o_type != SCROLL) - { - if (!terse) - msg(rs,"there is nothing on it to read"); - else - msg(rs,"nothing to read"); - return; - } - /* - * Calculate the effect it has on the poor guy. - */ - if (obj == cur_weapon) - cur_weapon = NULL; - /* - * Get rid of the thing - */ - discardit = (bool)(obj->o_count == 1); - leave_pack(rs,obj, FALSE, FALSE); - orig_obj = obj; - - switch (obj->o_which) - { - case S_CONFUSE: - /* - * Scroll of monster confusion. Give him that power. - */ - player.t_flags |= CANHUH; - msg(rs,"your hands begin to glow %s", pick_color("red")); - when S_ARMOR: - if (cur_armor != NULL) - { - cur_armor->o_arm--; - cur_armor->o_flags &= ~ISCURSED; - msg(rs,"your armor glows %s for a moment", pick_color("silver")); - } - when S_HOLD: - /* - * Hold monster scroll. Stop all monsters within two spaces - * from chasing after the hero. - */ - - ch = 0; - for (x = hero.x - 2; x <= hero.x + 2; x++) - if (x >= 0 && x < NUMCOLS) - for (y = hero.y - 2; y <= hero.y + 2; y++) - if (y >= 0 && y <= NUMLINES - 1) - if ((obj = moat(y, x)) != NULL && on(*obj, ISRUN)) - { - obj->t_flags &= ~ISRUN; - obj->t_flags |= ISHELD; - ch++; - } - if (ch) - { - addmsg(rs,"the monster"); - if (ch > 1) - addmsg(rs,"s around you"); - addmsg(rs," freeze"); - if (ch == 1) - addmsg(rs,"s"); - endmsg(rs); - scr_info[S_HOLD].oi_know = TRUE; - } - else - msg(rs,"you feel a strange sense of loss"); - when S_SLEEP: - /* - * Scroll which makes you fall asleep - */ - scr_info[S_SLEEP].oi_know = TRUE; - no_command += rnd(SLEEPTIME) + 4; - player.t_flags &= ~ISRUN; - msg(rs,"you fall asleep"); - when S_CREATE: - /* - * Create a monster: - * First look in a circle around him, next try his room - * otherwise give up - */ - i = 0; - for (y = hero.y - 1; y <= hero.y + 1; y++) - for (x = hero.x - 1; x <= hero.x + 1; x++) - /* - * Don't put a monster in top of the player. - */ - if (y == hero.y && x == hero.x) - continue; - /* - * Or anything else nasty - */ - else if (step_ok(ch = winat(y, x))) - { - if (ch == SCROLL - && find_obj(rs,y, x)->o_which == S_SCARE) - continue; - else if (rnd(++i) == 0) - { - mp.y = y; - mp.x = x; - } - } - if (i == 0) - msg(rs,"you hear a faint cry of anguish in the distance"); - else - { - obj = new_item(); - new_monster(rs,obj, randmonster(FALSE), &mp); - } - when S_ID_POTION: - case S_ID_SCROLL: - case S_ID_WEAPON: - case S_ID_ARMOR: - case S_ID_R_OR_S: - { - static char id_type[S_ID_R_OR_S + 1] = - { 0, 0, 0, 0, 0, POTION, SCROLL, WEAPON, ARMOR, R_OR_S }; - /* - * Identify, let him figure something out - */ - scr_info[obj->o_which].oi_know = TRUE; - msg(rs,"this scroll is an %s scroll", scr_info[obj->o_which].oi_name); - whatis(rs,TRUE, id_type[obj->o_which]); - } - when S_MAP: - /* - * Scroll of magic mapping. - */ - scr_info[S_MAP].oi_know = TRUE; - msg(rs,"oh, now this scroll has a map on it"); - /* - * take all the things we want to keep hidden out of the window - */ - for (y = 1; y < NUMLINES - 1; y++) - for (x = 0; x < NUMCOLS; x++) - { - pp = INDEX(y, x); - switch (ch = pp->p_ch) - { - case DOOR: - case STAIRS: - break; - - case '-': - case '|': - if (!(pp->p_flags & F_REAL)) - { - ch = pp->p_ch = DOOR; - pp->p_flags |= F_REAL; - } - break; - - case ' ': - if (pp->p_flags & F_REAL) - goto def; - pp->p_flags |= F_REAL; - ch = pp->p_ch = PASSAGE; - /* FALLTHROUGH */ - - case PASSAGE: -pass: - if (!(pp->p_flags & F_REAL)) - pp->p_ch = PASSAGE; - pp->p_flags |= (F_SEEN|F_REAL); - ch = PASSAGE; - break; - - case FLOOR: - if (pp->p_flags & F_REAL) - ch = ' '; - else - { - ch = TRAP; - pp->p_ch = TRAP; - pp->p_flags |= (F_SEEN|F_REAL); - } - break; - - default: -def: - if (pp->p_flags & F_PASS) - goto pass; - ch = ' '; - break; - } - if (ch != ' ') - { - if ((obj = pp->p_monst) != NULL) - obj->t_oldch = ch; - if (obj == NULL || !on(player, SEEMONST)) - mvaddch(y, x, ch); - } - } - when S_FDET: - /* - * Potion of gold detection - */ - ch = FALSE; - wclear(hw); - for (obj = lvl_obj; obj != NULL; obj = next(obj)) - if (obj->o_type == FOOD) - { - ch = TRUE; - wmove(hw, obj->o_pos.y, obj->o_pos.x); - waddch(hw, FOOD); - } - if (ch) - { - scr_info[S_FDET].oi_know = TRUE; - show_win(rs,"Your nose tingles and you smell food.--More--"); - } - else - msg(rs,"your nose tingles"); - when S_TELEP: - /* - * Scroll of teleportation: - * Make him dissapear and reappear - */ - { - cur_room = proom; - teleport(rs); - if (cur_room != proom) - scr_info[S_TELEP].oi_know = TRUE; - } - when S_ENCH: - if (cur_weapon == NULL || cur_weapon->o_type != WEAPON) - msg(rs,"you feel a strange sense of loss"); - else - { - cur_weapon->o_flags &= ~ISCURSED; - if (rnd(2) == 0) - cur_weapon->o_hplus++; - else - cur_weapon->o_dplus++; - msg(rs,"your %s glows %s for a moment", - weap_info[cur_weapon->o_which].oi_name, pick_color("blue")); - } - when S_SCARE: - /* - * Reading it is a mistake and produces laughter at her - * poor boo boo. - */ - msg(rs,"you hear maniacal laughter in the distance"); - when S_REMOVE: - uncurse(cur_armor); - uncurse(cur_weapon); - uncurse(cur_ring[LEFT]); - uncurse(cur_ring[RIGHT]); - msg(rs,choose_str("you feel in touch with the Universal Onenes", - "you feel as if somebody is watching over you")); - when S_AGGR: - /* - * This scroll aggravates all the monsters on the current - * level and sets them running towards the hero - */ - aggravate(rs); - msg(rs,"you hear a high pitched humming noise"); - when S_PROTECT: - if (cur_armor != NULL) - { - cur_armor->o_flags |= ISPROT; - msg(rs,"your armor is covered by a shimmering %s shield", - pick_color("gold")); - } - else - msg(rs,"you feel a strange sense of loss"); -#ifdef MASTER - otherwise: - msg(rs,"what a puzzling scroll!"); - return; -#endif - } - obj = orig_obj; - look(rs,TRUE); /* put the result of the scroll on the screen */ - status(rs); - - call_it(rs,&scr_info[obj->o_which]); - - if (discardit) - discard(obj); -} - -/* - * uncurse: - * Uncurse an item - */ - -void -uncurse(THING *obj) -{ - if (obj != NULL) - obj->o_flags &= ~ISCURSED; -} diff --git a/src/cc/rogue/state.c b/src/cc/rogue/state.c deleted file mode 100644 index c2753145f..000000000 --- a/src/cc/rogue/state.c +++ /dev/null @@ -1,2278 +0,0 @@ -// Copyright (c) 2016-2023 The Hush developers -// Distributed under the GPLv3 software license, see the accompanying -// file COPYING or https://www.gnu.org/licenses/gpl-3.0.en.html -/* - state.c - Portable Rogue Save State Code - - Copyright (C) 1999, 2000, 2005 Nicholas J. Kisseberth - All rights reserved. - - Redistribution and use in source and binary forms, with or without - modification, are permitted provided that the following conditions - are met: - 1. Redistributions of source code must retain the above copyright - notice, this list of conditions and the following disclaimer. - 2. Redistributions in binary form must reproduce the above copyright - notice, this list of conditions and the following disclaimer in the - documentation and/or other materials provided with the distribution. - 3. Neither the name(s) of the author(s) nor the names of other contributors - may be used to endorse or promote products derived from this software - without specific prior written permission. - - THIS SOFTWARE IS PROVIDED BY THE AUTHOR(S) AND CONTRIBUTORS ``AS IS'' AND - ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR(S) OR CONTRIBUTORS BE LIABLE - FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - SUCH DAMAGE. -*/ - -//#include -//#include -//#include -#include "rogue.h" - -/************************************************************************/ -/* Save State Code */ -/************************************************************************/ - -#define RSID_STATS 0xABCD0001 -#define RSID_THING 0xABCD0002 -#define RSID_THING_NULL 0xDEAD0002 -#define RSID_OBJECT 0xABCD0003 -#define RSID_MAGICITEMS 0xABCD0004 -#define RSID_KNOWS 0xABCD0005 -#define RSID_GUESSES 0xABCD0006 -#define RSID_OBJECTLIST 0xABCD0007 -#define RSID_BAGOBJECT 0xABCD0008 -#define RSID_MONSTERLIST 0xABCD0009 -#define RSID_MONSTERSTATS 0xABCD000A -#define RSID_MONSTERS 0xABCD000B -#define RSID_TRAP 0xABCD000C -#define RSID_WINDOW 0xABCD000D -#define RSID_DAEMONS 0xABCD000E -#define RSID_IWEAPS 0xABCD000F -#define RSID_IARMOR 0xABCD0010 -#define RSID_SPELLS 0xABCD0011 -#define RSID_ILIST 0xABCD0012 -#define RSID_HLIST 0xABCD0013 -#define RSID_DEATHTYPE 0xABCD0014 -#define RSID_CTYPES 0XABCD0015 -#define RSID_COORDLIST 0XABCD0016 -#define RSID_ROOMS 0XABCD0017 - -#define READSTAT (format_error || read_error ) -#define WRITESTAT (write_error) - -static int read_error = FALSE; -static int write_error = FALSE; -static int format_error = FALSE; -static int endian = 0x01020304; -#define big_endian ( *((char *)&endian) == 0x01 ) - -int -rs_write(FILE *savef, void *ptr, size_t size) -{ - if (write_error) - return(WRITESTAT); - - if (encwrite((char *)ptr, size, savef) != size) - write_error = 1; - - return(WRITESTAT); -} - -int -rs_read(FILE *inf, void *ptr, size_t size) -{ - if (read_error || format_error) - return(READSTAT); - - if (encread((char *)ptr, size, inf) != size) - read_error = 1; - - return(READSTAT); -} - -int -rs_write_int(FILE *savef, int32_t c) -{ - unsigned char bytes[4]; - unsigned char *buf = (unsigned char *) &c; - - if (write_error) - return(WRITESTAT); - - if (big_endian) - { - bytes[3] = buf[0]; - bytes[2] = buf[1]; - bytes[1] = buf[2]; - bytes[0] = buf[3]; - buf = bytes; - } - - rs_write(savef, buf, 4); - - return(WRITESTAT); -} - -int -rs_read_int(FILE *inf, int32_t *i) -{ - unsigned char bytes[4]; - int input = 0; - unsigned char *buf = (unsigned char *)&input; - - if (read_error || format_error) - return(READSTAT); - - rs_read(inf, &input, 4); - - if (big_endian) - { - bytes[3] = buf[0]; - bytes[2] = buf[1]; - bytes[1] = buf[2]; - bytes[0] = buf[3]; - buf = bytes; - } - - *i = *((int *) buf); - - return(READSTAT); -} - -int -rs_write_char(FILE *savef, char c) -{ - if (write_error) - return(WRITESTAT); - - rs_write(savef, &c, 1); - - return(WRITESTAT); -} - -int -rs_read_char(FILE *inf, char *c) -{ - if (read_error || format_error) - return(READSTAT); - - rs_read(inf, c, 1); - - return(READSTAT); -} - -int -rs_write_chars(FILE *savef, char *c, int count) -{ - if (write_error) - return(WRITESTAT); - - rs_write_int(savef, count); - rs_write(savef, c, count); - - return(WRITESTAT); -} - -int -rs_read_chars(FILE *inf, char *i, int count) -{ - int value = 0; - - if (read_error || format_error) - return(READSTAT); - - rs_read_int(inf, &value); - - if (value != count) - format_error = TRUE; - - rs_read(inf, i, count); - - return(READSTAT); -} - -int -rs_write_ints(FILE *savef, int32_t *c, int count) -{ - int n = 0; - - if (write_error) - return(WRITESTAT); - - rs_write_int(savef, count); - - for(n = 0; n < count; n++) - if( rs_write_int(savef,c[n]) != 0) - break; - - return(WRITESTAT); -} - -int -rs_read_ints(FILE *inf, int32_t *i, int count) -{ - int n, value; - - if (read_error || format_error) - return(READSTAT); - - rs_read_int(inf,&value); - - if (value != count) - format_error = TRUE; - - for(n = 0; n < count; n++) - if (rs_read_int(inf, &i[n]) != 0) - break; - - return(READSTAT); -} - -int -rs_write_boolean(FILE *savef, int c) -{ - unsigned char buf = (c == 0) ? 0 : 1; - - if (write_error) - return(WRITESTAT); - - rs_write(savef, &buf, 1); - - return(WRITESTAT); -} - -int -rs_read_boolean(FILE *inf, bool *i) -{ - unsigned char buf = 0; - - if (read_error || format_error) - return(READSTAT); - - rs_read(inf, &buf, 1); - - *i = (buf != 0); - - return(READSTAT); -} - -int -rs_write_booleans(FILE *savef, bool *c, int count) -{ - int n = 0; - - if (write_error) - return(WRITESTAT); - - rs_write_int(savef, count); - - for(n = 0; n < count; n++) - if (rs_write_boolean(savef, c[n]) != 0) - break; - - return(WRITESTAT); -} - -int -rs_read_booleans(FILE *inf, bool *i, int count) -{ - int n = 0, value = 0; - - if (read_error || format_error) - return(READSTAT); - - rs_read_int(inf,&value); - - if (value != count) - format_error = TRUE; - - for(n = 0; n < count; n++) - if (rs_read_boolean(inf, &i[n]) != 0) - break; - - return(READSTAT); -} - -int -rs_write_short(FILE *savef, int16_t c) -{ - unsigned char bytes[2]; - unsigned char *buf = (unsigned char *) &c; - - if (write_error) - return(WRITESTAT); - - if (big_endian) - { - bytes[1] = buf[0]; - bytes[0] = buf[1]; - buf = bytes; - } - - rs_write(savef, buf, 2); - - return(WRITESTAT); -} - -int -rs_read_short(FILE *inf, int16_t *i) -{ - unsigned char bytes[2]; - short input; - unsigned char *buf = (unsigned char *)&input; - - if (read_error || format_error) - return(READSTAT); - - rs_read(inf, &input, 2); - - if (big_endian) - { - bytes[1] = buf[0]; - bytes[0] = buf[1]; - buf = bytes; - } - - *i = *((short *) buf); - - return(READSTAT); -} - -int -rs_write_shorts(FILE *savef, int16_t *c, int count) -{ - int n = 0; - - if (write_error) - return(WRITESTAT); - - rs_write_int(savef, count); - - for(n = 0; n < count; n++) - if (rs_write_short(savef, c[n]) != 0) - break; - - return(WRITESTAT); -} - -int -rs_read_shorts(FILE *inf, int16_t *i, int count) -{ - int n = 0, value = 0; - - if (read_error || format_error) - return(READSTAT); - - rs_read_int(inf,&value); - - if (value != count) - format_error = TRUE; - - for(n = 0; n < value; n++) - if (rs_read_short(inf, &i[n]) != 0) - break; - - return(READSTAT); -} - -int -rs_write_ushort(FILE *savef, uint16_t c) -{ - unsigned char bytes[2]; - unsigned char *buf = (unsigned char *) &c; - - if (write_error) - return(WRITESTAT); - - if (big_endian) - { - bytes[1] = buf[0]; - bytes[0] = buf[1]; - buf = bytes; - } - - rs_write(savef, buf, 2); - - return(WRITESTAT); -} - -int -rs_read_ushort(FILE *inf, uint16_t *i) -{ - unsigned char bytes[2]; - unsigned short input; - unsigned char *buf = (unsigned char *)&input; - - if (read_error || format_error) - return(READSTAT); - - rs_read(inf, &input, 2); - - if (big_endian) - { - bytes[1] = buf[0]; - bytes[0] = buf[1]; - buf = bytes; - } - - *i = *((unsigned short *) buf); - - return(READSTAT); -} - -int -rs_write_uint(FILE *savef, uint32_t c) -{ - unsigned char bytes[4]; - unsigned char *buf = (unsigned char *) &c; - - if (write_error) - return(WRITESTAT); - - if (big_endian) - { - bytes[3] = buf[0]; - bytes[2] = buf[1]; - bytes[1] = buf[2]; - bytes[0] = buf[3]; - buf = bytes; - } - - rs_write(savef, buf, 4); - - return(WRITESTAT); -} - -int -rs_read_uint(FILE *inf, uint32_t *i) -{ - unsigned char bytes[4]; - int input; - unsigned char *buf = (unsigned char *)&input; - - if (read_error || format_error) - return(READSTAT); - - rs_read(inf, &input, 4); - - if (big_endian) - { - bytes[3] = buf[0]; - bytes[2] = buf[1]; - bytes[1] = buf[2]; - bytes[0] = buf[3]; - buf = bytes; - } - - *i = *((unsigned int *) buf); - - return(READSTAT); -} - -int -rs_write_marker(FILE *savef, int32_t id) -{ - if (write_error) - return(WRITESTAT); - - rs_write_int(savef, id); - - return(WRITESTAT); -} - -int -rs_read_marker(FILE *inf, int32_t id) -{ - int nid; - - if (read_error || format_error) - return(READSTAT); - - if (rs_read_int(inf, &nid) == 0) - if (id != nid) - format_error = 1; - - return(READSTAT); -} - - - -/******************************************************************************/ - -int -rs_write_string(FILE *savef, char *s) -{ - int len = 0; - - if (write_error) - return(WRITESTAT); - - len = (s == NULL) ? 0 : (int) strlen(s) + 1; - - rs_write_int(savef, len); - rs_write_chars(savef, s, len); - - return(WRITESTAT); -} - -int -rs_read_string(FILE *inf, char *s, int max) -{ - int len = 0; - - if (read_error || format_error) - return(READSTAT); - - rs_read_int(inf, &len); - - if (len > max) - format_error = TRUE; - - rs_read_chars(inf, s, len); - - return(READSTAT); -} - -int -rs_read_new_string(FILE *inf, char **s) -{ - int len=0; - char *buf=0; - - if (read_error || format_error) - return(READSTAT); - - rs_read_int(inf, &len); - - if (len == 0) - buf = NULL; - else - { - buf = (char *)malloc(len); - - if (buf == NULL) - read_error = TRUE; - } - - rs_read_chars(inf, buf, len); - - *s = buf; - - return(READSTAT); -} - -int -rs_write_strings(FILE *savef, char *s[], int count) -{ - int n = 0; - - if (write_error) - return(WRITESTAT); - - rs_write_int(savef, count); - - for(n = 0; n < count; n++) - if (rs_write_string(savef, s[n]) != 0) - break; - - return(WRITESTAT); -} - -int -rs_read_strings(FILE *inf, char **s, int count, int max) -{ - int n = 0; - int value = 0; - - if (read_error || format_error) - return(READSTAT); - - rs_read_int(inf, &value); - - if (value != count) - format_error = TRUE; - - for(n = 0; n < count; n++) - if (rs_read_string(inf, s[n], max) != 0) - break; - - return(READSTAT); -} - -int -rs_read_new_strings(FILE *inf, char **s, int count) -{ - int n = 0; - int value = 0; - - if (read_error || format_error) - return(READSTAT); - - rs_read_int(inf, &value); - - if (value != count) - format_error = TRUE; - - for(n = 0; n < count; n++) - if (rs_read_new_string(inf, &s[n]) != 0) - break; - - return(READSTAT); -} - -int -rs_write_string_index(FILE *savef, char *master[], int max, const char *str) -{ - int i; - - if (write_error) - return(WRITESTAT); - - for(i = 0; i < max; i++) - if (str == master[i]) - return( rs_write_int(savef, i) ); - - return( rs_write_int(savef,-1) ); -} - -int -rs_read_string_index(FILE *inf, char *master[], int maxindex, char **str) -{ - int i; - - if (read_error || format_error) - return(READSTAT); - - rs_read_int(inf, &i); - - if (i > maxindex) - format_error = TRUE; - else if (i >= 0) - *str = master[i]; - else - *str = NULL; - - return(READSTAT); -} - -int -rs_write_str_t(FILE *savef, str_t st) -{ - if (write_error) - return(WRITESTAT); - - rs_write_uint(savef, st); - - return( WRITESTAT ); -} - -int -rs_read_str_t(FILE *inf, str_t *st) -{ - if (read_error || format_error) - return(READSTAT); - - rs_read_uint(inf, st); - - return(READSTAT); -} - -int -rs_write_coord(FILE *savef, coord c) -{ - if (write_error) - return(WRITESTAT); - - rs_write_int(savef, c.x); - rs_write_int(savef, c.y); - - return(WRITESTAT); -} - -int -rs_read_coord(FILE *inf, coord *c) -{ - coord in; - - if (read_error || format_error) - return(READSTAT); - - rs_read_int(inf,&in.x); - rs_read_int(inf,&in.y); - - if (READSTAT == 0) - { - c->x = in.x; - c->y = in.y; - } - - return(READSTAT); -} - -int -rs_write_window(FILE *savef, WINDOW *win) -{ - int row,col,height,width; - - if (write_error) - return(WRITESTAT); - - width = getmaxx(win); - height = getmaxy(win); - - rs_write_marker(savef,RSID_WINDOW); - rs_write_int(savef,height); - rs_write_int(savef,width); - - for(row=0;rowl_next) - if (count == i) - return(l); - - return(NULL); -} - -int -find_list_ptr(THING *l, void *ptr) -{ - int count; - - for(count = 0; l != NULL; count++, l = l->l_next) - if (l == ptr) - return(count); - - return(-1); -} - -int -list_size(THING *l) -{ - int count; - - for(count = 0; l != NULL; count++, l = l->l_next) - ; - - return(count); -} - -/******************************************************************************/ - -int -rs_write_stats(FILE *savef, struct stats *s) -{ - if (write_error) - return(WRITESTAT); - - rs_write_marker(savef, RSID_STATS); - rs_write_str_t(savef, s->s_str); - rs_write_int(savef, s->s_exp); - rs_write_int(savef, s->s_lvl); - rs_write_int(savef, s->s_arm); - rs_write_int(savef, s->s_hpt); - rs_write_chars(savef, s->s_dmg, sizeof(s->s_dmg)); - rs_write_int(savef,s->s_maxhp); - - return(WRITESTAT); -} - -int -rs_read_stats(FILE *inf, struct stats *s) -{ - if (read_error || format_error) - return(READSTAT); - - rs_read_marker(inf, RSID_STATS); - rs_read_str_t(inf,&s->s_str); - rs_read_int(inf,&s->s_exp); - rs_read_int(inf,&s->s_lvl); - rs_read_int(inf,&s->s_arm); - rs_read_int(inf,&s->s_hpt); - rs_read_chars(inf,s->s_dmg,sizeof(s->s_dmg)); - rs_read_int(inf,&s->s_maxhp); - - return(READSTAT); -} - -int -rs_write_stone_index(FILE *savef, STONE master[], int max, const char *str) -{ - int i; - - if (write_error) - return(WRITESTAT); - - for(i = 0; i < max; i++) - if (str == master[i].st_name) - { - rs_write_int(savef,i); - return(WRITESTAT); - } - - rs_write_int(savef,-1); - - return(WRITESTAT); -} - -int -rs_read_stone_index(FILE *inf, STONE master[], int maxindex, char **str) -{ - int i = 0; - - if (read_error || format_error) - return(READSTAT); - - rs_read_int(inf,&i); - - if (i > maxindex) - format_error = TRUE; - else if (i >= 0) - *str = master[i].st_name; - else - *str = NULL; - - return(READSTAT); -} - -int -rs_write_scrolls(FILE *savef) -{ - int i; - - if (write_error) - return(WRITESTAT); - - for(i = 0; i < MAXSCROLLS; i++) - rs_write_string(savef, (char *)s_names[i]); - - return(READSTAT); -} - -int -rs_read_scrolls(FILE *inf) -{ - int i; - - if (read_error || format_error) - return(READSTAT); - - for(i = 0; i < MAXSCROLLS; i++) - rs_read_new_string(inf, (char **)&s_names[i]); - - return(READSTAT); -} - -int -rs_write_potions(FILE *savef) -{ - int i; - - if (write_error) - return(WRITESTAT); - - for(i = 0; i < MAXPOTIONS; i++) - rs_write_string_index(savef, (char **)rainbow, cNCOLORS, (char *)p_colors[i]); - - return(WRITESTAT); -} - -int -rs_read_potions(FILE *inf) -{ - int i; - - if (read_error || format_error) - return(READSTAT); - - for(i = 0; i < MAXPOTIONS; i++) - rs_read_string_index(inf, (char **)rainbow, cNCOLORS, (char **)&p_colors[i]); - - return(READSTAT); -} - -int -rs_write_rings(FILE *savef) -{ - int i; - - if (write_error) - return(WRITESTAT); - - for(i = 0; i < MAXRINGS; i++) - rs_write_stone_index(savef, (STONE *)stones, cNSTONES, (char *)r_stones[i]); - - return(WRITESTAT); -} - -int -rs_read_rings(FILE *inf) -{ - int i; - - if (read_error || format_error) - return(READSTAT); - - for(i = 0; i < MAXRINGS; i++) - rs_read_stone_index(inf, (STONE *)stones, cNSTONES, (char **)&r_stones[i]); - - return(READSTAT); -} - -int -rs_write_sticks(FILE *savef) -{ - int i; - - if (write_error) - return(WRITESTAT); - - for (i = 0; i < MAXSTICKS; i++) - { - if (strcmp(ws_type[i],"staff") == 0) - { - rs_write_int(savef,0); - rs_write_string_index(savef, (char **)wood, cNWOOD, (char *)ws_made[i]); - } - else - { - rs_write_int(savef,1); - rs_write_string_index(savef, (char **)metal, cNMETAL, (char *)ws_made[i]); - } - } - - return(WRITESTAT); -} - -int -rs_read_sticks(FILE *inf) -{ - int i = 0, list = 0; - - if (read_error || format_error) - return(READSTAT); - - for(i = 0; i < MAXSTICKS; i++) - { - rs_read_int(inf,&list); - - if (list == 0) - { - rs_read_string_index(inf, (char **)wood, cNWOOD, (char **)&ws_made[i]); - ws_type[i] = "staff"; - } - else - { - rs_read_string_index(inf, (char **)metal, cNMETAL, (char **)&ws_made[i]); - ws_type[i] = "wand"; - } - } - - return(READSTAT); -} - -int -rs_write_daemons(FILE *savef, struct delayed_action *d_list, int count) -{ - int i = 0; - int func = 0; - - if (write_error) - return(WRITESTAT); - - rs_write_marker(savef, RSID_DAEMONS); - rs_write_int(savef, count); - - for(i = 0; i < count; i++) - { - if (d_list[i].d_func == rollwand) - func = 1; - else if (d_list[i].d_func == doctor) - func = 2; - else if (d_list[i].d_func == stomach) - func = 3; - else if (d_list[i].d_func == runners) - func = 4; - else if (d_list[i].d_func == swander) - func = 5; - else if (d_list[i].d_func == nohaste) - func = 6; - else if (d_list[i].d_func == unconfuse) - func = 7; - else if (d_list[i].d_func == unsee) - func = 8; - else if (d_list[i].d_func == sight) - func = 9; - else if (d_list[i].d_func == NULL) - func = 0; - else - func = -1; - - rs_write_int(savef, d_list[i].d_type); - rs_write_int(savef, func); - rs_write_int(savef, d_list[i].d_arg); - rs_write_int(savef, d_list[i].d_time); - } - - return(WRITESTAT); -} - -int -rs_read_daemons(FILE *inf, struct delayed_action *d_list, int count) -{ - int i = 0; - int func = 0; - int value = 0; - - if (read_error || format_error) - return(READSTAT); - - rs_read_marker(inf, RSID_DAEMONS); - rs_read_int(inf, &value); - - if (value > count) - format_error = TRUE; - - for(i=0; i < count; i++) - { - func = 0; - rs_read_int(inf, &d_list[i].d_type); - rs_read_int(inf, &func); - rs_read_int(inf, &d_list[i].d_arg); - rs_read_int(inf, &d_list[i].d_time); - - switch(func) - { - case 1: d_list[i].d_func = rollwand; - break; - case 2: d_list[i].d_func = doctor; - break; - case 3: d_list[i].d_func = stomach; - break; - case 4: d_list[i].d_func = runners; - break; - case 5: d_list[i].d_func = swander; - break; - case 6: d_list[i].d_func = nohaste; - break; - case 7: d_list[i].d_func = unconfuse; - break; - case 8: d_list[i].d_func = unsee; - break; - case 9: d_list[i].d_func = sight; - break; - default:d_list[i].d_func = NULL; - break; - } - } - - if (d_list[i].d_func == NULL) - { - d_list[i].d_type = 0; - d_list[i].d_arg = 0; - d_list[i].d_time = 0; - } - - return(READSTAT); -} - -int -rs_write_obj_info(FILE *savef, struct obj_info *i, int count) -{ - int n; - - if (write_error) - return(WRITESTAT); - - rs_write_marker(savef, RSID_MAGICITEMS); - rs_write_int(savef, count); - - for(n = 0; n < count; n++) - { - /* mi_name is constant, defined at compile time in all cases */ - rs_write_int(savef,i[n].oi_prob); - rs_write_int(savef,i[n].oi_worth); - rs_write_string(savef,i[n].oi_guess); - rs_write_boolean(savef,i[n].oi_know); - } - - return(WRITESTAT); -} - -int -rs_read_obj_info(FILE *inf, struct obj_info *mi, int count) -{ - int n; - int value; - - if (read_error || format_error) - return(READSTAT); - - rs_read_marker(inf, RSID_MAGICITEMS); - - rs_read_int(inf, &value); - - if (value > count) - format_error = TRUE; - - for(n = 0; n < value; n++) - { - /* mi_name is const, defined at compile time in all cases */ - rs_read_int(inf,&mi[n].oi_prob); - rs_read_int(inf,&mi[n].oi_worth); - rs_read_new_string(inf,&mi[n].oi_guess); - rs_read_boolean(inf,&mi[n].oi_know); - } - - return(READSTAT); -} - -int -rs_write_room(FILE *savef, struct room *r) -{ - if (write_error) - return(WRITESTAT); - - rs_write_coord(savef, r->r_pos); - rs_write_coord(savef, r->r_max); - rs_write_coord(savef, r->r_gold); - rs_write_int(savef, r->r_goldval); - rs_write_short(savef, r->r_flags); - rs_write_int(savef, r->r_nexits); - rs_write_coord(savef, r->r_exit[0]); - rs_write_coord(savef, r->r_exit[1]); - rs_write_coord(savef, r->r_exit[2]); - rs_write_coord(savef, r->r_exit[3]); - rs_write_coord(savef, r->r_exit[4]); - rs_write_coord(savef, r->r_exit[5]); - rs_write_coord(savef, r->r_exit[6]); - rs_write_coord(savef, r->r_exit[7]); - rs_write_coord(savef, r->r_exit[8]); - rs_write_coord(savef, r->r_exit[9]); - rs_write_coord(savef, r->r_exit[10]); - rs_write_coord(savef, r->r_exit[11]); - - return(WRITESTAT); -} - -int -rs_read_room(FILE *inf, struct room *r) -{ - if (read_error || format_error) - return(READSTAT); - - rs_read_coord(inf,&r->r_pos); - rs_read_coord(inf,&r->r_max); - rs_read_coord(inf,&r->r_gold); - rs_read_int(inf,&r->r_goldval); - rs_read_short(inf,&r->r_flags); - rs_read_int(inf,&r->r_nexits); - rs_read_coord(inf,&r->r_exit[0]); - rs_read_coord(inf,&r->r_exit[1]); - rs_read_coord(inf,&r->r_exit[2]); - rs_read_coord(inf,&r->r_exit[3]); - rs_read_coord(inf,&r->r_exit[4]); - rs_read_coord(inf,&r->r_exit[5]); - rs_read_coord(inf,&r->r_exit[6]); - rs_read_coord(inf,&r->r_exit[7]); - rs_read_coord(inf,&r->r_exit[8]); - rs_read_coord(inf,&r->r_exit[9]); - rs_read_coord(inf,&r->r_exit[10]); - rs_read_coord(inf,&r->r_exit[11]); - - return(READSTAT); -} - -int -rs_write_rooms(FILE *savef, struct room r[], int count) -{ - int n = 0; - - if (write_error) - return(WRITESTAT); - //fprintf(stderr,"rooms %ld -> ",ftell(savef)); - rs_write_int(savef, count); - - for(n = 0; n < count; n++) - rs_write_room(savef, &r[n]); - //fprintf(stderr,"%ld\n",ftell(savef)); - - return(WRITESTAT); -} - -int -rs_read_rooms(FILE *inf, struct room *r, int count) -{ - int value = 0, n = 0; - - if (read_error || format_error) - return(READSTAT); - - rs_read_int(inf,&value); - - if (value > count) - format_error = TRUE; - - for(n = 0; n < value; n++) - rs_read_room(inf,&r[n]); - - return(READSTAT); -} - -int -rs_write_room_reference(FILE *savef, struct room *rp) -{ - int i, room = -1; - - if (write_error) - return(WRITESTAT); - - for (i = 0; i < MAXROOMS; i++) - if (&rooms[i] == rp) - room = i; - - rs_write_int(savef, room); - - return(WRITESTAT); -} - -int -rs_read_room_reference(FILE *inf, struct room **rp) -{ - int i; - - if (read_error || format_error) - return(READSTAT); - - rs_read_int(inf, &i); - - *rp = &rooms[i]; - - return(READSTAT); -} - -int -rs_write_monsters(FILE *savef, struct monster *m, int count) -{ - int n; - - if (write_error) - return(WRITESTAT); - - rs_write_marker(savef, RSID_MONSTERS); - rs_write_int(savef, count); - - for(n=0;ntype != AMULET ) - { - o->_o._o_type = item->type; - o->_o._o_launch = item->launch; - memcpy(o->_o._o_damage,item->damage,sizeof(item->damage)); - memcpy(o->_o._o_hurldmg,item->hurldmg,sizeof(item->hurldmg)); - o->_o._o_count = item->count; - o->_o._o_which = item->which; - o->_o._o_hplus = item->hplus; - o->_o._o_dplus = item->dplus; - o->_o._o_arm = item->arm; - o->_o._o_flags = item->flags; - o->_o._o_group = item->group; - o->o_flags |= ISKNOW; - o->o_flags &= ~ISFOUND; - switch ( item->type ) - { - case SCROLL: - if ( item->which < MAXSCROLLS ) - scr_info[item->which].oi_know = TRUE; - break; - case POTION: - if ( item->which < MAXPOTIONS ) - pot_info[item->which].oi_know = TRUE; - break; - case RING: - if ( item->which < MAXRINGS ) - ring_info[item->which].oi_know = TRUE; - break; - case STICK: - if ( item->which < MAXSTICKS ) - ws_info[item->which].oi_know = TRUE; - break; - // cur_armor and cur_weapon should be set - } - //char packitemstr[256]; - //strcpy(packitemstr,inv_name(o,FALSE)); - //fprintf(stderr,"packitem.(%s)\n",packitemstr); - } -} - -void rogue_packitemstr(char *packitemstr,struct rogue_packitem *item) -{ - static int32_t didinit; int32_t i; - if ( didinit == 0 ) - { - struct rogue_state R; char keystrokes[3]; - memset(&R,0,sizeof(R)); - keystrokes[0] = 'Q'; - keystrokes[1] = 'y'; - keystrokes[2] = 0; - R.keystrokes = keystrokes; - R.numkeys = 2; - rogueiterate(&R); - didinit = 1; - } - THING *obj = new_item(); - rogue_restoreobject(obj,item); - strcpy(packitemstr,inv_name(obj,FALSE)); - //fprintf(stderr,"packitem.(%s)\n",packitemstr); - free(obj); -} - -int32_t packsave(struct rogue_packitem *item,int32_t type,int32_t launch,char *damage,int32_t damagesize,char *hurldmg,int32_t hurlsize,int32_t count,int32_t which,int32_t hplus,int32_t dplus,int32_t arm,int32_t flags,int32_t group) -{ - if ( damagesize != 8 || hurlsize != 8 ) - { - fprintf(stderr,"unexpected damagesize.%d or hurlsize.%d != 8\n",damagesize,hurlsize); - return(-1); - } - item->type = type; - item->launch = launch; - memcpy(item->damage,damage,damagesize); - memcpy(item->hurldmg,hurldmg,hurlsize); - item->count = count; - item->which = which; - item->hplus = hplus; - item->dplus = dplus; - item->arm = arm; - item->flags = flags; - item->group = group; - return(0); -} - -int -rs_write_object(struct rogue_state *rs,FILE *savef, THING *o) -{ - struct rogue_packitem *item; - if (write_error) - return(WRITESTAT); - if ( thing_find(o) < 0 ) - { - fprintf(stderr,"cant find thing.%p (%s) in list\n",o,inv_name(o,FALSE)); //sleep(3); - return(0); - } - if ( o->_o._o_packch != 0 ) - { - item = &rs->P.roguepack[rs->P.packsize]; - if ( 1 && pstats.s_hpt <= 0 ) - { - //fprintf(stderr,"KILLED\n"); - rs->P.gold = -1; - rs->P.hitpoints = -1; - rs->P.strength = 0; - rs->P.level = -1; - rs->P.experience = -1; - rs->P.dungeonlevel = -1; - } - else - { - if ( rs->P.packsize == 0 ) - { - rs->P.gold = purse; - rs->P.hitpoints = max_hp; - rs->P.strength = (pstats.s_str & 0xffff) | (max_stats.s_str << 16); - rs->P.level = pstats.s_lvl; - rs->P.experience = pstats.s_exp; - rs->P.dungeonlevel = level; - rs->P.amulet = amulet; - //fprintf(stderr,"%ld gold.%d hp.%d strength.%d/%d level.%d exp.%d %d\n",ftell(savef),purse,max_hp,pstats.s_str,max_stats.s_str,pstats.s_lvl,pstats.s_exp,level); - } - //fprintf(stderr,"object (%s) x.%d y.%d type.%d pack.(%c:%d)\n",inv_name(o,FALSE),o->_o._o_pos.x,o->_o._o_pos.y,o->_o._o_type,o->_o._o_packch,o->_o._o_packch); - if ( rs->P.packsize < MAXPACK && o->o_type != AMULET ) - { - packsave(item,o->_o._o_type,o->_o._o_launch,o->_o._o_damage,sizeof(o->_o._o_damage),o->_o._o_hurldmg,sizeof(o->_o._o_hurldmg),o->_o._o_count,o->_o._o_which,o->_o._o_hplus,o->_o._o_dplus,o->_o._o_arm,o->_o._o_flags,o->_o._o_group); - rs->P.packsize++; - } - } - } - rs_write_marker(savef, RSID_OBJECT); - rs_write_int(savef, o->_o._o_type); - rs_write_coord(savef, o->_o._o_pos); - rs_write_int(savef, o->_o._o_launch); - rs_write_char(savef, o->_o._o_packch); - rs_write_chars(savef, o->_o._o_damage, sizeof(o->_o._o_damage)); - rs_write_chars(savef, o->_o._o_hurldmg, sizeof(o->_o._o_hurldmg)); - rs_write_int(savef, o->_o._o_count); - rs_write_int(savef, o->_o._o_which); - rs_write_int(savef, o->_o._o_hplus); - rs_write_int(savef, o->_o._o_dplus); - rs_write_int(savef, o->_o._o_arm); - rs_write_int(savef, o->_o._o_flags); - rs_write_int(savef, o->_o._o_group); - rs_write_string(savef, o->_o._o_label); - return(WRITESTAT); -} - -int -rs_read_object(FILE *inf, THING *o) -{ - if (read_error || format_error) - return(READSTAT); - - rs_read_marker(inf, RSID_OBJECT); - rs_read_int(inf, &o->_o._o_type); - rs_read_coord(inf, &o->_o._o_pos); - rs_read_int(inf, &o->_o._o_launch); - rs_read_char(inf, &o->_o._o_packch); - rs_read_chars(inf, o->_o._o_damage, sizeof(o->_o._o_damage)); - rs_read_chars(inf, o->_o._o_hurldmg, sizeof(o->_o._o_hurldmg)); - rs_read_int(inf, &o->_o._o_count); - rs_read_int(inf, &o->_o._o_which); - rs_read_int(inf, &o->_o._o_hplus); - rs_read_int(inf, &o->_o._o_dplus); - rs_read_int(inf, &o->_o._o_arm); - rs_read_int(inf, &o->_o._o_flags); - rs_read_int(inf, &o->_o._o_group); - rs_read_new_string(inf, &o->_o._o_label); - - return(READSTAT); -} - -int -rs_write_object_list(struct rogue_state *rs,FILE *savef, THING *l) -{ - if (write_error) - return(WRITESTAT); - //fprintf(stderr,"list %ld -> ",ftell(savef)); - - rs_write_marker(savef, RSID_OBJECTLIST); - rs_write_int(savef, list_size(l)); - - for( ;l != NULL; l = l->l_next) - rs_write_object(rs,savef, l); - //fprintf(stderr,"%ld\n",ftell(savef)); - - return(WRITESTAT); -} - -int -rs_read_object_list(FILE *inf, THING **list) -{ - int i, cnt; - THING *l = NULL, *previous = NULL, *head = NULL; - - if (read_error || format_error) - return(READSTAT); - - rs_read_marker(inf, RSID_OBJECTLIST); - rs_read_int(inf, &cnt); - - for (i = 0; i < cnt; i++) - { - l = new_item();//,sizeof(THING)); - - memset(l,0,sizeof(THING)); - - l->l_prev = previous; - - if (previous != NULL) - previous->l_next = l; - - rs_read_object(inf,l); - - if (previous == NULL) - head = l; - - previous = l; - } - - if (l != NULL) - l->l_next = NULL; - - *list = head; - - return(READSTAT); -} - -int -rs_write_object_reference(FILE *savef, THING *list, THING *item) -{ - int i; - - if (write_error) - return(WRITESTAT); - - i = find_list_ptr(list, item); - - rs_write_int(savef, i); - - return(WRITESTAT); -} - -int -rs_read_object_reference(FILE *inf, THING *list, THING **item) -{ - int i; - - if (read_error || format_error) - return(READSTAT); - - rs_read_int(inf, &i); - - *item = (THING *)get_list_item(list,i); - - return(READSTAT); -} - -int -find_room_coord(struct room *rmlist, coord *c, int n) -{ - int i = 0; - - for(i = 0; i < n; i++) - if(&rmlist[i].r_gold == c) - return(i); - - return(-1); -} - -int -find_thing_coord(THING *monlist, coord *c) -{ - THING *mitem; - THING *tp; - int i = 0; - - for(mitem = monlist; mitem != NULL; mitem = mitem->l_next) - { - tp = mitem; - - if (c == &tp->t_pos) - return(i); - - i++; - } - - return(-1); -} - -int -find_object_coord(THING *objlist, coord *c) -{ - THING *oitem; - THING *obj; - int i = 0; - - for(oitem = objlist; oitem != NULL; oitem = oitem->l_next) - { - obj = oitem; - - if (c == &obj->o_pos) - return(i); - - i++; - } - - return(-1); -} - -int -rs_write_thing(struct rogue_state *rs,FILE *savef, THING *t) -{ - int i = -1; - - if (write_error) - return(WRITESTAT); - //fprintf(stderr,"thing %ld -> ",ftell(savef)); - - rs_write_marker(savef, RSID_THING); - - if (t == NULL) - { - rs_write_int(savef, 0); - return(WRITESTAT); - } - - rs_write_int(savef, 1); - rs_write_coord(savef, t->_t._t_pos); - rs_write_boolean(savef, t->_t._t_turn); - rs_write_char(savef, t->_t._t_type); - rs_write_char(savef, t->_t._t_disguise); - rs_write_char(savef, t->_t._t_oldch); - - /* - t_dest can be: - 0,0: NULL - 0,1: location of hero - 1,i: location of a thing (monster) - 2,i: location of an object - 3,i: location of gold in a room - - We need to remember what we are chasing rather than - the current location of what we are chasing. - */ - - if (t->t_dest == &hero) - { - rs_write_int(savef,0); - rs_write_int(savef,1); - } - else if (t->t_dest != NULL) - { - i = find_thing_coord(mlist, t->t_dest); - - if (i >=0 ) - { - rs_write_int(savef,1); - rs_write_int(savef,i); - } - else - { - i = find_object_coord(lvl_obj, t->t_dest); - - if (i >= 0) - { - rs_write_int(savef,2); - rs_write_int(savef,i); - } - else - { - i = find_room_coord(rooms, t->t_dest, MAXROOMS); - - if (i >= 0) - { - rs_write_int(savef,3); - rs_write_int(savef,i); - } - else - { - rs_write_int(savef, 0); - rs_write_int(savef,1); /* chase the hero anyway */ - } - } - } - } - else - { - rs_write_int(savef,0); - rs_write_int(savef,0); - } - - rs_write_short(savef, t->_t._t_flags); - rs_write_stats(savef, &t->_t._t_stats); - rs_write_room_reference(savef, t->_t._t_room); - rs_write_object_list(rs,savef, t->_t._t_pack); - //fprintf(stderr,"%ld\n",ftell(savef)); - - return(WRITESTAT); -} - -int -rs_read_thing(FILE *inf, THING *t) -{ - int listid = 0, index = -1; - THING *item; - - if (read_error || format_error) - return(READSTAT); - - rs_read_marker(inf, RSID_THING); - - rs_read_int(inf, &index); - - if (index == 0) - return(READSTAT); - - rs_read_coord(inf,&t->_t._t_pos); - rs_read_boolean(inf,&t->_t._t_turn); - rs_read_char(inf,&t->_t._t_type); - rs_read_char(inf,&t->_t._t_disguise); - rs_read_char(inf,&t->_t._t_oldch); - - /* - t_dest can be (listid,index): - 0,0: NULL - 0,1: location of hero - 1,i: location of a thing (monster) - 2,i: location of an object - 3,i: location of gold in a room - - We need to remember what we are chasing rather than - the current location of what we are chasing. - */ - - rs_read_int(inf, &listid); - rs_read_int(inf, &index); - t->_t._t_reserved = -1; - - if (listid == 0) /* hero or NULL */ - { - if (index == 1) - t->_t._t_dest = &hero; - else - t->_t._t_dest = NULL; - } - else if (listid == 1) /* monster/thing */ - { - t->_t._t_dest = NULL; - t->_t._t_reserved = index; - } - else if (listid == 2) /* object */ - { - THING *obj; - - item = (THING *)get_list_item(lvl_obj, index); - - if (item != NULL) - { - obj = item; - t->_t._t_dest = &obj->o_pos; - } - } - else if (listid == 3) /* gold */ - { - t->_t._t_dest = &rooms[index].r_gold; - } - else - t->_t._t_dest = NULL; - - rs_read_short(inf,&t->_t._t_flags); - rs_read_stats(inf,&t->_t._t_stats); - rs_read_room_reference(inf, &t->_t._t_room); - rs_read_object_list(inf,&t->_t._t_pack); - - return(READSTAT); -} - -void -rs_fix_thing(THING *t) -{ - THING *item; - THING *tp; - - if (t->t_reserved < 0) - return; - - item = (THING *)get_list_item(mlist,t->t_reserved); - - if (item != NULL) - { - tp = item; - t->t_dest = &tp->t_pos; - } -} - -int -rs_write_thing_list(struct rogue_state *rs,FILE *savef, THING *l) -{ - int cnt = 0; - - if (write_error) - return(WRITESTAT); - - rs_write_marker(savef, RSID_MONSTERLIST); - - cnt = list_size(l); - - rs_write_int(savef, cnt); - - if (cnt < 1) - return(WRITESTAT); - - while (l != NULL) { - rs_write_thing(rs,savef, l); - l = l->l_next; - } - - return(WRITESTAT); -} - -int -rs_read_thing_list(FILE *inf, THING **list) -{ - int i, cnt; - THING *l = NULL, *previous = NULL, *head = NULL; - - if (read_error || format_error) - return(READSTAT); - - rs_read_marker(inf, RSID_MONSTERLIST); - - rs_read_int(inf, &cnt); - - for (i = 0; i < cnt; i++) - { - l = new_item(); - - l->l_prev = previous; - - if (previous != NULL) - previous->l_next = l; - - rs_read_thing(inf,l); - - if (previous == NULL) - head = l; - - previous = l; - } - - if (l != NULL) - l->l_next = NULL; - - *list = head; - - return(READSTAT); -} - -void -rs_fix_thing_list(THING *list) -{ - THING *item; - - for(item = list; item != NULL; item = item->l_next) - rs_fix_thing(item); -} - -int -rs_write_thing_reference(FILE *savef, THING *list, THING *item) -{ - int i; - - if (write_error) - return(WRITESTAT); - - if (item == NULL) - rs_write_int(savef,-1); - else - { - i = find_list_ptr(list, item); - - rs_write_int(savef, i); - } - - return(WRITESTAT); -} - -int -rs_read_thing_reference(FILE *inf, THING *list, THING **item) -{ - int i; - - if (read_error || format_error) - return(READSTAT); - - rs_read_int(inf, &i); - - if (i == -1) - *item = NULL; - else - *item = (THING *)get_list_item(list,i); - - return(READSTAT); -} - -int -rs_write_thing_references(FILE *savef, THING *list, THING *items[], int count) -{ - int i; - - if (write_error) - return(WRITESTAT); - - for(i = 0; i < count; i++) - rs_write_thing_reference(savef,list,items[i]); - - return(WRITESTAT); -} - -int -rs_read_thing_references(FILE *inf, THING *list, THING *items[], int count) -{ - int i; - - if (read_error || format_error) - return(READSTAT); - - for(i = 0; i < count; i++) - rs_read_thing_reference(inf,list,&items[i]); - - return(WRITESTAT); -} - -int -rs_write_places(FILE *savef, PLACE *places, int count) -{ - int i = 0; - //fprintf(stderr,"places %ld -> ",ftell(savef)); - - if (write_error) - return(WRITESTAT); - - for(i = 0; i < count; i++) - { - rs_write_char(savef, places[i].p_ch); - rs_write_char(savef, places[i].p_flags); - rs_write_thing_reference(savef, mlist, places[i].p_monst); - } - //fprintf(stderr,"%ld\n",ftell(savef)); - - return(WRITESTAT); -} - -int -rs_read_places(FILE *inf, PLACE *places, int count) -{ - int i = 0; - - if (read_error || format_error) - return(READSTAT); - - for(i = 0; i < count; i++) - { - rs_read_char(inf,&places[i].p_ch); - rs_read_char(inf,&places[i].p_flags); - rs_read_thing_reference(inf, mlist, &places[i].p_monst); - } - - return(READSTAT); -} - -int -rs_save_file(struct rogue_state *rs,FILE *savef) -{ - if (write_error) - { - fprintf(stderr,"write error\n"); - return(WRITESTAT); - } - - rs_write_boolean(savef, after); /* 1 */ /* extern.c */ - rs_write_boolean(savef, again); /* 2 */ - rs_write_int(savef, noscore); /* 3 */ - rs_write_boolean(savef, seenstairs); /* 4 */ - rs_write_boolean(savef, amulet); /* 5 */ - rs_write_boolean(savef, door_stop); /* 6 */ - rs_write_boolean(savef, fight_flush); /* 7 */ - rs_write_boolean(savef, firstmove); /* 8 */ - rs_write_boolean(savef, got_ltc); /* 9 */ - rs_write_boolean(savef, has_hit); /* 10 */ - rs_write_boolean(savef, in_shell); /* 11 */ - rs_write_boolean(savef, inv_describe); /* 12 */ - rs_write_boolean(savef, jump); /* 13 */ - rs_write_boolean(savef, kamikaze); /* 14 */ - rs_write_boolean(savef, lower_msg); /* 15 */ - rs_write_boolean(savef, move_on); /* 16 */ - rs_write_boolean(savef, msg_esc); /* 17 */ - rs_write_boolean(savef, passgo); /* 18 */ - rs_write_boolean(savef, playing); /* 19 */ - rs_write_boolean(savef, q_comm); /* 20 */ - rs_write_boolean(savef, running); /* 21 */ - rs_write_boolean(savef, save_msg); /* 22 */ - rs_write_boolean(savef, see_floor); /* 23 */ - rs_write_boolean(savef, stat_msg); /* 24 */ - rs_write_boolean(savef, terse); /* 25 */ - rs_write_boolean(savef, to_death); /* 26 */ - rs_write_boolean(savef, tombstone); /* 27 */ -#ifdef MASTER - rs_write_int(savef, wizard); /* 28 */ -#else - rs_write_int(savef, 0); /* 28 */ -#endif - rs_write_booleans(savef, pack_used, 26); /* 29 */ - rs_write_char(savef, dir_ch); - //rs_write_chars(savef, file_name, MAXSTR); - //rs_write_chars(savef, huh, MAXSTR); - rs_write_potions(savef); - //rs_write_chars(savef,prbuf,2*MAXSTR); - rs_write_rings(savef); - rs_write_string(savef,release); - rs_write_char(savef, runch); - rs_write_scrolls(savef); - rs_write_char(savef, take); - //rs_write_chars(savef, whoami, MAXSTR); - rs_write_sticks(savef); - rs_write_int(savef,orig_dsusp); - rs_write_chars(savef, fruit, MAXSTR); - //rs_write_chars(savef, home, MAXSTR); - rs_write_strings(savef,(char **)inv_t_name,3); - rs_write_char(savef,l_last_comm); - rs_write_char(savef,l_last_dir); - rs_write_char(savef,last_comm); - rs_write_char(savef,last_dir); - rs_write_strings(savef,(char **)tr_name,8); - rs_write_int(savef,n_objs); - rs_write_int(savef, ntraps); - rs_write_int(savef, hungry_state); - rs_write_int(savef, inpack); - rs_write_int(savef, inv_type); - rs_write_int(savef, level); - rs_write_int(savef, max_level); - rs_write_int(savef, mpos); - rs_write_int(savef, no_food); - rs_write_ints(savef,(int32_t *)a_class,MAXARMORS); - rs_write_int(savef, count); - rs_write_int(savef, food_left); - rs_write_int(savef, lastscore); - rs_write_int(savef, no_command); - rs_write_int(savef, no_move); - rs_write_int(savef, purse); - rs_write_int(savef, quiet); - rs_write_int(savef, vf_hit); - //rs_write_int(savef, dnum); - rs_write_int(savef, (int32_t)(seed&0xffffffff)); - rs_write_int(savef, (int32_t)((seed>>32)&0xffffffff)); - rs_write_ints(savef, (int32_t *)e_levels, 21); - rs_write_coord(savef, delta); - rs_write_coord(savef, oldpos); - rs_write_coord(savef, stairs); - rs_write_thing(rs,savef, &player); - rs_write_object_reference(savef, player.t_pack, cur_armor); - rs_write_object_reference(savef, player.t_pack, cur_ring[0]); - rs_write_object_reference(savef, player.t_pack, cur_ring[1]); - rs_write_object_reference(savef, player.t_pack, cur_weapon); - rs_write_object_reference(savef, player.t_pack, l_last_pick); - rs_write_object_reference(savef, player.t_pack, last_pick); - - rs_write_object_list(rs,savef, lvl_obj); - rs_write_thing_list(rs,savef, mlist); - - rs_write_places(savef,places,MAXLINES*MAXCOLS); - - rs_write_stats(savef,&max_stats); - rs_write_rooms(savef, rooms, MAXROOMS); - rs_write_room_reference(savef, oldrp); - rs_write_rooms(savef, passages, MAXPASS); - - rs_write_monsters(savef,monsters,26); - rs_write_obj_info(savef, things, NUMTHINGS); - rs_write_obj_info(savef, arm_info, MAXARMORS); - rs_write_obj_info(savef, pot_info, MAXPOTIONS); - rs_write_obj_info(savef, ring_info, MAXRINGS); - rs_write_obj_info(savef, scr_info, MAXSCROLLS); - rs_write_obj_info(savef, weap_info, MAXWEAPONS+1); - rs_write_obj_info(savef, ws_info, MAXSTICKS); - - - rs_write_daemons(savef, &d_list[0], 20); /* 5.4-daemon.c */ -#ifdef MASTER - rs_write_int(savef,total); /* 5.4-list.c */ -#else - rs_write_int(savef, 0); -#endif - rs_write_int(savef,between); /* 5.4-daemons.c*/ - rs_write_coord(savef, nh); /* 5.4-move.c */ - rs_write_int(savef, group); /* 5.4-weapons.c */ - //fprintf(stderr,"fifth %ld\n",ftell(savef)); - - rs_write_window(savef,stdscr); - //fprintf(stderr,"done %ld\n",ftell(savef)); - - return(WRITESTAT); -} - -int -rs_restore_file(FILE *inf) -{ - int dummyint; - - if (read_error || format_error) - return(READSTAT); - - rs_read_boolean(inf, &after); /* 1 */ /* extern.c */ - rs_read_boolean(inf, &again); /* 2 */ - rs_read_int(inf, &noscore); /* 3 */ - rs_read_boolean(inf, &seenstairs); /* 4 */ - rs_read_boolean(inf, &amulet); /* 5 */ - rs_read_boolean(inf, &door_stop); /* 6 */ - rs_read_boolean(inf, &fight_flush); /* 7 */ - rs_read_boolean(inf, &firstmove); /* 8 */ - rs_read_boolean(inf, &got_ltc); /* 9 */ - rs_read_boolean(inf, &has_hit); /* 10 */ - rs_read_boolean(inf, &in_shell); /* 11 */ - rs_read_boolean(inf, &inv_describe); /* 12 */ - rs_read_boolean(inf, &jump); /* 13 */ - rs_read_boolean(inf, &kamikaze); /* 14 */ - rs_read_boolean(inf, &lower_msg); /* 15 */ - rs_read_boolean(inf, &move_on); /* 16 */ - rs_read_boolean(inf, &msg_esc); /* 17 */ - rs_read_boolean(inf, &passgo); /* 18 */ - rs_read_boolean(inf, &playing); /* 19 */ - rs_read_boolean(inf, &q_comm); /* 20 */ - rs_read_boolean(inf, &running); /* 21 */ - rs_read_boolean(inf, &save_msg); /* 22 */ - rs_read_boolean(inf, &see_floor); /* 23 */ - rs_read_boolean(inf, &stat_msg); /* 24 */ - rs_read_boolean(inf, &terse); /* 25 */ - rs_read_boolean(inf, &to_death); /* 26 */ - rs_read_boolean(inf, &tombstone); /* 27 */ -#ifdef MASTER - rs_read_int(inf, &wizard); /* 28 */ -#else - rs_read_int(inf, &dummyint); /* 28 */ -#endif - rs_read_booleans(inf, pack_used, 26); /* 29 */ - rs_read_char(inf, &dir_ch); - //rs_read_chars(inf, file_name, MAXSTR); - //rs_read_chars(inf, huh, MAXSTR); - rs_read_potions(inf); - //rs_read_chars(inf, prbuf, 2*MAXSTR); - rs_read_rings(inf); - rs_read_new_string(inf,&release); - rs_read_char(inf, &runch); - rs_read_scrolls(inf); - rs_read_char(inf, &take); - //rs_read_chars(inf, whoami, MAXSTR); - rs_read_sticks(inf); - rs_read_int(inf,&orig_dsusp); - rs_read_chars(inf, fruit, MAXSTR); - //rs_read_chars(inf, home, MAXSTR); - rs_read_new_strings(inf,(char **)inv_t_name,3); - rs_read_char(inf, &l_last_comm); - rs_read_char(inf, &l_last_dir); - rs_read_char(inf, &last_comm); - rs_read_char(inf, &last_dir); - rs_read_new_strings(inf,(char **)tr_name,8); - rs_read_int(inf, &n_objs); - rs_read_int(inf, &ntraps); - rs_read_int(inf, &hungry_state); - rs_read_int(inf, &inpack); - rs_read_int(inf, &inv_type); - rs_read_int(inf, &level); - rs_read_int(inf, &max_level); - rs_read_int(inf, &mpos); - rs_read_int(inf, &no_food); - rs_read_ints(inf,(int32_t *)a_class,MAXARMORS); - rs_read_int(inf, &count); - rs_read_int(inf, &food_left); - rs_read_int(inf, &lastscore); - rs_read_int(inf, &no_command); - rs_read_int(inf, &no_move); - rs_read_int(inf, &purse); - rs_read_int(inf, &quiet); - rs_read_int(inf, &vf_hit); - //rs_read_int(inf, &dnum); - int32_t lownum,highnum; - rs_read_int(inf, &lownum); - rs_read_int(inf, &highnum); - seed = ((uint64_t)highnum<<32) | (lownum&0xffffffff); - rs_read_ints(inf,(int32_t *)e_levels,21); - rs_read_coord(inf, &delta); - rs_read_coord(inf, &oldpos); - rs_read_coord(inf, &stairs); - - rs_read_thing(inf, &player); - rs_read_object_reference(inf, player.t_pack, &cur_armor); - rs_read_object_reference(inf, player.t_pack, &cur_ring[0]); - rs_read_object_reference(inf, player.t_pack, &cur_ring[1]); - rs_read_object_reference(inf, player.t_pack, &cur_weapon); - rs_read_object_reference(inf, player.t_pack, &l_last_pick); - rs_read_object_reference(inf, player.t_pack, &last_pick); - - rs_read_object_list(inf, &lvl_obj); - rs_read_thing_list(inf, &mlist); - rs_fix_thing(&player); - rs_fix_thing_list(mlist); - - rs_read_places(inf,places,MAXLINES*MAXCOLS); - - rs_read_stats(inf, &max_stats); - rs_read_rooms(inf, rooms, MAXROOMS); - rs_read_room_reference(inf, &oldrp); - rs_read_rooms(inf, passages, MAXPASS); - - rs_read_monsters(inf,monsters,26); - rs_read_obj_info(inf, things, NUMTHINGS); - rs_read_obj_info(inf, arm_info, MAXARMORS); - rs_read_obj_info(inf, pot_info, MAXPOTIONS); - rs_read_obj_info(inf, ring_info, MAXRINGS); - rs_read_obj_info(inf, scr_info, MAXSCROLLS); - rs_read_obj_info(inf, weap_info, MAXWEAPONS+1); - rs_read_obj_info(inf, ws_info, MAXSTICKS); - - rs_read_daemons(inf, d_list, 20); /* 5.4-daemon.c */ - rs_read_int(inf,&dummyint); /* total */ /* 5.4-list.c */ - rs_read_int(inf,&between); /* 5.4-daemons.c */ - rs_read_coord(inf, &nh); /* 5.4-move.c */ - rs_read_int(inf,&group); /* 5.4-weapons.c */ - - rs_read_window(inf,stdscr); - - return(READSTAT); -} diff --git a/src/cc/rogue/sticks.c b/src/cc/rogue/sticks.c deleted file mode 100644 index 254f0c404..000000000 --- a/src/cc/rogue/sticks.c +++ /dev/null @@ -1,435 +0,0 @@ -// Copyright (c) 2016-2023 The Hush developers -// Distributed under the GPLv3 software license, see the accompanying -// file COPYING or https://www.gnu.org/licenses/gpl-3.0.en.html -/* - * Functions to implement the various sticks one might find - * while wandering around the dungeon. - * - * @(#)sticks.c 4.39 (Berkeley) 02/05/99 - * - * Rogue: Exploring the Dungeons of Doom - * Copyright (C) 1980-1983, 1985, 1999 Michael Toy, Ken Arnold and Glenn Wichman - * All rights reserved. - * - * See the file LICENSE.TXT for full copyright and licensing information. - */ - -//#include -//#include -//#include -#include "rogue.h" - -/* - * fix_stick: - * Set up a new stick - */ - -void -fix_stick(THING *cur) -{ - if (strcmp(ws_type[cur->o_which], "staff") == 0) - strncpy(cur->o_damage,"2x3",sizeof(cur->o_damage)); - else - strncpy(cur->o_damage,"1x1",sizeof(cur->o_damage)); - strncpy(cur->o_hurldmg,"1x1",sizeof(cur->o_hurldmg)); - - switch (cur->o_which) - { - case WS_LIGHT: - cur->o_charges = rnd(10) + 10; - otherwise: - cur->o_charges = rnd(5) + 3; - } -} - -/* - * do_zap: - * Perform a zap with a wand - */ - -void -do_zap(struct rogue_state *rs) -{ - THING *obj, *tp; - int y, x; - char *name; - char monster, oldch; - static THING bolt; - - if ((obj = get_item(rs,"zap with", STICK)) == NULL) - return; - if (obj->o_type != STICK) - { - after = FALSE; - msg(rs,"you can't zap with that!"); - return; - } - if (obj->o_charges == 0) - { - msg(rs,"nothing happens"); - return; - } - switch (obj->o_which) - { - case WS_LIGHT: - /* - * Reddy Kilowat wand. Light up the room - */ - ws_info[WS_LIGHT].oi_know = TRUE; - if (proom->r_flags & ISGONE) - msg(rs,"the corridor glows and then fades"); - else - { - proom->r_flags &= ~ISDARK; - /* - * Light the room and put the player back up - */ - enter_room(rs,&hero); - addmsg(rs,"the room is lit"); - if (!terse) - addmsg(rs," by a shimmering %s light", pick_color("blue")); - endmsg(rs); - } - when WS_DRAIN: - /* - * take away 1/2 of hero's hit points, then take it away - * evenly from the monsters in the room (or next to hero - * if he is in a passage) - */ - if (pstats.s_hpt < 2) - { - msg(rs,"you are too weak to use it"); - return; - } - else - drain(rs); - when WS_INVIS: - case WS_POLYMORPH: - case WS_TELAWAY: - case WS_TELTO: - case WS_CANCEL: - y = hero.y; - x = hero.x; - while (step_ok(winat(y, x))) - { - y += delta.y; - x += delta.x; - } - if ((tp = moat(y, x)) != NULL) - { - monster = tp->t_type; - if (monster == 'F') - player.t_flags &= ~ISHELD; - switch (obj->o_which) { - case WS_INVIS: - tp->t_flags |= ISINVIS; - if (cansee(rs,y, x)) - mvaddch(y, x, tp->t_oldch); - break; - case WS_POLYMORPH: - { - THING *pp; - - pp = tp->t_pack; - detach(mlist, tp); - if (see_monst(tp)) - mvaddch(y, x, chat(y, x)); - oldch = tp->t_oldch; - delta.y = y; - delta.x = x; - new_monster(rs,tp, monster = (char)(rnd(26) + 'A'), &delta); - if (see_monst(tp)) - mvaddch(y, x, monster); - tp->t_oldch = oldch; - tp->t_pack = pp; - ws_info[WS_POLYMORPH].oi_know |= see_monst(tp); - break; - } - case WS_CANCEL: - tp->t_flags |= ISCANC; - tp->t_flags &= ~(ISINVIS|CANHUH); - tp->t_disguise = tp->t_type; - if (see_monst(tp)) - mvaddch(y, x, tp->t_disguise); - break; - case WS_TELAWAY: - case WS_TELTO: - { - coord new_pos; - - if (obj->o_which == WS_TELAWAY) - { - do - { - find_floor(rs,NULL, &new_pos, FALSE, TRUE); - } while (ce(new_pos, hero)); - } - else - { - new_pos.y = hero.y + delta.y; - new_pos.x = hero.x + delta.x; - } - tp->t_dest = &hero; - tp->t_flags |= ISRUN; - relocate(rs,tp, &new_pos); - } - } - } - when WS_MISSILE: - ws_info[WS_MISSILE].oi_know = TRUE; - bolt.o_type = '*'; - strncpy(bolt.o_hurldmg,"1x4",sizeof(bolt.o_hurldmg)); - bolt.o_hplus = 100; - bolt.o_dplus = 1; - bolt.o_flags = ISMISL; - if (cur_weapon != NULL) - bolt.o_launch = cur_weapon->o_which; - do_motion(rs,&bolt, delta.y, delta.x); - if ((tp = moat(bolt.o_pos.y, bolt.o_pos.x)) != NULL - && !save_throw(VS_MAGIC, tp)) - hit_monster(rs,unc(bolt.o_pos), &bolt); - else if (terse) - msg(rs,"missle vanishes"); - else - msg(rs,"the missle vanishes with a puff of smoke"); - when WS_HASTE_M: - case WS_SLOW_M: - y = hero.y; - x = hero.x; - while (step_ok(winat(y, x))) - { - y += delta.y; - x += delta.x; - } - if ((tp = moat(y, x)) != NULL) - { - if (obj->o_which == WS_HASTE_M) - { - if (on(*tp, ISSLOW)) - tp->t_flags &= ~ISSLOW; - else - tp->t_flags |= ISHASTE; - } - else - { - if (on(*tp, ISHASTE)) - tp->t_flags &= ~ISHASTE; - else - tp->t_flags |= ISSLOW; - tp->t_turn = TRUE; - } - delta.y = y; - delta.x = x; - runto(rs,&delta); - } - when WS_ELECT: - case WS_FIRE: - case WS_COLD: - if (obj->o_which == WS_ELECT) - name = "bolt"; - else if (obj->o_which == WS_FIRE) - name = "flame"; - else - name = "ice"; - fire_bolt(rs,&hero, &delta, name); - ws_info[obj->o_which].oi_know = TRUE; - when WS_NOP: - break; -#ifdef MASTER - otherwise: - msg(rs,"what a bizarre schtick!"); -#endif - } - obj->o_charges--; -} - -/* - * drain: - * Do drain hit points from player shtick - */ - -void -drain(struct rogue_state *rs) -{ - THING *mp; - struct room *corp; - THING **dp; - int cnt; - bool inpass; - static THING *drainee[40]; - - /* - * First cnt how many things we need to spread the hit points among - */ - cnt = 0; - if (chat(hero.y, hero.x) == DOOR) - corp = &passages[flat(hero.y, hero.x) & F_PNUM]; - else - corp = NULL; - inpass = (bool)(proom->r_flags & ISGONE); - dp = drainee; - for (mp = mlist; mp != NULL; mp = next(mp)) - if (mp->t_room == proom || mp->t_room == corp || - (inpass && chat(mp->t_pos.y, mp->t_pos.x) == DOOR && - &passages[flat(mp->t_pos.y, mp->t_pos.x) & F_PNUM] == proom)) - *dp++ = mp; - if ((cnt = (int)(dp - drainee)) == 0) - { - msg(rs,"you have a tingling feeling"); - return; - } - *dp = NULL; - pstats.s_hpt /= 2; - cnt = pstats.s_hpt / cnt; - /* - * Now zot all of the monsters - */ - for (dp = drainee; *dp; dp++) - { - mp = *dp; - if ((mp->t_stats.s_hpt -= cnt) <= 0) - killed(rs,mp, see_monst(mp)); - else - runto(rs,&mp->t_pos); - } -} - -/* - * fire_bolt: - * Fire a bolt in a given direction from a specific starting place - */ - -void -fire_bolt(struct rogue_state *rs,coord *start, coord *dir, char *name) -{ - coord *c1, *c2; - THING *tp; - char dirch = 0, ch; - bool hit_hero, used, changed; - static coord pos; - static coord spotpos[BOLT_LENGTH]; - THING bolt; - - bolt.o_type = WEAPON; - bolt.o_which = FLAME; - strncpy(bolt.o_hurldmg,"6x6",sizeof(bolt.o_hurldmg)); - bolt.o_hplus = 100; - bolt.o_dplus = 0; - weap_info[FLAME].oi_name = name; - switch (dir->y + dir->x) - { - case 0: dirch = '/'; - when 1: case -1: dirch = (dir->y == 0 ? '-' : '|'); - when 2: case -2: dirch = '\\'; - } - pos = *start; - hit_hero = (bool)(start != &hero); - used = FALSE; - changed = FALSE; - for (c1 = spotpos; c1 <= &spotpos[BOLT_LENGTH-1] && !used; c1++) - { - pos.y += dir->y; - pos.x += dir->x; - *c1 = pos; - ch = winat(pos.y, pos.x); - switch (ch) - { - case DOOR: - /* - * this code is necessary if the hero is on a door - * and he fires at the wall the door is in, it would - * otherwise loop infinitely - */ - if (ce(hero, pos)) - goto def; - /* FALLTHROUGH */ - case '|': - case '-': - case ' ': - if (!changed) - hit_hero = !hit_hero; - changed = FALSE; - dir->y = -dir->y; - dir->x = -dir->x; - c1--; - msg(rs,"the %s bounces", name); - break; - default: -def: - if (!hit_hero && (tp = moat(pos.y, pos.x)) != NULL) - { - hit_hero = TRUE; - changed = !changed; - tp->t_oldch = chat(pos.y, pos.x); - if (!save_throw(VS_MAGIC, tp)) - { - bolt.o_pos = pos; - used = TRUE; - if (tp->t_type == 'D' && strcmp(name, "flame") == 0) - { - addmsg(rs,"the flame bounces"); - if (!terse) - addmsg(rs," off the dragon"); - endmsg(rs); - } - else - hit_monster(rs,unc(pos), &bolt); - } - else if (ch != 'M' || tp->t_disguise == 'M') - { - if (start == &hero) - runto(rs,&pos); - if (terse) - msg(rs,"%s misses", name); - else - msg(rs,"the %s whizzes past %s", name, set_mname(tp)); - } - } - else if (hit_hero && ce(pos, hero)) - { - hit_hero = FALSE; - changed = !changed; - if (!save(VS_MAGIC)) - { - if ((pstats.s_hpt -= roll(6, 6)) <= 0) - { - if (start == &hero) - death(rs,'b'); - else - death(rs,moat(start->y, start->x)->t_type); - } - used = TRUE; - if (terse) - msg(rs,"the %s hits", name); - else - msg(rs,"you are hit by the %s", name); - } - else - msg(rs,"the %s whizzes by you", name); - } - mvaddch(pos.y, pos.x, dirch); - if ( rs->sleeptime != 0 ) - refresh(); - } - } - for (c2 = spotpos; c2 < c1; c2++) - mvaddch(c2->y, c2->x, chat(c2->y, c2->x)); -} - -/* - * charge_str: - * Return an appropriate string for a wand charge - */ -char * -charge_str(THING *obj) -{ - static char buf[20]; - - if (!(obj->o_flags & ISKNOW)) - buf[0] = '\0'; - else if (terse) - sprintf(buf, " [%d]", obj->o_charges); - else - sprintf(buf, " [%d charges]", obj->o_charges); - return buf; -} diff --git a/src/cc/rogue/things.c b/src/cc/rogue/things.c deleted file mode 100644 index 166eb32d2..000000000 --- a/src/cc/rogue/things.c +++ /dev/null @@ -1,741 +0,0 @@ -// Copyright (c) 2016-2023 The Hush developers -// Distributed under the GPLv3 software license, see the accompanying -// file COPYING or https://www.gnu.org/licenses/gpl-3.0.en.html -/* - * Contains functions for dealing with things like potions, scrolls, - * and other items. - * - * @(#)things.c 4.53 (Berkeley) 02/05/99 - * - * Rogue: Exploring the Dungeons of Doom - * Copyright (C) 1980-1983, 1985, 1999 Michael Toy, Ken Arnold and Glenn Wichman - * All rights reserved. - * - * See the file LICENSE.TXT for full copyright and licensing information. - */ - -//#include -//#include -//#include -#include "rogue.h" - -/* - * inv_name: - * Return the name of something as it would appear in an - * inventory. - */ -char * -inv_name(THING *obj, bool drop) -{ - char *pb; - struct obj_info *op; - char *sp; - int which; - - pb = prbuf; - which = obj->o_which; - switch (obj->o_type) - { - case POTION: - nameit(obj, "potion", p_colors[which], &pot_info[which], nullstr); - when RING: - nameit(obj, "ring", r_stones[which], &ring_info[which], ring_num); - when STICK: - nameit(obj, ws_type[which], ws_made[which], &ws_info[which], charge_str); - when SCROLL: - if (obj->o_count == 1) - { - strcpy(pb, "A scroll "); - pb = &prbuf[9]; - } - else - { - sprintf(pb, "%d scrolls ", obj->o_count); - pb = &prbuf[strlen(prbuf)]; - } - op = &scr_info[which]; - if (op->oi_know) - sprintf(pb, "of %s", op->oi_name); - else if (op->oi_guess) - sprintf(pb, "called %s", op->oi_guess); - else - sprintf(pb, "titled '%s'", s_names[which]); - when FOOD: - if (which == 1) - if (obj->o_count == 1) - sprintf(pb, "A%s %s", vowelstr(fruit), fruit); - else - sprintf(pb, "%d %ss", obj->o_count, fruit); - else - if (obj->o_count == 1) - strcpy(pb, "Some food"); - else - sprintf(pb, "%d rations of food", obj->o_count); - when WEAPON: - sp = weap_info[which].oi_name; - if (obj->o_count > 1) - sprintf(pb, "%d ", obj->o_count); - else - sprintf(pb, "A%s ", vowelstr(sp)); - pb = &prbuf[strlen(prbuf)]; - if (obj->o_flags & ISKNOW) - sprintf(pb, "%s %s", num(obj->o_hplus,obj->o_dplus,WEAPON), sp); - else - sprintf(pb, "%s", sp); - if (obj->o_count > 1) - strcat(pb, "s"); - if (obj->o_label != NULL) - { - pb = &prbuf[strlen(prbuf)]; - sprintf(pb, " called %s", obj->o_label); - } - when ARMOR: - sp = arm_info[which].oi_name; - if (obj->o_flags & ISKNOW) - { - sprintf(pb, "%s %s [", - num(a_class[which] - obj->o_arm, 0, ARMOR), sp); - if (!terse) - strcat(pb, "protection "); - pb = &prbuf[strlen(prbuf)]; - sprintf(pb, "%d]", 10 - obj->o_arm); - } - else - sprintf(pb, "%s", sp); - if (obj->o_label != NULL) - { - pb = &prbuf[strlen(prbuf)]; - sprintf(pb, " called %s", obj->o_label); - } - when AMULET: - strcpy(pb, "The Amulet of Yendor"); - when GOLD: - sprintf(prbuf, "%d Gold pieces", obj->o_goldval); -#ifdef MASTER - otherwise: - debug("Picked up something funny %s", unctrl(obj->o_type)); - sprintf(pb, "Something bizarre %s", unctrl(obj->o_type)); -#endif - } - if (inv_describe) - { - if (obj == cur_armor) - strcat(pb, " (being worn)"); - if (obj == cur_weapon) - strcat(pb, " (weapon in hand)"); - if (obj == cur_ring[LEFT]) - strcat(pb, " (on left hand)"); - else if (obj == cur_ring[RIGHT]) - strcat(pb, " (on right hand)"); - } - if (drop && isupper(prbuf[0])) - prbuf[0] = (char) tolower(prbuf[0]); - else if (!drop && islower(*prbuf)) - *prbuf = (char) toupper(*prbuf); - prbuf[MAXSTR-1] = '\0'; - return prbuf; -} - -/* - * drop: - * Put something down - */ - -void -drop(struct rogue_state *rs) -{ - char ch; - THING *obj; - - ch = chat(hero.y, hero.x); - if (ch != FLOOR && ch != PASSAGE) - { - after = FALSE; - msg(rs,"there is something there already"); - return; - } - if ((obj = get_item(rs,"drop", 0)) == NULL) - return; - if (!dropcheck(rs,obj)) - return; - obj = leave_pack(rs,obj, TRUE, (bool)!ISMULT(obj->o_type)); - /* - * Link it into the level object list - */ - attach(lvl_obj, obj); - chat(hero.y, hero.x) = (char) obj->o_type; - flat(hero.y, hero.x) |= F_DROPPED; - obj->o_pos = hero; - if (obj->o_type == AMULET) - amulet = FALSE; - msg(rs,"dropped %s", inv_name(obj, TRUE)); -} - -/* - * dropcheck: - * Do special checks for dropping or unweilding|unwearing|unringing - */ -bool -dropcheck(struct rogue_state *rs,THING *obj) -{ - if (obj == NULL) - return TRUE; - if (obj != cur_armor && obj != cur_weapon - && obj != cur_ring[LEFT] && obj != cur_ring[RIGHT]) - return TRUE; - if (obj->o_flags & ISCURSED) - { - msg(rs,"you can't. It appears to be cursed"); - return FALSE; - } - if (obj == cur_weapon) - cur_weapon = NULL; - else if (obj == cur_armor) - { - waste_time(rs); - cur_armor = NULL; - } - else - { - cur_ring[obj == cur_ring[LEFT] ? LEFT : RIGHT] = NULL; - switch (obj->o_which) - { - case R_ADDSTR: - chg_str(-obj->o_arm); - break; - case R_SEEINVIS: - unsee(rs,0); - extinguish(unsee); - break; - } - } - return TRUE; -} - -/* - * new_thing: - * Return a new thing - */ -THING * -new_thing(struct rogue_state *rs) -{ - THING *cur; - int r; - - cur = new_item(); - // 7th new_thing orphaned fprintf(stderr,"new_thing.%p\n",cur); - cur->o_hplus = 0; - cur->o_dplus = 0; - strncpy(cur->o_damage, "0x0", sizeof(cur->o_damage)); - strncpy(cur->o_hurldmg, "0x0", sizeof(cur->o_hurldmg)); - cur->o_arm = 11; - cur->o_count = 1; - cur->o_group = 0; - cur->o_flags = 0; - /* - * Decide what kind of object it will be - * If we haven't had food for a while, let it be food. - */ - switch (no_food > 3 ? 2 : pick_one(rs,things, NUMTHINGS)) - { - case 0: - cur->o_type = POTION; - cur->o_which = pick_one(rs,pot_info, MAXPOTIONS); - when 1: - cur->o_type = SCROLL; - cur->o_which = pick_one(rs,scr_info, MAXSCROLLS); - when 2: - cur->o_type = FOOD; - no_food = 0; - if (rnd(10) != 0) - cur->o_which = 0; - else - cur->o_which = 1; - when 3: - init_weapon(cur, pick_one(rs,weap_info, MAXWEAPONS)); - if ((r = rnd(100)) < 10) - { - cur->o_flags |= ISCURSED; - cur->o_hplus -= rnd(3) + 1; - } - else if (r < 15) - cur->o_hplus += rnd(3) + 1; - when 4: - cur->o_type = ARMOR; - cur->o_which = pick_one(rs,arm_info, MAXARMORS); - cur->o_arm = a_class[cur->o_which]; - if ((r = rnd(100)) < 20) - { - cur->o_flags |= ISCURSED; - cur->o_arm += rnd(3) + 1; - } - else if (r < 28) - cur->o_arm -= rnd(3) + 1; - when 5: - cur->o_type = RING; - cur->o_which = pick_one(rs,ring_info, MAXRINGS); - switch (cur->o_which) - { - case R_ADDSTR: - case R_PROTECT: - case R_ADDHIT: - case R_ADDDAM: - if ((cur->o_arm = rnd(3)) == 0) - { - cur->o_arm = -1; - cur->o_flags |= ISCURSED; - } - when R_AGGR: - case R_TELEPORT: - cur->o_flags |= ISCURSED; - } - when 6: - cur->o_type = STICK; - cur->o_which = pick_one(rs,ws_info, MAXSTICKS); - fix_stick(cur); -#ifdef MASTER - otherwise: - debug("Picked a bad kind of object"); - wait_for(rs,' '); -#endif - } - return cur; -} - -/* - * pick_one: - * Pick an item out of a list of nitems possible objects - */ -int -pick_one(struct rogue_state *rs,struct obj_info *info, int nitems) -{ - struct obj_info *end; - struct obj_info *start; - int i; - - start = info; - for (end = &info[nitems], i = rnd(100); info < end; info++) - if (i < info->oi_prob) - break; - if (info == end) - { -#ifdef MASTER - if (wizard) - { - msg(rs,"bad pick_one: %d from %d items", i, nitems); - for (info = start; info < end; info++) - msg(rs,"%s: %d%%", info->oi_name, info->oi_prob); - } -#endif - info = start; - } - return (int)(info - start); -} - -/* - * discovered: - * list what the player has discovered in this game of a certain type - */ -static int line_cnt = 0; - -static bool newpage = FALSE; - -static char *lastfmt, *lastarg; - - -void -discovered(struct rogue_state *rs) -{ - char ch; - bool disc_list; - - do { - disc_list = FALSE; - if (!terse) - addmsg(rs,"for "); - addmsg(rs,"what type"); - if (!terse) - addmsg(rs," of object do you want a list"); - msg(rs,"? (* for all)"); - ch = readchar(rs); - switch (ch) - { - case ESCAPE: - msg(rs,""); - return; - case POTION: - case SCROLL: - case RING: - case STICK: - case '*': - disc_list = TRUE; - break; - default: - if (terse) - msg(rs,"Not a type"); - else - msg(rs,"Please type one of %c%c%c%c (ESCAPE to quit)", POTION, SCROLL, RING, STICK); - } - } while (!disc_list); - if (ch == '*') - { - print_disc(rs,POTION); - add_line(rs,"", NULL); - print_disc(rs,SCROLL); - add_line(rs,"", NULL); - print_disc(rs,RING); - add_line(rs,"", NULL); - print_disc(rs,STICK); - end_line(rs); - } - else - { - print_disc(rs,ch); - end_line(rs); - } -} - -/* - * print_disc: - * Print what we've discovered of type 'type' - */ - -#define MAX4(a,b,c,d) (a > b ? (a > c ? (a > d ? a : d) : (c > d ? c : d)) : (b > c ? (b > d ? b : d) : (c > d ? c : d))) - - -void -print_disc(struct rogue_state *rs,char type) -{ - struct obj_info *info = NULL; - int i, maxnum = 0, num_found; - static THING obj; - static int order[MAX4(MAXSCROLLS, MAXPOTIONS, MAXRINGS, MAXSTICKS)]; - - switch (type) - { - case SCROLL: - maxnum = MAXSCROLLS; - info = scr_info; - break; - case POTION: - maxnum = MAXPOTIONS; - info = pot_info; - break; - case RING: - maxnum = MAXRINGS; - info = ring_info; - break; - case STICK: - maxnum = MAXSTICKS; - info = ws_info; - break; - } - set_order(order, maxnum); - obj.o_count = 1; - obj.o_flags = 0; - num_found = 0; - for (i = 0; i < maxnum; i++) - if (info[order[i]].oi_know || info[order[i]].oi_guess) - { - obj.o_type = type; - obj.o_which = order[i]; - add_line(rs,"%s", inv_name(&obj, FALSE)); - num_found++; - } - if (num_found == 0) - add_line(rs,nothing(type), NULL); -} - -/* - * set_order: - * Set up order for list - */ - -void -set_order(int *order, int numthings) -{ - int i, r, t; - - for (i = 0; i< numthings; i++) - order[i] = i; - - for (i = numthings; i > 0; i--) - { - r = rnd(i); - t = order[i - 1]; - order[i - 1] = order[r]; - order[r] = t; - } -} - -/* - * add_line: - * Add a line to the list of discoveries - */ -/* VARARGS1 */ -char -add_line(struct rogue_state *rs,char *fmt, char *arg) -{ - WINDOW *tw, *sw; - int x, y; - char *prompt = "--Press space to continue--"; - static int maxlen = -1; - - if (line_cnt == 0) - { - wclear(hw); - if (inv_type == INV_SLOW) - mpos = 0; - } - if (inv_type == INV_SLOW) - { - if (*fmt != '\0') - if (msg(rs,fmt, arg) == ESCAPE) - return ESCAPE; - line_cnt++; - } - else - { - if (maxlen < 0) - maxlen = (int) strlen(prompt); - if (line_cnt >= LINES - 1 || fmt == NULL) - { - if (inv_type == INV_OVER && fmt == NULL && !newpage) - { - msg(rs,""); - if ( rs->sleeptime != 0 ) - refresh(); - if ( rs->guiflag != 0 ) - { - tw = newwin(line_cnt + 1, maxlen + 2, 0, COLS - maxlen - 3); - sw = subwin(tw, line_cnt + 1, maxlen + 1, 0, COLS - maxlen - 2); - for (y = 0; y <= line_cnt; y++) - { - wmove(sw, y, 0); - for (x = 0; x <= maxlen; x++) - waddch(sw, mvwinch(hw, y, x)); - } - wmove(tw, line_cnt, 1); - waddstr(tw, prompt); - /* - * if there are lines below, use 'em - */ - if (LINES > NUMLINES) - { - if (NUMLINES + line_cnt > LINES) - mvwin(tw, LINES - (line_cnt + 1), COLS - maxlen - 3); - else - mvwin(tw, NUMLINES, 0); - } - touchwin(tw); - wrefresh(tw); - wait_for(rs,' '); - - if (md_hasclreol()) - { - werase(tw); - leaveok(tw, TRUE); - wrefresh(tw); - } - delwin(tw); - touchwin(stdscr); - } - else - { - wait_for(rs,' '); - } - } - else - { - char *promptex = "--Wait 5 sec.--"; - wmove(hw, LINES - 1, 0); - waddstr(hw, newpage ? promptex : prompt); - wrefresh(hw); - - if (newpage) { - - #ifdef _WIN32 - #ifdef _MSC_VER - #define sleep(x) Sleep(1000*(x)) - #endif - #endif - sleep(5); - - } else - wait_for(rs, ' '); - - clearok(curscr, TRUE); - wclear(hw); - - touchwin(stdscr); - } - newpage = TRUE; - line_cnt = 0; - - maxlen = (int) strlen(prompt); - } - if (fmt != NULL && !(line_cnt == 0 && *fmt == '\0')) - { - mvwprintw(hw, line_cnt++, 0, fmt, arg); - getyx(hw, y, x); - if (maxlen < x) - maxlen = x; - lastfmt = fmt; - lastarg = arg; - } - } - return ~ESCAPE; -} - -/* - * end_line: - * End the list of lines - */ - -void -end_line(struct rogue_state *rs) -{ - if (inv_type != INV_SLOW) - { - if (line_cnt == 1 && !newpage) - { - mpos = 0; - msg(rs,lastfmt, lastarg); - } - else - add_line(rs,(char *) NULL, NULL); - } - line_cnt = 0; - newpage = FALSE; -} - -/* - * nothing: - * Set up prbuf so that message for "nothing found" is there - */ -char * -nothing(char type) -{ - char *sp, *tystr = NULL; - - if (terse) - sprintf(prbuf, "Nothing"); - else - sprintf(prbuf, "Haven't discovered anything"); - if (type != '*') - { - sp = &prbuf[strlen(prbuf)]; - switch (type) - { - case POTION: tystr = "potion"; - when SCROLL: tystr = "scroll"; - when RING: tystr = "ring"; - when STICK: tystr = "stick"; - } - sprintf(sp, " about any %ss", tystr); - } - return prbuf; -} - -/* - * nameit: - * Give the proper name to a potion, stick, or ring - */ - -void -nameit(THING *obj, const char *type,const char *which, struct obj_info *op, - char *(*prfunc)(THING *)) -{ - char *pb; - - if (op->oi_know || op->oi_guess) - { - if (obj->o_count == 1) - sprintf(prbuf, "A %s ", type); - else - sprintf(prbuf, "%d %ss ", obj->o_count, type); - pb = &prbuf[strlen(prbuf)]; - if (op->oi_know) - sprintf(pb, "of %s%s(%s)", op->oi_name, (*prfunc)(obj), which); - else if (op->oi_guess) - sprintf(pb, "called %s%s(%s)", op->oi_guess, (*prfunc)(obj), which); - } - else if (obj->o_count == 1) - sprintf(prbuf, "A%s %s %s", vowelstr((char *)which), which, type); - else - sprintf(prbuf, "%d %s %ss", obj->o_count, which, type); -} - -/* - * nullstr: - * Return a pointer to a null-length string - */ -char * -nullstr(THING *ignored) -{ - NOOP(ignored); - return ""; -} - -# ifdef MASTER -/* - * pr_list: - * List possible potions, scrolls, etc. for wizard. - */ - -void -pr_list(struct rogue_state *rs) -{ - int ch; - - if (!terse) - addmsg(rs,"for "); - addmsg(rs,"what type"); - if (!terse) - addmsg(rs," of object do you want a list"); - msg(rs,"? "); - ch = readchar(rs); - switch (ch) - { - case POTION: - pr_spec(pot_info, MAXPOTIONS); - when SCROLL: - pr_spec(scr_info, MAXSCROLLS); - when RING: - pr_spec(ring_info, MAXRINGS); - when STICK: - pr_spec(ws_info, MAXSTICKS); - when ARMOR: - pr_spec(arm_info, MAXARMORS); - when WEAPON: - pr_spec(weap_info, MAXWEAPONS); - otherwise: - return; - } -} - -/* - * pr_spec: - * Print specific list of possible items to choose from - */ - -void -pr_spec(struct rogue_state *rs,struct obj_info *info, int nitems) -{ - struct obj_info *endp; - int i, lastprob; - - endp = &info[nitems]; - lastprob = 0; - for (i = '0'; info < endp; i++) - { - if (i == '9' + 1) - i = 'a'; - sprintf(prbuf, "%c: %%s (%d%%%%)", i, info->oi_prob - lastprob); - lastprob = info->oi_prob; - add_line(rs,prbuf, info->oi_name); - info++; - } - end_line(rs); -} -# endif /* MASTER */ diff --git a/src/cc/rogue/vers.c b/src/cc/rogue/vers.c deleted file mode 100644 index bcaf9bb8a..000000000 --- a/src/cc/rogue/vers.c +++ /dev/null @@ -1,20 +0,0 @@ -// Copyright (c) 2016-2023 The Hush developers -// Distributed under the GPLv3 software license, see the accompanying -// file COPYING or https://www.gnu.org/licenses/gpl-3.0.en.html -/* - * Version number. Whenever a new version number is desired, use sccs(!) - * to get vers.c. encstr is declared here to force it to be loaded - * before the version number, and therefore not to be written in saved - * games. - * - * Rogue: Exploring the Dungeons of Doom - * Copyright (C) 1980-1983, 1985, 1999 Michael Toy, Ken Arnold and Glenn Wichman - * All rights reserved. - * - * See the file LICENSE.TXT for full copyright and licensing information. - */ - -char *release = "5.4.4"; -char *encstr = "\300k||`\251Y.'\305\321\201+\277~r\"]\240_\223=1\341)\222\212\241t;\t$\270\314/<#\201\254"; -char *statlist = "\355kl{+\204\255\313idJ\361\214=4:\311\271\341wK<\312\321\213,,7\271/Rk%\b\312\f\246"; -char *version = "rogue (rogueforge) 09/05/07"; diff --git a/src/cc/rogue/weapons.c b/src/cc/rogue/weapons.c deleted file mode 100644 index 530a4302f..000000000 --- a/src/cc/rogue/weapons.c +++ /dev/null @@ -1,293 +0,0 @@ -// Copyright (c) 2016-2023 The Hush developers -// Distributed under the GPLv3 software license, see the accompanying -// file COPYING or https://www.gnu.org/licenses/gpl-3.0.en.html -/* - * Functions for dealing with problems brought about by weapons - * - * @(#)weapons.c 4.34 (Berkeley) 02/05/99 - * - * Rogue: Exploring the Dungeons of Doom - * Copyright (C) 1980-1983, 1985, 1999 Michael Toy, Ken Arnold and Glenn Wichman - * All rights reserved. - * - * See the file LICENSE.TXT for full copyright and licensing information. - */ - -//#include -//#include -//#include -#include "rogue.h" - -#define NO_WEAPON -1 - -int group = 2; - -static struct init_weaps { - char *iw_dam; /* Damage when wielded */ - char *iw_hrl; /* Damage when thrown */ - char iw_launch; /* Launching weapon */ - int iw_flags; /* Miscellaneous flags */ -} init_dam[MAXWEAPONS] = { - { "2x4", "1x3", NO_WEAPON, 0, }, /* Mace */ - { "3x4", "1x2", NO_WEAPON, 0, }, /* Long sword */ - { "1x1", "1x1", NO_WEAPON, 0, }, /* Bow */ - { "1x1", "2x3", BOW, ISMANY|ISMISL, }, /* Arrow */ - { "1x6", "1x4", NO_WEAPON, ISMISL|ISMISL, }, /* Dagger */ - { "4x4", "1x2", NO_WEAPON, 0, }, /* 2h sword */ - { "1x1", "1x3", NO_WEAPON, ISMANY|ISMISL, }, /* Dart */ - { "1x2", "2x4", NO_WEAPON, ISMANY|ISMISL, }, /* Shuriken */ - { "2x3", "1x6", NO_WEAPON, ISMISL, }, /* Spear */ -}; - -/* - * missile: - * Fire a missile in a given direction - */ - -void -missile(struct rogue_state *rs,int ydelta, int xdelta) -{ - THING *obj; - - /* - * Get which thing we are hurling - */ - if ((obj = get_item(rs,"throw", WEAPON)) == NULL) - return; - if (!dropcheck(rs,obj) || is_current(rs,obj)) - return; - obj = leave_pack(rs,obj, TRUE, FALSE); - do_motion(rs,obj, ydelta, xdelta); - /* - * AHA! Here it has hit something. If it is a wall or a door, - * or if it misses (combat) the monster, put it on the floor - */ - if (moat(obj->o_pos.y, obj->o_pos.x) == NULL || - !hit_monster(rs,unc(obj->o_pos), obj)) - fall(rs,obj, TRUE); -} - -/* - * do_motion: - * Do the actual motion on the screen done by an object traveling - * across the room - */ - -void -do_motion(struct rogue_state *rs,THING *obj, int ydelta, int xdelta) -{ - int ch; - - /* - * Come fly with us ... - */ - obj->o_pos = hero; - for (;;) - { - if ( rs->replaydone != 0 ) - return; - /* - * Erase the old one - */ - if (!ce(obj->o_pos, hero) && cansee(rs,unc(obj->o_pos)) && !terse) - { - ch = chat(obj->o_pos.y, obj->o_pos.x); - if (ch == FLOOR && !show_floor()) - ch = ' '; - mvaddch(obj->o_pos.y, obj->o_pos.x, ch); - } - /* - * Get the new position - */ - obj->o_pos.y += ydelta; - obj->o_pos.x += xdelta; - if (step_ok(ch = winat(obj->o_pos.y, obj->o_pos.x)) && ch != DOOR) - { - /* - * It hasn't hit anything yet, so display it - * If it alright. - */ - if (cansee(rs,unc(obj->o_pos)) && !terse) - { - mvaddch(obj->o_pos.y, obj->o_pos.x, obj->o_type); - if ( rs->sleeptime != 0 ) - refresh(); - } - continue; - } - break; - } -} - -/* - * fall: - * Drop an item someplace around here. - */ - -void -fall(struct rogue_state *rs,THING *obj, bool pr) -{ - PLACE *pp; - static coord fpos; - - if (fallpos(&obj->o_pos, &fpos)) - { - pp = INDEX(fpos.y, fpos.x); - pp->p_ch = (char) obj->o_type; - obj->o_pos = fpos; - if (cansee(rs,fpos.y, fpos.x)) - { - if (pp->p_monst != NULL) - pp->p_monst->t_oldch = (char) obj->o_type; - else - mvaddch(fpos.y, fpos.x, obj->o_type); - } - attach(lvl_obj, obj); - return; - } - if (pr) - { - if (has_hit) - { - endmsg(rs); - has_hit = FALSE; - } - msg(rs,"the %s vanishes as it hits the ground", - weap_info[obj->o_which].oi_name); - } - discard(obj); -} - -/* - * init_weapon: - * Set up the initial goodies for a weapon - */ - -void -init_weapon(THING *weap, int which) -{ - struct init_weaps *iwp; - weap->o_type = WEAPON; - weap->o_which = which; - iwp = &init_dam[which]; - strncpy(weap->o_damage, iwp->iw_dam, sizeof(weap->o_damage)); - strncpy(weap->o_hurldmg,iwp->iw_hrl, sizeof(weap->o_hurldmg)); - weap->o_launch = iwp->iw_launch; - weap->o_flags = iwp->iw_flags; - weap->o_hplus = 0; - weap->o_dplus = 0; - if (which == DAGGER) - { - weap->o_count = rnd(4) + 2; - weap->o_group = group++; - } - else if (weap->o_flags & ISMANY) - { - weap->o_count = rnd(8) + 8; - weap->o_group = group++; - } - else - { - weap->o_count = 1; - weap->o_group = 0; - } -} - -/* - * hit_monster: - * Does the missile hit the monster? - */ -int -hit_monster(struct rogue_state *rs,int y, int x, THING *obj) -{ - static coord mp; - - mp.y = y; - mp.x = x; - return fight(rs,&mp, obj, TRUE); -} - -/* - * num: - * Figure out the plus number for armor/weapons - */ -char * -num(int n1, int n2, char type) -{ - static char numbuf[10]; - - sprintf(numbuf, n1 < 0 ? "%d" : "+%d", n1); - if (type == WEAPON) - sprintf(&numbuf[strlen(numbuf)], n2 < 0 ? ",%d" : ",+%d", n2); - return numbuf; -} - -/* - * wield: - * Pull out a certain weapon - */ - -void -wield(struct rogue_state *rs) -{ - THING *obj, *oweapon; - char *sp; - - oweapon = cur_weapon; - if (!dropcheck(rs,cur_weapon)) - { - cur_weapon = oweapon; - return; - } - cur_weapon = oweapon; - if ((obj = get_item(rs,"wield", WEAPON)) == NULL) - { -bad: - after = FALSE; - return; - } - - if (obj->o_type == ARMOR) - { - msg(rs,"you can't wield armor"); - goto bad; - } - if (is_current(rs,obj)) - goto bad; - - sp = inv_name(obj, TRUE); - cur_weapon = obj; - if (!terse) - addmsg(rs,"you are now "); - msg(rs,"wielding %s (%c)", sp, obj->o_packch); -} - -/* - * fallpos: - * Pick a random position around the give (y, x) coordinates - */ -bool -fallpos(coord *pos, coord *newpos) -{ - int y, x, cnt, ch; - - cnt = 0; - for (y = pos->y - 1; y <= pos->y + 1; y++) - for (x = pos->x - 1; x <= pos->x + 1; x++) - { - /* - * check to make certain the spot is empty, if it is, - * put the object there, set it in the level list - * and re-draw the room if he can see it - */ - if (y == hero.y && x == hero.x) - continue; - if (((ch = chat(y, x)) == FLOOR || ch == PASSAGE) - && rnd(++cnt) == 0) - { - newpos->y = y; - newpos->x = x; - } - } - return (bool)(cnt != 0); -} diff --git a/src/cc/rogue/wizard.c b/src/cc/rogue/wizard.c deleted file mode 100644 index a1721ec73..000000000 --- a/src/cc/rogue/wizard.c +++ /dev/null @@ -1,289 +0,0 @@ -// Copyright (c) 2016-2023 The Hush developers -// Distributed under the GPLv3 software license, see the accompanying -// file COPYING or https://www.gnu.org/licenses/gpl-3.0.en.html -/* - * Special wizard commands (some of which are also non-wizard commands - * under strange circumstances) - * - * @(#)wizard.c 4.30 (Berkeley) 02/05/99 - * - * Rogue: Exploring the Dungeons of Doom - * Copyright (C) 1980-1983, 1985, 1999 Michael Toy, Ken Arnold and Glenn Wichman - * All rights reserved. - * - * See the file LICENSE.TXT for full copyright and licensing information. - */ - -//#include -//#include -//#include -//#include -#include "rogue.h" - -/* - * whatis: - * What a certin object is - */ - -void -whatis(struct rogue_state *rs,bool insist, int type) -{ - THING *obj; - - if (pack == NULL) - { - msg(rs,"you don't have anything in your pack to identify"); - return; - } - - for (;;) - { - if ( rs->replaydone != 0 ) - return; - obj = get_item(rs,"identify", type); - if (insist) - { - if (n_objs == 0) - return; - else if (obj == NULL) - msg(rs,"you must identify something"); - else if (type && obj->o_type != type && - !(type == R_OR_S && (obj->o_type == RING || obj->o_type == STICK)) ) - msg(rs,"you must identify a %s", type_name(type)); - else - break; - } - else - break; - } - - if (obj == NULL) - return; - - switch (obj->o_type) - { - case SCROLL: - set_know(obj, scr_info); - when POTION: - set_know(obj, pot_info); - when STICK: - set_know(obj, ws_info); - when WEAPON: - case ARMOR: - obj->o_flags |= ISKNOW; - when RING: - set_know(obj, ring_info); - } - msg(rs,inv_name(obj, FALSE)); -} - -/* - * set_know: - * Set things up when we really know what a thing is - */ - -void -set_know(THING *obj, struct obj_info *info) -{ - char **guess; - - info[obj->o_which].oi_know = TRUE; - obj->o_flags |= ISKNOW; - guess = &info[obj->o_which].oi_guess; - if (*guess) - { - free(*guess); - *guess = NULL; - } -} - -/* - * type_name: - * Return a pointer to the name of the type - */ -char * -type_name(int type) -{ - struct h_list *hp; - static struct h_list tlist[] = { - {POTION, "potion", FALSE}, - {SCROLL, "scroll", FALSE}, - {FOOD, "food", FALSE}, - {R_OR_S, "ring, wand or staff", FALSE}, - {RING, "ring", FALSE}, - {STICK, "wand or staff", FALSE}, - {WEAPON, "weapon", FALSE}, - {ARMOR, "suit of armor", FALSE}, - }; - - for (hp = tlist; hp->h_ch; hp++) - if (type == hp->h_ch) - return hp->h_desc; - /* NOTREACHED */ - return(0); -} - -#ifdef MASTER -/* - * create_obj: - * wizard command for getting anything he wants - */ - -void -create_obj(struct rogue_state *rs) -{ - THING *obj; - char ch, bless; - - obj = new_item(); - msg(rs,"type of item: "); - obj->o_type = readchar(rs); - mpos = 0; - msg(rs,"which %c do you want? (0-f)", obj->o_type); - obj->o_which = (isdigit((ch = readchar(rs))) ? ch - '0' : ch - 'a' + 10); - obj->o_group = 0; - obj->o_count = 1; - mpos = 0; - if (obj->o_type == WEAPON || obj->o_type == ARMOR) - { - msg(rs,"blessing? (+,-,n)"); - bless = readchar(rs); - mpos = 0; - if (bless == '-') - obj->o_flags |= ISCURSED; - if (obj->o_type == WEAPON) - { - init_weapon(obj, obj->o_which); - if (bless == '-') - obj->o_hplus -= rnd(3)+1; - if (bless == '+') - obj->o_hplus += rnd(3)+1; - } - else - { - obj->o_arm = a_class[obj->o_which]; - if (bless == '-') - obj->o_arm += rnd(3)+1; - if (bless == '+') - obj->o_arm -= rnd(3)+1; - } - } - else if (obj->o_type == RING) - switch (obj->o_which) - { - case R_PROTECT: - case R_ADDSTR: - case R_ADDHIT: - case R_ADDDAM: - msg(rs,"blessing? (+,-,n)"); - bless = readchar(rs); - mpos = 0; - if (bless == '-') - obj->o_flags |= ISCURSED; - obj->o_arm = (bless == '-' ? -1 : rnd(2) + 1); - when R_AGGR: - case R_TELEPORT: - obj->o_flags |= ISCURSED; - } - else if (obj->o_type == STICK) - fix_stick(obj); - else if (obj->o_type == GOLD) - { - msg(rs,"how much?"); - get_num(&obj->o_goldval, stdscr); - } - add_pack(rs,obj, FALSE); -} -#endif - -/* - * telport: - * Bamf the hero someplace else - */ - -void -teleport(struct rogue_state *rs) -{ - static coord c; - - mvaddch(hero.y, hero.x, floor_at()); - find_floor(rs,(struct room *) NULL, &c, FALSE, TRUE); - if (roomin(rs,&c) != proom) - { - leave_room(rs,&hero); - hero = c; - enter_room(rs,&hero); - } - else - { - hero = c; - look(rs,TRUE); - } - mvaddch(hero.y, hero.x, PLAYER); - /* - * turn off ISHELD in case teleportation was done while fighting - * a Flytrap - */ - if (on(player, ISHELD)) { - player.t_flags &= ~ISHELD; - vf_hit = 0; - strcpy(monsters['F'-'A'].m_stats.s_dmg, "000x0"); - } - no_move = 0; - count = 0; - running = FALSE; - flush_type(); -} - -#ifdef MASTER -/* - * passwd: - * See if user knows password - */ -int -passwd(struct rogue_state *rs) -{ - char *sp, c; - static char buf[MAXSTR]; - - msg(rs,"wizard's Password:"); - mpos = 0; - sp = buf; - while ((c = readchar(rs)) != '\n' && c != '\r' && c != ESCAPE) - if (c == md_killchar()) - sp = buf; - else if (c == md_erasechar() && sp > buf) - sp--; - else - *sp++ = c; - if (sp == buf) - return FALSE; - *sp = '\0'; - return (strcmp(PASSWD, md_crypt(buf, "mT")) == 0); -} - -/* - * show_map: - * Print out the map for the wizard - */ - -void -show_map(struct rogue_state *rs) -{ - int y, x, real; - - wclear(hw); - for (y = 1; y < NUMLINES - 1; y++) - for (x = 0; x < NUMCOLS; x++) - { - real = flat(y, x); - if (!(real & F_REAL)) - wstandout(hw); - wmove(hw, y, x); - waddch(hw, chat(y, x)); - if (!real) - wstandend(hw); - } - show_win(rs,"---More (level map)---"); -} -#endif diff --git a/src/cc/rogue/x86_64-w64-msvc/deps/install/include/acs_defs.h b/src/cc/rogue/x86_64-w64-msvc/deps/install/include/acs_defs.h deleted file mode 100644 index c8c02a737..000000000 --- a/src/cc/rogue/x86_64-w64-msvc/deps/install/include/acs_defs.h +++ /dev/null @@ -1,265 +0,0 @@ -/* Many of the following #defines are completely unused for the -nonce. For each character, its code point in code page 437, -Unicode, and page 8859-1 are given. The first is used for -non-wide builds in Win32 console, DOS, SDL, and OS/2. -Unicode is used for all wide builds, and for the non-wide -build of WinGUI. Code page 8859-1 is used for non-wide X11. - - All of these characters exist in CP437 and Unicode. Some -don't exist in 8859-1, in which case the last column is 'TBD'. -Only 32 are used in ncurses. So caution is advised. */ - -#ifdef USE_ISO8859_CHARSET - #define CHOOSE( A, B, C) (C) - #define TBD '!' -#else - #define CHOOSE( A, B, C) (USE_UNICODE_ACS_CHARS ? B : A) -#endif - -/* Codes found from https://en.wikipedia.org/wiki/Code_page_437 */ - -#define SMILE CHOOSE( 0x01, 0x263a, 'O') -#define REV_SMILE CHOOSE( 0x02, 0x263b, 'O') -#define HEART CHOOSE( 0x03, 0x2665, 'H') -#define DIAMOND CHOOSE( 0x04, 0x2666, 0x01) -#define CLUB CHOOSE( 0x05, 0x2663, 'C') -#define SPADE CHOOSE( 0x06, 0x2660, 'S') -#define MEDIUM_BULLET CHOOSE( 0x07, 0x2022, 0xb7) -#define REV_BULLET CHOOSE( 0x08, 0x2508, 0xb7) -#define WHITE_BULLET CHOOSE( 0x09, 0x25cb, 7) -#define REV_WHITE_BULLET CHOOSE( 0x0a, 0x25D9, 7) -#define MALE_SYM CHOOSE( 0x0b, 0x2642, 'm') -#define FEMALE_SYM CHOOSE( 0x0c, 0x2640, 'f') -#define QTR_NOTE CHOOSE( 0x0d, 0x266a, 0xbc) -#define EIGHTH_NOTE CHOOSE( 0x0e, 0x266b, 0xbd) -#define SPLAT CHOOSE( 0x0f, 0xa4 , 0xa4) -#define RIGHT_TRIANGLE CHOOSE( 0x10, 0x25b6, '>') -#define LEFT_TRIANGLE CHOOSE( 0x11, 0x25c0, '<') -#define UP_DOWN_ARROW CHOOSE( 0x12, 0x2195, 0x19) -#define DBL_BANG CHOOSE( 0x13, 0x203c, '!') -#define PILCROW CHOOSE( 0x14, 0xb6 , 0xb6) -#define SECTION_SIGN CHOOSE( 0x15, 0xa7 , 0xa7) -#define LOW_QTR_BLOCK CHOOSE( 0x16, 0x25b2, '_') -#define UP_DOWN_ARROW_UNDERSCORED CHOOSE( 0x17, 0x21ab, 0x19) -#define UP_ARROW CHOOSE( 0x18, 0x2191, '^') -#define DOWN_ARROW CHOOSE( 0x19, 0x2193, 'v') -#define RIGHT_ARROW CHOOSE( 0x1a, 0x2192, '>') -#define LEFT_ARROW CHOOSE( 0x1b, 0x2190, '<') -#define RIGHT_ANGLE CHOOSE( 0x1c, 0x221f, 0xe) -#define LEFT_RIGHT_ARROW CHOOSE( 0x1d, 0x2194, '-') -#define UP_TRIANGLE CHOOSE( 0x1e, 0x25b2, '^') -#define DOWN_TRIANGLE CHOOSE( 0x1f, 0x25bc, 'v') - -#define UPPERCASE_C_CEDILLA CHOOSE( 0x80, 0xc7 , 0xc7) -#define LOWERCASE_U_UMLAUT CHOOSE( 0x81, 0xfc , 0xfc) -#define LOWERCASE_E_ACUTE CHOOSE( 0x82, 0xe9 , 0xe9) -#define LOWERCASE_A_CIRCUMFLEX CHOOSE( 0x83, 0xe2 , 0xe2) -#define LOWERCASE_A_UMLAUT CHOOSE( 0x84, 0xe4 , 0xe4) -#define LOWERCASE_A_GRAVE CHOOSE( 0x85, 0xe0 , 0xea) -#define LOWERCASE_A_RING CHOOSE( 0x86, 0xe5 , 0xe5) -#define LOWERCASE_C_CEDILLA CHOOSE( 0x87, 0xe7 , 0xe7) -#define LOWERCASE_E_CIRCUMFLEX CHOOSE( 0x88, 0xea , 0xea) -#define LOWERCASE_E_UMLAUT CHOOSE( 0x89, 0xeb , 0xeb) -#define LOWERCASE_E_GRAVE CHOOSE( 0x8a, 0xe8 , 0xe8) -#define LOWERCASE_I_UMLAUT CHOOSE( 0x8b, 0xef , 0xef) -#define LOWERCASE_I_CIRCUMFLEX CHOOSE( 0x8c, 0xee , 0xee) -#define LOWERCASE_I_GRAVE CHOOSE( 0x8d, 0xec , 0xce) -#define UPPERCASE_A_UMLAUT CHOOSE( 0x8e, 0xc4 , 0xc4) -#define UPPERCASE_A_RING CHOOSE( 0x8f, 0xc5 , 0xc5) - -#define UPPERCASE_E_ACUTE CHOOSE( 0x90, 0xc9 , 0xc9) -#define LOWERCASE_AE_LIGATURE CHOOSE( 0x91, 0xe6 , 0xe6) -#define UPPERCASE_AE_LIGATURE CHOOSE( 0x92, 0xc6 , 0xc6) -#define LOWERCASE_O_CIRCUMFLEX CHOOSE( 0x93, 0xf4 , 0xf4) -#define LOWERCASE_O_UMLAUT CHOOSE( 0x94, 0xf6 , 0xf6) -#define LOWERCASE_O_GRAVE CHOOSE( 0x95, 0xf2 , 0xf2) -#define LOWERCASE_U_CIRCUMFLEX CHOOSE( 0x96, 0xfb , 0xfb) -#define LOWERCASE_U_GRAVE CHOOSE( 0x97, 0xf9 , 0xf9) -#define LOWERCASE_Y_UMLAUT CHOOSE( 0x98, 0xff , 0xff) -#define UPPERCASE_O_UMLAUT CHOOSE( 0x99, 0xd6 , 0xd6) -#define UPPERCASE_U_UMLAUT CHOOSE( 0x9a, 0xdc , 0xdc) -#define CENT_SIGN CHOOSE( 0x9b, 0xa2 , 0xa2) -#define STERLING_SIGN CHOOSE( 0x9c, 0xa3 , 30) -#define YEN_SIGN CHOOSE( 0x9d, 0xa5 , 0xa5) -#define PESETA_SIGN CHOOSE( 0x9e, 0x20a7, TBD) -#define F_WITH_HOOK CHOOSE( 0x9f, 0x0192, TBD) - -#define LOWERCASE_A_ACUTE CHOOSE( 0xa0, 0xe1 , 0xe1) -#define LOWERCASE_I_ACUTE CHOOSE( 0xa1, 0xed , 0xed) -#define LOWERCASE_O_ACUTE CHOOSE( 0xa2, 0xf3 , 0xf3) -#define LOWERCASE_U_ACUTE CHOOSE( 0xa3, 0xfa , 0xfa) -#define LOWERCASE_N_TILDE CHOOSE( 0xa4, 0xf1 , 0xf1) -#define UPPERCASE_N_TILDE CHOOSE( 0xa5, 0xd1 , 0xd1) -#define A_ORDINAL CHOOSE( 0xa6, 0xaa , 0xaa) -#define O_ORDINAL CHOOSE( 0xa7, 0xba , 0xba) -#define INVERTED_QUESTION_MARK CHOOSE( 0xa8, 0xbf , 0xbf) -#define REVERSED_NOT_SIGN CHOOSE( 0xa9, 0x2310, TBD) -#define NOT_SIGN CHOOSE( 0xaa, 0xac , 0xac) -#define VULGAR_HALF CHOOSE( 0xab, 0xbd , 0xbd) -#define VULGAR_QUARTER CHOOSE( 0xac, 0xbc , 0xbc) -#define INVERTED_EXCLAMATION_MARK CHOOSE( 0xad, 0xa1 , 0xa1) -#define LEFT_ANGLE_QUOTE_MARK CHOOSE( 0xae, 0xab , 0xab) -#define RIGHT_ANGLE_QUOTE_MARK CHOOSE( 0xaf, 0xbb , 0xbb) - -#define LIGHT_SHADE CHOOSE( 0xb0, 0x2591, '#' ) -#define MEDIUM_SHADE CHOOSE( 0xb1, 0x2592, 2) -#define DARK_SHADE CHOOSE( 0xb2, 0x2593, TBD) -#define BOX_VLINE CHOOSE( 0xb3, 0x2502, 25) -#define BOX_RTEE CHOOSE( 0xb4, 0x2524, 22) -#define BOX_SD_RTEE CHOOSE( 0xb5, 0x2561, 22) -#define BOX_DS_RTEE CHOOSE( 0xb6, 0x2562, 22) -#define BOX_DS_URCORNER CHOOSE( 0xb7, 0x2556, 12) -#define BOX_SD_URCORNER CHOOSE( 0xb8, 0x2555, 12) -#define BOX_D_RTEE CHOOSE( 0xb9, 0x2563, 22) -#define BOX_D_VLINE CHOOSE( 0xba, 0x2551, 25) -#define BOX_D_URCORNER CHOOSE( 0xbb, 0x2557, 12) -#define BOX_D_LRCORNER CHOOSE( 0xbc, 0x255D, 11) -#define BOX_DS_LRCORNER CHOOSE( 0xbd, 0x255c, 11) -#define BOX_SD_LRCORNER CHOOSE( 0xbe, 0x255b, 11) -#define BOX_URCORNER CHOOSE( 0xbf, 0x2510, 12) - -#define BOX_LLCORNER CHOOSE( 0xc0, 0x2514, 14) -#define BOX_BTEE CHOOSE( 0xc1, 0x2534, 23) -#define BOX_TTEE CHOOSE( 0xc2, 0x252c, 24) -#define BOX_LTEE CHOOSE( 0xc3, 0x251c, 21) -#define BOX_HLINE CHOOSE( 0xc4, 0x2500, 18) -#define BOX_PLUS CHOOSE( 0xc5, 0x253c, 15) -#define BOX_SD_LTEE CHOOSE( 0xc6, 0x255e, 21) -#define BOX_DS_LTEE CHOOSE( 0xc7, 0x255f, 21) -#define BOX_D_LLCORNER CHOOSE( 0xc8, 0x255A, 14) -#define BOX_D_ULCORNER CHOOSE( 0xc9, 0x2554, 13) -#define BOX_D_BTEE CHOOSE( 0xca, 0x2569, 23) -#define BOX_D_TTEE CHOOSE( 0xcb, 0x2566, 24) -#define BOX_D_LTEE CHOOSE( 0xcc, 0x2560, 21) -#define BOX_D_HLINE CHOOSE( 0xcd, 0x2550, 18) -#define BOX_D_PLUS CHOOSE( 0xce, 0x256C, 15) -#define BOX_SD_BTEE CHOOSE( 0xcf, 0x2567, 23) - -#define BOX_DS_BTEE CHOOSE( 0xd0, 0x2568, 23) -#define BOX_SD_TTEE CHOOSE( 0xd1, 0x2564, 24) -#define BOX_DS_TTEE CHOOSE( 0xd2, 0x2565, 24) -#define BOX_DS_LLCORNER CHOOSE( 0xd3, 0x2559, 14) -#define BOX_SD_LLCORNER CHOOSE( 0xd4, 0x2558, 14) -#define BOX_SD_ULCORNER CHOOSE( 0xd5, 0x2552, 13) -#define BOX_DS_ULCORNER CHOOSE( 0xd6, 0x2553, 13) -#define BOX_DS_PLUS CHOOSE( 0xd7, 0x256b, 15) -#define BOX_SD_PLUS CHOOSE( 0xd8, 0x256a, 15) -#define BOX_LRCORNER CHOOSE( 0xd9, 0x2518, 11) -#define BOX_ULCORNER CHOOSE( 0xda, 0x250c, 13) -#define FULL_BLOCK CHOOSE( 0xdb, 0x2588, 0) -#define LOWER_HALF_BLOCK CHOOSE( 0xdc, 0x2584, TBD) -#define LEFT_HALF_BLOCK CHOOSE( 0xdd, 0x258c, TBD) -#define RIGHT_HALF_BLOCK CHOOSE( 0xde, 0x2590, TBD) -#define UPPER_HALF_BLOCK CHOOSE( 0xdf, 0x2580, TBD) - -#define ALPHA CHOOSE( 0xe0, 0x03b1, TBD) -#define BETA CHOOSE( 0xe1, 0x00df, TBD) -#define GAMMA CHOOSE( 0xe2, 0x0393, TBD) -#define PI CHOOSE( 0xe3, 0x03c0, 28) -#define UPPERCASE_SIGMA CHOOSE( 0xe4, 0x03a3, TBD) -#define LOWERCASE_SIGMA CHOOSE( 0xe5, 0x03c3, TBD) -#define MU CHOOSE( 0xe6, 0x00b5, 0xb5) -#define TAU CHOOSE( 0xe7, 0x03c4, TBD) -#define UPPERCASE_PHI CHOOSE( 0xe8, 0x03a6, TBD) -#define THETA CHOOSE( 0xe9, 0x0398, TBD) -#define OMEGA CHOOSE( 0xea, 0x03a9, TBD) -#define DELTA CHOOSE( 0xeb, 0x03b4, TBD) -#define INFINITY_SIGN CHOOSE( 0xec, 0x221e, TBD) -#define LOWERCASE_PHI CHOOSE( 0xed, 0x03c6, TBD) -#define EPSILON CHOOSE( 0xee, 0x03b5, TBD) -#define INTERSECTION CHOOSE( 0xef, 0x2229, TBD) - -#define TRIPLE_BAR CHOOSE( 0xf0, 0x2261, TBD) -#define PLUS_OR_MINUS CHOOSE( 0xf1, 0x00b1, 8) -#define GREATER_THAN_OR_EQUAL_TO CHOOSE( 0xf2, 0x2265, 27) -#define LESSER_THAN_OR_EQUAL_TO CHOOSE( 0xf3, 0x2264, 26) -#define UPPER_HALF_INTEGRAL_SIGN CHOOSE( 0xf4, 0x2320, TBD) -#define LOWER_HALF_INTEGRAL_SIGN CHOOSE( 0xf5, 0x2321, TBD) -#define DIVISION_SIGN CHOOSE( 0xf6, 0x00f7, 0xf7) -#define APPROXIMATELY_EQUALS_SIGN CHOOSE( 0xf7, 0x2248, TBD) -#define DEGREE_SIGN CHOOSE( 0xf8, 0x00b0, 0xb0) -#define LARGE_BULLET CHOOSE( 0xf9, 0x2219, 7) -#define SMALL_BULLET CHOOSE( 0xfa, 0x00b7, 0xb7) -#define SQUARE_ROOT CHOOSE( 0xfb, 0x221a, TBD) -#define SUPERSCRIPT_N CHOOSE( 0xfc, 0x207f, TBD) -#define SUPERSCRIPT_2 CHOOSE( 0xfd, 0x00b2, 0xb2) -#define CENTERED_SQUARE CHOOSE( 0xfe, 0x25a0, TBD) -#define NON_BREAKING_SPACE CHOOSE( 0xff, 0x00a0, TBD) - - - - /* It says at http://unicode.org/charts/PDF/U2300.pdf */ - /* that '...the scan line numbers here refer to old, */ - /* low-resolution technology for terminals, with only */ - /* nine scan lines per fixed-size character glyph. */ - /* Even-numbered scan lines are unified with box */ - /* drawing graphics." */ - /* The utility of these is questionable; they'd */ - /* work Just Fine in wingdi (_if_ the appropriate */ - /* glyphs are available), but not elsewhere. */ -#define HORIZ_SCAN_LINE_1 CHOOSE( 0x2d, 0x23ba, 16) -#define HORIZ_SCAN_LINE_3 CHOOSE( 0x2d, 0x23bb, 17) -#define HORIZ_SCAN_LINE_7 CHOOSE( 0x2d, 0x23bc, 19) -#define HORIZ_SCAN_LINE_9 CHOOSE( '_', 0x23bd, 20) - - /* Code page 437 lacks a 'for real' not-equals, so for that, */ - /* we use the double-horizontal single-vertical box drawing : */ -#define NOT_EQUALS_SIGN CHOOSE( 0xd8, 0x2260, 29) - -# define A(x) ((chtype)x | A_ALTCHARSET) - -chtype acs_map[128] = -{ - A(0), A(1), A(2), A(3), A(4), A(5), A(6), A(7), A(8), - A(9), A(10), - CLUB, HEART, SPADE, SMILE, REV_SMILE, /* 11 12 13 14 15 */ - MEDIUM_BULLET, WHITE_BULLET, PILCROW, SECTION_SIGN, /* 16 17 18 19 */ - A_ORDINAL, O_ORDINAL, LOWERCASE_PHI, /* 20 21 22 */ - INVERTED_EXCLAMATION_MARK, INVERTED_QUESTION_MARK, /* 23 24 */ - REVERSED_NOT_SIGN, NOT_SIGN, /* 25 26 */ - UPPER_HALF_INTEGRAL_SIGN, LOWER_HALF_INTEGRAL_SIGN, /* 27 28 */ - SUPERSCRIPT_N, CENTERED_SQUARE, F_WITH_HOOK, /* 29 30 31 */ - - RIGHT_ARROW, LEFT_ARROW, UP_ARROW, DOWN_ARROW, /* 32 !"# */ - - PI, NOT_EQUALS_SIGN, VULGAR_HALF, VULGAR_QUARTER, /* $%&' */ - '(', - LEFT_ANGLE_QUOTE_MARK, RIGHT_ANGLE_QUOTE_MARK, /* )* */ - DARK_SHADE, SUPERSCRIPT_2, INFINITY_SIGN, /* +,- */ - ALPHA, BETA, GAMMA, UPPERCASE_SIGMA, LOWERCASE_SIGMA, /* ./012 */ - '3', - MU, TAU, UPPERCASE_PHI, THETA, OMEGA, DELTA, EPSILON, /* 456789: */ - - BOX_SD_LRCORNER, BOX_SD_URCORNER, BOX_SD_ULCORNER, /* ;<= */ - BOX_SD_LLCORNER, BOX_SD_PLUS, /* >? */ - BOX_SD_LTEE, BOX_SD_RTEE, BOX_SD_BTEE, BOX_SD_TTEE, /* @ABC */ - - BOX_D_LRCORNER, BOX_D_URCORNER, BOX_D_ULCORNER, /* DEF */ - BOX_D_LLCORNER, BOX_D_PLUS, /* GH */ - BOX_D_LTEE, BOX_D_RTEE, BOX_D_BTEE, BOX_D_TTEE, /* IJKL */ - - BOX_DS_LRCORNER, BOX_DS_URCORNER, BOX_DS_ULCORNER, /* MNO */ - BOX_DS_LLCORNER, BOX_DS_PLUS, /* PQ */ - BOX_DS_LTEE, BOX_DS_RTEE, BOX_DS_BTEE, BOX_DS_TTEE, /* RSTU */ - - BOX_LRCORNER, BOX_URCORNER, BOX_ULCORNER, /* VWX */ - BOX_LLCORNER, BOX_PLUS, /* YZ */ - BOX_LTEE, BOX_RTEE, BOX_BTEE, BOX_TTEE, /* [\]^ */ - - BOX_HLINE, BOX_VLINE, BOX_D_HLINE, BOX_D_VLINE, /* _`ab */ - - DIVISION_SIGN, APPROXIMATELY_EQUALS_SIGN, /* cd */ - INTERSECTION, TRIPLE_BAR, /* ef */ - SMALL_BULLET, LARGE_BULLET, SQUARE_ROOT, /* ghi */ - DIAMOND, MEDIUM_SHADE, /* jk */ - HORIZ_SCAN_LINE_1, HORIZ_SCAN_LINE_3, /* lm */ - HORIZ_SCAN_LINE_7, HORIZ_SCAN_LINE_9, /* no */ - UPPER_HALF_BLOCK, LOWER_HALF_BLOCK, /* pq */ - LEFT_HALF_BLOCK, RIGHT_HALF_BLOCK, FULL_BLOCK, /* rst */ - LESSER_THAN_OR_EQUAL_TO, GREATER_THAN_OR_EQUAL_TO, /* uv */ - DEGREE_SIGN, PLUS_OR_MINUS, LIGHT_SHADE, SPLAT, /* wxyz */ - CENT_SIGN, YEN_SIGN, PESETA_SIGN, STERLING_SIGN, /* {|}~ */ - A(127) -}; - -# undef A diff --git a/src/cc/rogue/x86_64-w64-msvc/deps/install/include/curses.h b/src/cc/rogue/x86_64-w64-msvc/deps/install/include/curses.h deleted file mode 100644 index 9ee3f08a6..000000000 --- a/src/cc/rogue/x86_64-w64-msvc/deps/install/include/curses.h +++ /dev/null @@ -1,1846 +0,0 @@ -/* Public Domain Curses */ - -/*----------------------------------------------------------------------* - * PDCurses * - *----------------------------------------------------------------------*/ - -#ifndef __PDCURSES__ -#define __PDCURSES__ 1 - -/*man-start************************************************************** - -PDCurses definitions list: (Only define those needed) - - XCURSES True if compiling for X11. - PDC_RGB True if you want to use RGB color definitions - (Red = 1, Green = 2, Blue = 4) instead of BGR. - PDC_WIDE True if building wide-character support. - PDC_DLL_BUILD True if building a Windows DLL. - PDC_NCMOUSE Use the ncurses mouse API instead - of PDCurses' traditional mouse API. - -PDCurses portable platform definitions list: - - PDC_BUILD Defines API build version. - PDCURSES Enables access to PDCurses-only routines. - XOPEN Always true. - SYSVcurses True if you are compiling for SYSV portability. - BSDcurses True if you are compiling for BSD portability. - -**man-end****************************************************************/ - -#define PDCURSES 1 /* PDCurses-only routines */ -#define XOPEN 1 /* X/Open Curses routines */ -#define SYSVcurses 1 /* System V Curses routines */ -#define BSDcurses 1 /* BSD Curses routines */ -#if defined( CHTYPE_32) - #define CHTYPE_LONG 1 /* chtypes will be 32 bits */ -#elif !defined( CHTYPE_16) - #define CHTYPE_LONG 2 /* chtypes will be (default) 64 bits */ -#endif - -/*----------------------------------------------------------------------*/ - -#ifdef NO_STDINT_H - #define uint64_t unsigned long long - #define uint32_t unsigned long - #define uint16_t unsigned short -#else - #include -#endif -#include -#include -#include /* Required by X/Open usage below */ - -#ifdef PDC_WIDE -# include -#endif - -#if defined(__STDC_VERSION__) && __STDC_VERSION >= 199901L && \ - !defined(__bool_true_false_are_defined) -# include -#endif - -#ifdef __cplusplus -extern "C" -{ -# define bool _bool -#endif - -/*---------------------------------------------------------------------- - * - * Constants and Types - * - */ - -#undef FALSE -#undef TRUE - -#ifdef __bool_true_false_are_defined - -# define FALSE false -# define TRUE true - -#else - -typedef unsigned char bool; - -# define FALSE 0 -# define TRUE 1 - -#endif - -#undef ERR -#define ERR (-1) - -#undef OK -#define OK 0 - -#ifdef CHTYPE_LONG - #if(CHTYPE_LONG >= 2) /* "non-standard" 64-bit chtypes */ - typedef uint64_t chtype; - #else /* "Standard" CHTYPE_LONG case, 32-bit: */ - typedef uint32_t chtype; - # endif -#else -typedef uint16_t chtype; /* 8-bit attr + 8-bit char */ -#endif - -#ifdef PDC_WIDE -typedef chtype cchar_t; -#endif - -typedef chtype attr_t; - -/* Version constants, available as of version 4.0 : */ -/* Don't forget to update 'version.mif' if MAJOR/MINOR changes! */ - -#define PDC_VER_MAJOR 4 -#define PDC_VER_MINOR 0 -#define PDC_VER_CHANGE 4 -#define PDC_VER_YEAR 2019 -#define PDC_VER_MONTH 1 -#define PDC_VER_DAY 20 - -#define PDC_BUILD (PDC_VER_MAJOR*1000 + PDC_VER_MINOR *100 + PDC_VER_CHANGE) - -/* When using PDCurses as a DLL (Windows) or shared library (BSD or *nix), -it's possible to switch the DLL or shared library. One may therefore want -to inquire of the DLL/shared library the port, version numbers, and -chtype_size used, and make sure they're what one was expecting. The -'PDC_version' structure lets you do just that. */ - -enum PDC_port -{ - PDC_PORT_X11 = 0, - PDC_PORT_WIN32 = 1, - PDC_PORT_WINGUI = 2, - PDC_PORT_DOS = 3, - PDC_PORT_OS2 = 4, - PDC_PORT_SDL1 = 5, - PDC_PORT_SDL2 = 6, - PDC_PORT_VT = 7 -}; - -/* Detailed PDC version information */ -#define PDC_HAS_VERSION_INFO 1 -typedef struct -{ - const enum PDC_port port; - const int ver_major; - const int ver_minor; - const int ver_change; - const size_t chtype_size; - const bool is_wide; - const bool is_forced_utf8; -} PDC_version_info; - -/*---------------------------------------------------------------------- - * - * Mouse Interface -- SYSVR4, with extensions - * - */ - -/* Most flavors of PDCurses support three buttons. WinGUI supports */ -/* these plus two "extended" buttons. But we'll set this macro to */ -/* six, allowing future versions to support up to nine total buttons. */ -/* (The button states are broken up into two arrays to allow for the */ -/* possibility of backward compatibility to DLLs compiled with only */ -/* three mouse buttons.) */ - -#define PDC_MAX_MOUSE_BUTTONS 9 -#define PDC_N_EXTENDED_MOUSE_BUTTONS 6 - -typedef struct -{ - int x; /* absolute column, 0 based, measured in characters */ - int y; /* absolute row, 0 based, measured in characters */ - short button[3]; /* state of three "normal" buttons */ - int changes; /* flags indicating what has changed with the mouse */ - short xbutton[PDC_N_EXTENDED_MOUSE_BUTTONS]; /* state of ext buttons */ -} MOUSE_STATUS; - -#define BUTTON_RELEASED 0x0000 -#define BUTTON_PRESSED 0x0001 -#define BUTTON_CLICKED 0x0002 -#define BUTTON_DOUBLE_CLICKED 0x0003 -#define BUTTON_TRIPLE_CLICKED 0x0004 -#define BUTTON_MOVED 0x0005 /* PDCurses */ -#define WHEEL_SCROLLED 0x0006 /* PDCurses */ -#define BUTTON_ACTION_MASK 0x0007 /* PDCurses */ - -#define PDC_BUTTON_SHIFT 0x0008 /* PDCurses */ -#define PDC_BUTTON_CONTROL 0x0010 /* PDCurses */ -#define PDC_BUTTON_ALT 0x0020 /* PDCurses */ -#define BUTTON_MODIFIER_MASK 0x0038 /* PDCurses */ - -#define MOUSE_X_POS (Mouse_status.x) -#define MOUSE_Y_POS (Mouse_status.y) - -/* - * Bits associated with the .changes field: - * 3 2 1 0 - * 210987654321098765432109876543210 - * 1 <- button 1 has changed 0 - * 10 <- button 2 has changed 1 - * 100 <- button 3 has changed 2 - * 1000 <- mouse has moved 3 - * 10000 <- mouse position report 4 - * 100000 <- mouse wheel up 5 - * 1000000 <- mouse wheel down 6 - * 10000000 <- mouse wheel left 7 - * 100000000 <- mouse wheel right 8 - * 1000000000 <- button 4 has changed 9 - * (NOTE: buttons 6 to 10000000000 <- button 5 has changed 10 - * 9 aren't implemented 100000000000 <- button 6 has changed 11 - * in any flavor of 1000000000000 <- button 7 has changed 12 - * PDCurses yet!) 10000000000000 <- button 8 has changed 13 - * 100000000000000 <- button 9 has changed 14 - */ - -#define PDC_MOUSE_MOVED 0x0008 -#define PDC_MOUSE_POSITION 0x0010 -#define PDC_MOUSE_WHEEL_UP 0x0020 -#define PDC_MOUSE_WHEEL_DOWN 0x0040 -#define PDC_MOUSE_WHEEL_LEFT 0x0080 -#define PDC_MOUSE_WHEEL_RIGHT 0x0100 - -#define A_BUTTON_CHANGED (Mouse_status.changes & 7) -#define MOUSE_MOVED (Mouse_status.changes & PDC_MOUSE_MOVED) -#define MOUSE_POS_REPORT (Mouse_status.changes & PDC_MOUSE_POSITION) -#define BUTTON_CHANGED(x) (Mouse_status.changes & (1 << ((x) - ((x)<4 ? 1 : -5)))) -#define BUTTON_STATUS(x) (Mouse_status.button[(x) - 1]) -#define MOUSE_WHEEL_UP (Mouse_status.changes & PDC_MOUSE_WHEEL_UP) -#define MOUSE_WHEEL_DOWN (Mouse_status.changes & PDC_MOUSE_WHEEL_DOWN) -#define MOUSE_WHEEL_LEFT (Mouse_status.changes & PDC_MOUSE_WHEEL_LEFT) -#define MOUSE_WHEEL_RIGHT (Mouse_status.changes & PDC_MOUSE_WHEEL_RIGHT) - -/* mouse bit-masks */ - -#define BUTTON1_RELEASED 0x00000001L -#define BUTTON1_PRESSED 0x00000002L -#define BUTTON1_CLICKED 0x00000004L -#define BUTTON1_DOUBLE_CLICKED 0x00000008L -#define BUTTON1_TRIPLE_CLICKED 0x00000010L -#define BUTTON1_MOVED 0x00000010L /* PDCurses */ - -#define BUTTON2_RELEASED 0x00000020L -#define BUTTON2_PRESSED 0x00000040L -#define BUTTON2_CLICKED 0x00000080L -#define BUTTON2_DOUBLE_CLICKED 0x00000100L -#define BUTTON2_TRIPLE_CLICKED 0x00000200L -#define BUTTON2_MOVED 0x00000200L /* PDCurses */ - -#define BUTTON3_RELEASED 0x00000400L -#define BUTTON3_PRESSED 0x00000800L -#define BUTTON3_CLICKED 0x00001000L -#define BUTTON3_DOUBLE_CLICKED 0x00002000L -#define BUTTON3_TRIPLE_CLICKED 0x00004000L -#define BUTTON3_MOVED 0x00004000L /* PDCurses */ - -/* For the ncurses-compatible functions only, BUTTON4_PRESSED and - BUTTON5_PRESSED are returned for mouse scroll wheel up and down; - otherwise PDCurses doesn't support buttons 4 and 5... except - as described above for WinGUI, and perhaps to be extended to - other PDCurses flavors */ - -#define BUTTON4_RELEASED 0x00008000L -#define BUTTON4_PRESSED 0x00010000L -#define BUTTON4_CLICKED 0x00020000L -#define BUTTON4_DOUBLE_CLICKED 0x00040000L -#define BUTTON4_TRIPLE_CLICKED 0x00080000L - -#define BUTTON5_RELEASED 0x00100000L -#define BUTTON5_PRESSED 0x00200000L -#define BUTTON5_CLICKED 0x00400000L -#define BUTTON5_DOUBLE_CLICKED 0x00800000L -#define BUTTON5_TRIPLE_CLICKED 0x01000000L - -#define MOUSE_WHEEL_SCROLL 0x02000000L /* PDCurses */ -#define BUTTON_MODIFIER_SHIFT 0x04000000L /* PDCurses */ -#define BUTTON_MODIFIER_CONTROL 0x08000000L /* PDCurses */ -#define BUTTON_MODIFIER_ALT 0x10000000L /* PDCurses */ - -#define ALL_MOUSE_EVENTS 0x1fffffffL -#define REPORT_MOUSE_POSITION 0x20000000L - -/* ncurses mouse interface */ - -typedef unsigned long mmask_t; - -typedef struct -{ - short id; /* unused, always 0 */ - int x, y, z; /* x, y same as MOUSE_STATUS; z unused */ - mmask_t bstate; /* equivalent to changes + button[], but - in the same format as used for mousemask() */ -} MEVENT; - -#if defined(PDC_NCMOUSE) && !defined(NCURSES_MOUSE_VERSION) -# define NCURSES_MOUSE_VERSION 2 -#endif - -#ifdef NCURSES_MOUSE_VERSION -# define BUTTON_SHIFT BUTTON_MODIFIER_SHIFT -# define BUTTON_CONTROL BUTTON_MODIFIER_CONTROL -# define BUTTON_CTRL BUTTON_MODIFIER_CONTROL -# define BUTTON_ALT BUTTON_MODIFIER_ALT -#else -# define BUTTON_SHIFT PDC_BUTTON_SHIFT -# define BUTTON_CONTROL PDC_BUTTON_CONTROL -# define BUTTON_ALT PDC_BUTTON_ALT -#endif - -/*---------------------------------------------------------------------- - * - * Window and Screen Structures - * - */ - -typedef struct _win /* definition of a window */ -{ - int _cury; /* current pseudo-cursor */ - int _curx; - int _maxy; /* max window coordinates */ - int _maxx; - int _begy; /* origin on screen */ - int _begx; - int _flags; /* window properties */ - chtype _attrs; /* standard attributes and colors */ - chtype _bkgd; /* background, normally blank */ - bool _clear; /* causes clear at next refresh */ - bool _leaveit; /* leaves cursor where it is */ - bool _scroll; /* allows window scrolling */ - bool _nodelay; /* input character wait flag */ - bool _immed; /* immediate update flag */ - bool _sync; /* synchronise window ancestors */ - bool _use_keypad; /* flags keypad key mode active */ - chtype **_y; /* pointer to line pointer array */ - int *_firstch; /* first changed character in line */ - int *_lastch; /* last changed character in line */ - int _tmarg; /* top of scrolling region */ - int _bmarg; /* bottom of scrolling region */ - int _delayms; /* milliseconds of delay for getch() */ - int _parx, _pary; /* coords relative to parent (0,0) */ - struct _win *_parent; /* subwin's pointer to parent win */ -} WINDOW; - -/* Avoid using the SCREEN struct directly -- use the corresponding - functions if possible. This struct may eventually be made private. */ - -typedef struct -{ - bool alive; /* if initscr() called, and not endwin() */ - bool autocr; /* if cr -> lf */ - bool cbreak; /* if terminal unbuffered */ - bool echo; /* if terminal echo */ - bool raw_inp; /* raw input mode (v. cooked input) */ - bool raw_out; /* raw output mode (7 v. 8 bits) */ - bool audible; /* FALSE if the bell is visual */ - bool mono; /* TRUE if current screen is mono */ - bool resized; /* TRUE if TERM has been resized */ - bool orig_attr; /* TRUE if we have the original colors */ - short orig_fore; /* original screen foreground color */ - short orig_back; /* original screen foreground color */ - int cursrow; /* position of physical cursor */ - int curscol; /* position of physical cursor */ - int visibility; /* visibility of cursor */ - int orig_cursor; /* original cursor size */ - int lines; /* new value for LINES */ - int cols; /* new value for COLS */ - unsigned long _trap_mbe; /* trap these mouse button events */ - unsigned long _map_mbe_to_key; /* map mouse buttons to slk */ - int mouse_wait; /* time to wait (in ms) for a - button release after a press, in - order to count it as a click */ - int slklines; /* lines in use by slk_init() */ - WINDOW *slk_winptr; /* window for slk */ - int linesrippedoff; /* lines ripped off via ripoffline() */ - int linesrippedoffontop; /* lines ripped off on - top via ripoffline() */ - int delaytenths; /* 1/10ths second to wait block - getch() for */ - bool _preserve; /* TRUE if screen background - to be preserved */ - int _restore; /* specifies if screen background - to be restored, and how */ - bool save_key_modifiers; /* TRUE if each key modifiers saved - with each key press */ - bool return_key_modifiers; /* TRUE if modifier keys are - returned as "real" keys */ - bool key_code; /* TRUE if last key is a special key; - used internally by get_wch() */ -#ifdef XCURSES - int XcurscrSize; /* size of Xcurscr shared memory block */ - bool sb_on; - int sb_viewport_y; - int sb_viewport_x; - int sb_total_y; - int sb_total_x; - int sb_cur_y; - int sb_cur_x; - int exit_key; -#endif - short line_color; /* color of line attributes - default -1 */ -} SCREEN; - -/*---------------------------------------------------------------------- - * - * External Variables - * - */ - -#ifdef PDC_DLL_BUILD -# ifdef CURSES_LIBRARY -# define PDCEX __declspec(dllexport) extern -# else -# define PDCEX __declspec(dllimport) -# endif -#else -# define PDCEX extern -#endif - -PDCEX int LINES; /* terminal height */ -PDCEX int COLS; /* terminal width */ -PDCEX WINDOW *stdscr; /* the default screen window */ -PDCEX WINDOW *curscr; /* the current screen image */ -PDCEX SCREEN *SP; /* curses variables */ -PDCEX MOUSE_STATUS Mouse_status; -PDCEX int COLORS; -PDCEX int COLOR_PAIRS; -PDCEX int TABSIZE; -PDCEX chtype acs_map[]; /* alternate character set map */ -PDCEX char ttytype[]; /* terminal name/description */ -PDCEX PDC_version_info PDC_version; - -/*man-start************************************************************** - -Text Attributes -=============== - -Originally, PDCurses used a short (16 bits) for its chtype. To include -color, a number of things had to be sacrificed from the strict Unix and -System V support. The main problem was fitting all character attributes -and color into an unsigned char (all 8 bits!). - -Today, PDCurses by default uses a long (32 bits) for its chtype, as in -System V. The short chtype is still available, by undefining CHTYPE_LONG -and rebuilding the library. - -The following is the structure of a win->_attrs chtype: - -short form: - - +-----------------------------------------------+ - |15|14|13|12|11|10| 9| 8| 7| 6| 5| 4| 3| 2| 1| 0| - +-----------------------------------------------+ - color number | attrs | character eg 'a' - -The available non-color attributes are bold, reverse and blink. Others -have no effect. The high order char is an index into an array of -physical colors (defined in color.c) -- 32 foreground/background color -pairs (5 bits) plus 3 bits for other attributes. - -long form: - - +--------------------------------------------------------------------+ - |31|30|29|28|27|26|25|24|23|22|21|20|19|18|17|16|15|14|13|..| 2| 1| 0| - +--------------------------------------------------------------------+ - color number | modifiers | character eg 'a' - -The available non-color attributes are bold, underline, invisible, -right-line, left-line, protect, reverse and blink. 256 color pairs (8 -bits), 8 bits for other attributes, and 16 bits for character data. - - Note that there is now a "super-long" 64-bit form, available by -defining CHTYPE_LONG to be 2: - -------------------------------------------------------------------------------- -|63|62|61|60|59|..|34|33|32|31|30|29|28|..|22|21|20|19|18|17|16|..| 3| 2| 1| 0| -------------------------------------------------------------------------------- - color number | modifiers | character eg 'a' - - - We take five more bits for the character (thus allowing Unicode values -past 64K; UTF-16 can go up to 0x10ffff, requiring 21 bits total), and -four more bits for attributes. Three are currently used as A_OVERLINE, A_DIM, -and A_STRIKEOUT; one more is reserved for future use. 31 bits are then used -for color. These are usually just treated as the usual palette -indices, and range from 0 to 255. However, if bit 63 is -set, the remaining 30 bits are interpreted as foreground RGB (first -fifteen bits, five bits for each of the three channels) and background RGB -(same scheme using the remaining 15 bits.) - -**man-end****************************************************************/ - -/*** Video attribute macros ***/ - -#define A_NORMAL (chtype)0 - -#ifdef CHTYPE_LONG - -# if(CHTYPE_LONG >= 2) /* 64-bit chtypes */ - # define PDC_CHARTEXT_BITS 21 - # define A_CHARTEXT (chtype)( ((chtype)0x1 << PDC_CHARTEXT_BITS) - 1) - # define A_ALTCHARSET ((chtype)0x001 << PDC_CHARTEXT_BITS) - # define A_RIGHTLINE ((chtype)0x002 << PDC_CHARTEXT_BITS) - # define A_LEFTLINE ((chtype)0x004 << PDC_CHARTEXT_BITS) - # define A_INVIS ((chtype)0x008 << PDC_CHARTEXT_BITS) - # define A_UNDERLINE ((chtype)0x010 << PDC_CHARTEXT_BITS) - # define A_REVERSE ((chtype)0x020 << PDC_CHARTEXT_BITS) - # define A_BLINK ((chtype)0x040 << PDC_CHARTEXT_BITS) - # define A_BOLD ((chtype)0x080 << PDC_CHARTEXT_BITS) - # define A_OVERLINE ((chtype)0x100 << PDC_CHARTEXT_BITS) - # define A_STRIKEOUT ((chtype)0x200 << PDC_CHARTEXT_BITS) - # define A_DIM ((chtype)0x400 << PDC_CHARTEXT_BITS) -#if 0 - /* May come up with a use for this bit */ - /* someday; reserved for the future: */ - # define A_FUTURE_2 ((chtype)0x800 << PDC_CHARTEXT_BITS) -#endif - # define PDC_COLOR_SHIFT (PDC_CHARTEXT_BITS + 12) - # define A_COLOR ((chtype)0x7fffffff << PDC_COLOR_SHIFT) - # define A_RGB_COLOR ((chtype)0x40000000 << PDC_COLOR_SHIFT) - # define A_ATTRIBUTES (((chtype)0xfff << PDC_CHARTEXT_BITS) | A_COLOR) - # define A_RGB( rfore, gfore, bfore, rback, gback, bback) \ - (( (((chtype)(bfore) << 25) \ - | ((chtype)(gfore) << 20) \ - | ((chtype)(rfore) << 15) \ - | ((chtype)(bback) << 10) \ - | ((chtype)(gback) << 5) \ - | ((chtype)(rback) )) << PDC_COLOR_SHIFT) | A_RGB_COLOR) -# else /* plain ol' 32-bit chtypes */ - # define A_ALTCHARSET (chtype)0x00010000 - # define A_RIGHTLINE (chtype)0x00020000 - # define A_LEFTLINE (chtype)0x00040000 - # define A_INVIS (chtype)0x00080000 - # define A_UNDERLINE (chtype)0x00100000 - # define A_REVERSE (chtype)0x00200000 - # define A_BLINK (chtype)0x00400000 - # define A_BOLD (chtype)0x00800000 - # define A_COLOR (chtype)0xff000000 - # define A_RGB_COLOR A_NORMAL -#ifdef PDC_WIDE - # define A_CHARTEXT (chtype)0x0000ffff - # define A_ATTRIBUTES (chtype)0xffff0000 - # define A_DIM A_NORMAL - # define A_OVERLINE A_NORMAL - # define A_STRIKEOUT A_NORMAL -#else /* with 8-bit chars, we have bits for these attribs : */ - # define A_CHARTEXT (chtype)0x000000ff - # define A_ATTRIBUTES (chtype)0xffffe000 - # define A_DIM (chtype)0x00008000 - # define A_OVERLINE (chtype)0x00004000 - # define A_STRIKEOUT (chtype)0x00002000 -#endif - # define PDC_COLOR_SHIFT 24 -#endif - - -# define A_ITALIC A_INVIS -# define A_PROTECT (A_UNDERLINE | A_LEFTLINE | A_RIGHTLINE) - -#else /* 16-bit chtypes */ -# define A_BOLD (chtype)0x0100 /* X/Open */ -# define A_REVERSE (chtype)0x0200 /* X/Open */ -# define A_BLINK (chtype)0x0400 /* X/Open */ - -# define A_ATTRIBUTES (chtype)0xff00 /* X/Open */ -# define A_CHARTEXT (chtype)0x00ff /* X/Open */ -# define A_COLOR (chtype)0xf800 /* System V */ - -# define A_ALTCHARSET A_NORMAL /* X/Open */ -# define A_PROTECT A_NORMAL /* X/Open */ -# define A_UNDERLINE A_NORMAL /* X/Open */ -# define A_OVERLINE A_NORMAL /* X/Open */ -# define A_STRIKEOUT A_NORMAL /* X/Open */ - -# define A_LEFTLINE A_NORMAL -# define A_RIGHTLINE A_NORMAL -# define A_ITALIC A_NORMAL -# define A_INVIS A_NORMAL -# define A_RGB_COLOR A_NORMAL -# define A_DIM A_NORMAL - -# define PDC_COLOR_SHIFT 11 -#endif - -#define A_STANDOUT (A_REVERSE | A_BOLD) /* X/Open */ - -#define CHR_MSK A_CHARTEXT /* Obsolete */ -#define ATR_MSK A_ATTRIBUTES /* Obsolete */ -#define ATR_NRM A_NORMAL /* Obsolete */ - -/* For use with attr_t -- X/Open says, "these shall be distinct", so - this is a non-conforming implementation. */ - -#define WA_NORMAL A_NORMAL - -#define WA_ALTCHARSET A_ALTCHARSET -#define WA_BLINK A_BLINK -#define WA_BOLD A_BOLD -#define WA_DIM A_DIM -#define WA_INVIS A_INVIS -#define WA_LEFT A_LEFTLINE -#define WA_PROTECT A_PROTECT -#define WA_REVERSE A_REVERSE -#define WA_RIGHT A_RIGHTLINE -#define WA_STANDOUT A_STANDOUT -#define WA_UNDERLINE A_UNDERLINE - -#define WA_HORIZONTAL A_NORMAL -#define WA_LOW A_NORMAL -#define WA_TOP A_NORMAL -#define WA_VERTICAL A_NORMAL - -#define WA_ATTRIBUTES A_ATTRIBUTES - -/*** Alternate character set macros ***/ - -/* 'w' = 32-bit chtype; acs_map[] index | A_ALTCHARSET - 'n' = 16-bit chtype; it gets the fallback set because no bit is - available for A_ALTCHARSET */ - -#ifdef CHTYPE_LONG -# define PDC_ACS(w, n) ((chtype)w | A_ALTCHARSET) -#else -# define PDC_ACS(w, n) ((chtype)n) -#endif - -/* VT100-compatible symbols -- box chars */ - -#define ACS_LRCORNER PDC_ACS('V', '+') -#define ACS_URCORNER PDC_ACS('W', '+') -#define ACS_ULCORNER PDC_ACS('X', '+') -#define ACS_LLCORNER PDC_ACS('Y', '+') -#define ACS_PLUS PDC_ACS('Z', '+') -#define ACS_LTEE PDC_ACS('[', '+') -#define ACS_RTEE PDC_ACS('\\', '+') -#define ACS_BTEE PDC_ACS(']', '+') -#define ACS_TTEE PDC_ACS('^', '+') -#define ACS_HLINE PDC_ACS('_', '-') -#define ACS_VLINE PDC_ACS('`', '|') - -/* PDCurses-only ACS chars. Don't use if ncurses compatibility matters. -Some won't work in non-wide X11 builds (see 'acs_defs.h' for details). */ - -#define ACS_CENT PDC_ACS('{', 'c') -#define ACS_YEN PDC_ACS('|', 'y') -#define ACS_PESETA PDC_ACS('}', 'p') -#define ACS_HALF PDC_ACS('&', '/') -#define ACS_QUARTER PDC_ACS('\'', '/') -#define ACS_LEFT_ANG_QU PDC_ACS(')', '<') -#define ACS_RIGHT_ANG_QU PDC_ACS('*', '>') -#define ACS_D_HLINE PDC_ACS('a', '-') -#define ACS_D_VLINE PDC_ACS('b', '|') -#define ACS_CLUB PDC_ACS( 11, 'C') -#define ACS_HEART PDC_ACS( 12, 'H') -#define ACS_SPADE PDC_ACS( 13, 'S') -#define ACS_SMILE PDC_ACS( 14, 'O') -#define ACS_REV_SMILE PDC_ACS( 15, 'O') -#define ACS_MED_BULLET PDC_ACS( 16, '.') -#define ACS_WHITE_BULLET PDC_ACS( 17, 'O') -#define ACS_PILCROW PDC_ACS( 18, 'O') -#define ACS_SECTION PDC_ACS( 19, 'O') - -#define ACS_SUP2 PDC_ACS(',', '2') -#define ACS_ALPHA PDC_ACS('.', 'a') -#define ACS_BETA PDC_ACS('/', 'b') -#define ACS_GAMMA PDC_ACS('0', 'y') -#define ACS_UP_SIGMA PDC_ACS('1', 'S') -#define ACS_LO_SIGMA PDC_ACS('2', 's') -#define ACS_MU PDC_ACS('4', 'u') -#define ACS_TAU PDC_ACS('5', 't') -#define ACS_UP_PHI PDC_ACS('6', 'F') -#define ACS_THETA PDC_ACS('7', 't') -#define ACS_OMEGA PDC_ACS('8', 'w') -#define ACS_DELTA PDC_ACS('9', 'd') -#define ACS_INFINITY PDC_ACS('-', 'i') -#define ACS_LO_PHI PDC_ACS( 22, 'f') -#define ACS_EPSILON PDC_ACS(':', 'e') -#define ACS_INTERSECT PDC_ACS('e', 'u') -#define ACS_TRIPLE_BAR PDC_ACS('f', '=') -#define ACS_DIVISION PDC_ACS('c', '/') -#define ACS_APPROX_EQ PDC_ACS('d', '~') -#define ACS_SM_BULLET PDC_ACS('g', '.') -#define ACS_SQUARE_ROOT PDC_ACS('i', '!') -#define ACS_UBLOCK PDC_ACS('p', '^') -#define ACS_BBLOCK PDC_ACS('q', '_') -#define ACS_LBLOCK PDC_ACS('r', '<') -#define ACS_RBLOCK PDC_ACS('s', '>') - -#define ACS_A_ORDINAL PDC_ACS(20, 'a') -#define ACS_O_ORDINAL PDC_ACS(21, 'o') -#define ACS_INV_QUERY PDC_ACS(24, '?') -#define ACS_REV_NOT PDC_ACS(25, '!') -#define ACS_NOT PDC_ACS(26, '!') -#define ACS_INV_BANG PDC_ACS(23, '!') -#define ACS_UP_INTEGRAL PDC_ACS(27, '|') -#define ACS_LO_INTEGRAL PDC_ACS(28, '|') -#define ACS_SUP_N PDC_ACS(29, 'n') -#define ACS_CENTER_SQU PDC_ACS(30, 'x') -#define ACS_F_WITH_HOOK PDC_ACS(31, 'f') - -#define ACS_SD_LRCORNER PDC_ACS(';', '+') -#define ACS_SD_URCORNER PDC_ACS('<', '+') -#define ACS_SD_ULCORNER PDC_ACS('=', '+') -#define ACS_SD_LLCORNER PDC_ACS('>', '+') -#define ACS_SD_PLUS PDC_ACS('?', '+') -#define ACS_SD_LTEE PDC_ACS('@', '+') -#define ACS_SD_RTEE PDC_ACS('A', '+') -#define ACS_SD_BTEE PDC_ACS('B', '+') -#define ACS_SD_TTEE PDC_ACS('C', '+') - -#define ACS_D_LRCORNER PDC_ACS('D', '+') -#define ACS_D_URCORNER PDC_ACS('E', '+') -#define ACS_D_ULCORNER PDC_ACS('F', '+') -#define ACS_D_LLCORNER PDC_ACS('G', '+') -#define ACS_D_PLUS PDC_ACS('H', '+') -#define ACS_D_LTEE PDC_ACS('I', '+') -#define ACS_D_RTEE PDC_ACS('J', '+') -#define ACS_D_BTEE PDC_ACS('K', '+') -#define ACS_D_TTEE PDC_ACS('L', '+') - -#define ACS_DS_LRCORNER PDC_ACS('M', '+') -#define ACS_DS_URCORNER PDC_ACS('N', '+') -#define ACS_DS_ULCORNER PDC_ACS('O', '+') -#define ACS_DS_LLCORNER PDC_ACS('P', '+') -#define ACS_DS_PLUS PDC_ACS('Q', '+') -#define ACS_DS_LTEE PDC_ACS('R', '+') -#define ACS_DS_RTEE PDC_ACS('S', '+') -#define ACS_DS_BTEE PDC_ACS('T', '+') -#define ACS_DS_TTEE PDC_ACS('U', '+') - -/* VT100-compatible symbols -- other */ - -#define ACS_S1 PDC_ACS('l', '-') -#define ACS_S9 PDC_ACS('o', '_') -#define ACS_DIAMOND PDC_ACS('j', '+') -#define ACS_CKBOARD PDC_ACS('k', ':') -#define ACS_DEGREE PDC_ACS('w', '\'') -#define ACS_PLMINUS PDC_ACS('x', '#') -#define ACS_BULLET PDC_ACS('h', 'o') - -/* Teletype 5410v1 symbols -- these are defined in SysV curses, but - are not well-supported by most terminals. Stick to VT100 characters - for optimum portability. */ - -#define ACS_LARROW PDC_ACS('!', '<') -#define ACS_RARROW PDC_ACS(' ', '>') -#define ACS_DARROW PDC_ACS('#', 'v') -#define ACS_UARROW PDC_ACS('"', '^') -#define ACS_BOARD PDC_ACS('+', '#') -#define ACS_LTBOARD PDC_ACS('y', '#') -#define ACS_LANTERN PDC_ACS('z', '*') -#define ACS_BLOCK PDC_ACS('t', '#') - -/* That goes double for these -- undocumented SysV symbols. Don't use - them. */ - -#define ACS_S3 PDC_ACS('m', '-') -#define ACS_S7 PDC_ACS('n', '-') -#define ACS_LEQUAL PDC_ACS('u', '<') -#define ACS_GEQUAL PDC_ACS('v', '>') -#define ACS_PI PDC_ACS('$', 'n') -#define ACS_NEQUAL PDC_ACS('%', '+') -#define ACS_STERLING PDC_ACS('~', 'L') - -/* Box char aliases */ - -#define ACS_BSSB ACS_ULCORNER -#define ACS_SSBB ACS_LLCORNER -#define ACS_BBSS ACS_URCORNER -#define ACS_SBBS ACS_LRCORNER -#define ACS_SBSS ACS_RTEE -#define ACS_SSSB ACS_LTEE -#define ACS_SSBS ACS_BTEE -#define ACS_BSSS ACS_TTEE -#define ACS_BSBS ACS_HLINE -#define ACS_SBSB ACS_VLINE -#define ACS_SSSS ACS_PLUS - -/* cchar_t aliases */ - -#ifdef PDC_WIDE -# define WACS_LRCORNER (&(acs_map['V'])) -# define WACS_URCORNER (&(acs_map['W'])) -# define WACS_ULCORNER (&(acs_map['X'])) -# define WACS_LLCORNER (&(acs_map['Y'])) -# define WACS_PLUS (&(acs_map['Z'])) -# define WACS_LTEE (&(acs_map['['])) -# define WACS_RTEE (&(acs_map['\\'])) -# define WACS_BTEE (&(acs_map[']'])) -# define WACS_TTEE (&(acs_map['^'])) -# define WACS_HLINE (&(acs_map['_'])) -# define WACS_VLINE (&(acs_map['`'])) - -# define WACS_CENT (&(acs_map['{'])) -# define WACS_YEN (&(acs_map['|'])) -# define WACS_PESETA (&(acs_map['}'])) -# define WACS_HALF (&(acs_map['&'])) -# define WACS_QUARTER (&(acs_map['\''])) -# define WACS_LEFT_ANG_QU (&(acs_map[')'])) -# define WACS_RIGHT_ANG_QU (&(acs_map['*'])) -# define WACS_D_HLINE (&(acs_map['a'])) -# define WACS_D_VLINE (&(acs_map['b'])) -# define WACS_CLUB (&(acs_map[ 11])) -# define WACS_HEART (&(acs_map[ 12])) -# define WACS_SPADE (&(acs_map[ 13])) -# define WACS_SMILE (&(acs_map[ 14])) -# define WACS_REV_SMILE (&(acs_map[ 15])) -# define WACS_MED_BULLET (&(acs_map[ 16])) -# define WACS_WHITE_BULLET (&(acs_map[ 17])) -# define WACS_PILCROW (&(acs_map[ 18])) -# define WACS_SECTION (&(acs_map[ 19])) - -# define WACS_SUP2 (&(acs_map[','])) -# define WACS_ALPHA (&(acs_map['.'])) -# define WACS_BETA (&(acs_map['/'])) -# define WACS_GAMMA (&(acs_map['0'])) -# define WACS_UP_SIGMA (&(acs_map['1'])) -# define WACS_LO_SIGMA (&(acs_map['2'])) -# define WACS_MU (&(acs_map['4'])) -# define WACS_TAU (&(acs_map['5'])) -# define WACS_UP_PHI (&(acs_map['6'])) -# define WACS_THETA (&(acs_map['7'])) -# define WACS_OMEGA (&(acs_map['8'])) -# define WACS_DELTA (&(acs_map['9'])) -# define WACS_INFINITY (&(acs_map['-'])) -# define WACS_LO_PHI (&(acs_map[ 22])) -# define WACS_EPSILON (&(acs_map[':'])) -# define WACS_INTERSECT (&(acs_map['e'])) -# define WACS_TRIPLE_BAR (&(acs_map['f'])) -# define WACS_DIVISION (&(acs_map['c'])) -# define WACS_APPROX_EQ (&(acs_map['d'])) -# define WACS_SM_BULLET (&(acs_map['g'])) -# define WACS_SQUARE_ROOT (&(acs_map['i'])) -# define WACS_UBLOCK (&(acs_map['p'])) -# define WACS_BBLOCK (&(acs_map['q'])) -# define WACS_LBLOCK (&(acs_map['r'])) -# define WACS_RBLOCK (&(acs_map['s'])) - -# define WACS_A_ORDINAL (&(acs_map[20])) -# define WACS_O_ORDINAL (&(acs_map[21])) -# define WACS_INV_QUERY (&(acs_map[24])) -# define WACS_REV_NOT (&(acs_map[25])) -# define WACS_NOT (&(acs_map[26])) -# define WACS_INV_BANG (&(acs_map[23])) -# define WACS_UP_INTEGRAL (&(acs_map[27])) -# define WACS_LO_INTEGRAL (&(acs_map[28])) -# define WACS_SUP_N (&(acs_map[29])) -# define WACS_CENTER_SQU (&(acs_map[30])) -# define WACS_F_WITH_HOOK (&(acs_map[31])) - -# define WACS_SD_LRCORNER (&(acs_map[';'])) -# define WACS_SD_URCORNER (&(acs_map['<'])) -# define WACS_SD_ULCORNER (&(acs_map['='])) -# define WACS_SD_LLCORNER (&(acs_map['>'])) -# define WACS_SD_PLUS (&(acs_map['?'])) -# define WACS_SD_LTEE (&(acs_map['@'])) -# define WACS_SD_RTEE (&(acs_map['A'])) -# define WACS_SD_BTEE (&(acs_map['B'])) -# define WACS_SD_TTEE (&(acs_map['C'])) - -# define WACS_D_LRCORNER (&(acs_map['D'])) -# define WACS_D_URCORNER (&(acs_map['E'])) -# define WACS_D_ULCORNER (&(acs_map['F'])) -# define WACS_D_LLCORNER (&(acs_map['G'])) -# define WACS_D_PLUS (&(acs_map['H'])) -# define WACS_D_LTEE (&(acs_map['I'])) -# define WACS_D_RTEE (&(acs_map['J'])) -# define WACS_D_BTEE (&(acs_map['K'])) -# define WACS_D_TTEE (&(acs_map['L'])) - -# define WACS_DS_LRCORNER (&(acs_map['M'])) -# define WACS_DS_URCORNER (&(acs_map['N'])) -# define WACS_DS_ULCORNER (&(acs_map['O'])) -# define WACS_DS_LLCORNER (&(acs_map['P'])) -# define WACS_DS_PLUS (&(acs_map['Q'])) -# define WACS_DS_LTEE (&(acs_map['R'])) -# define WACS_DS_RTEE (&(acs_map['S'])) -# define WACS_DS_BTEE (&(acs_map['T'])) -# define WACS_DS_TTEE (&(acs_map['U'])) - -# define WACS_S1 (&(acs_map['l'])) -# define WACS_S9 (&(acs_map['o'])) -# define WACS_DIAMOND (&(acs_map['j'])) -# define WACS_CKBOARD (&(acs_map['k'])) -# define WACS_DEGREE (&(acs_map['w'])) -# define WACS_PLMINUS (&(acs_map['x'])) -# define WACS_BULLET (&(acs_map['h'])) - - -# define WACS_LARROW (&(acs_map['!'])) -# define WACS_RARROW (&(acs_map[' '])) -# define WACS_DARROW (&(acs_map['#'])) -# define WACS_UARROW (&(acs_map['"'])) -# define WACS_BOARD (&(acs_map['+'])) -# define WACS_LTBOARD (&(acs_map['y'])) -# define WACS_LANTERN (&(acs_map['z'])) -# define WACS_BLOCK (&(acs_map['t'])) - -# define WACS_S3 (&(acs_map['m'])) -# define WACS_S7 (&(acs_map['n'])) -# define WACS_LEQUAL (&(acs_map['u'])) -# define WACS_GEQUAL (&(acs_map['v'])) -# define WACS_PI (&(acs_map['$'])) -# define WACS_NEQUAL (&(acs_map['%'])) -# define WACS_STERLING (&(acs_map['~'])) - -# define WACS_BSSB WACS_ULCORNER -# define WACS_SSBB WACS_LLCORNER -# define WACS_BBSS WACS_URCORNER -# define WACS_SBBS WACS_LRCORNER -# define WACS_SBSS WACS_RTEE -# define WACS_SSSB WACS_LTEE -# define WACS_SSBS WACS_BTEE -# define WACS_BSSS WACS_TTEE -# define WACS_BSBS WACS_HLINE -# define WACS_SBSB WACS_VLINE -# define WACS_SSSS WACS_PLUS -#endif - -/*** Color macros ***/ - -#define COLOR_BLACK 0 - -#ifdef PDC_RGB /* RGB */ -# define COLOR_RED 1 -# define COLOR_GREEN 2 -# define COLOR_BLUE 4 -#else /* BGR */ -# define COLOR_BLUE 1 -# define COLOR_GREEN 2 -# define COLOR_RED 4 -#endif - -#define COLOR_CYAN (COLOR_BLUE | COLOR_GREEN) -#define COLOR_MAGENTA (COLOR_RED | COLOR_BLUE) -#define COLOR_YELLOW (COLOR_RED | COLOR_GREEN) - -#define COLOR_WHITE 7 - -/*---------------------------------------------------------------------- - * - * Function and Keypad Key Definitions - * Many are just for compatibility - * - */ - -#ifdef PDC_WIDE - #define KEY_OFFSET 0xec00 -#else - #define KEY_OFFSET 0x100 -#endif - -#define KEY_CODE_YES (KEY_OFFSET + 0x00) /* If get_wch() gives a key code */ - -#define KEY_BREAK (KEY_OFFSET + 0x01) /* Not on PC KBD */ -#define KEY_DOWN (KEY_OFFSET + 0x02) /* Down arrow key */ -#define KEY_UP (KEY_OFFSET + 0x03) /* Up arrow key */ -#define KEY_LEFT (KEY_OFFSET + 0x04) /* Left arrow key */ -#define KEY_RIGHT (KEY_OFFSET + 0x05) /* Right arrow key */ -#define KEY_HOME (KEY_OFFSET + 0x06) /* home key */ -#define KEY_BACKSPACE (KEY_OFFSET + 0x07) /* not on pc */ -#define KEY_F0 (KEY_OFFSET + 0x08) /* function keys; 64 reserved */ - -#define KEY_DL (KEY_OFFSET + 0x48) /* delete line */ -#define KEY_IL (KEY_OFFSET + 0x49) /* insert line */ -#define KEY_DC (KEY_OFFSET + 0x4a) /* delete character */ -#define KEY_IC (KEY_OFFSET + 0x4b) /* insert char or enter ins mode */ -#define KEY_EIC (KEY_OFFSET + 0x4c) /* exit insert char mode */ -#define KEY_CLEAR (KEY_OFFSET + 0x4d) /* clear screen */ -#define KEY_EOS (KEY_OFFSET + 0x4e) /* clear to end of screen */ -#define KEY_EOL (KEY_OFFSET + 0x4f) /* clear to end of line */ -#define KEY_SF (KEY_OFFSET + 0x50) /* scroll 1 line forward */ -#define KEY_SR (KEY_OFFSET + 0x51) /* scroll 1 line back (reverse) */ -#define KEY_NPAGE (KEY_OFFSET + 0x52) /* next page */ -#define KEY_PPAGE (KEY_OFFSET + 0x53) /* previous page */ -#define KEY_STAB (KEY_OFFSET + 0x54) /* set tab */ -#define KEY_CTAB (KEY_OFFSET + 0x55) /* clear tab */ -#define KEY_CATAB (KEY_OFFSET + 0x56) /* clear all tabs */ -#define KEY_ENTER (KEY_OFFSET + 0x57) /* enter or send (unreliable) */ -#define KEY_SRESET (KEY_OFFSET + 0x58) /* soft/reset (partial/unreliable) */ -#define KEY_RESET (KEY_OFFSET + 0x59) /* reset/hard reset (unreliable) */ -#define KEY_PRINT (KEY_OFFSET + 0x5a) /* print/copy */ -#define KEY_LL (KEY_OFFSET + 0x5b) /* home down/bottom (lower left) */ -#define KEY_ABORT (KEY_OFFSET + 0x5c) /* abort/terminate key (any) */ -#define KEY_SHELP (KEY_OFFSET + 0x5d) /* short help */ -#define KEY_LHELP (KEY_OFFSET + 0x5e) /* long help */ -#define KEY_BTAB (KEY_OFFSET + 0x5f) /* Back tab key */ -#define KEY_BEG (KEY_OFFSET + 0x60) /* beg(inning) key */ -#define KEY_CANCEL (KEY_OFFSET + 0x61) /* cancel key */ -#define KEY_CLOSE (KEY_OFFSET + 0x62) /* close key */ -#define KEY_COMMAND (KEY_OFFSET + 0x63) /* cmd (command) key */ -#define KEY_COPY (KEY_OFFSET + 0x64) /* copy key */ -#define KEY_CREATE (KEY_OFFSET + 0x65) /* create key */ -#define KEY_END (KEY_OFFSET + 0x66) /* end key */ -#define KEY_EXIT (KEY_OFFSET + 0x67) /* exit key */ -#define KEY_FIND (KEY_OFFSET + 0x68) /* find key */ -#define KEY_HELP (KEY_OFFSET + 0x69) /* help key */ -#define KEY_MARK (KEY_OFFSET + 0x6a) /* mark key */ -#define KEY_MESSAGE (KEY_OFFSET + 0x6b) /* message key */ -#define KEY_MOVE (KEY_OFFSET + 0x6c) /* move key */ -#define KEY_NEXT (KEY_OFFSET + 0x6d) /* next object key */ -#define KEY_OPEN (KEY_OFFSET + 0x6e) /* open key */ -#define KEY_OPTIONS (KEY_OFFSET + 0x6f) /* options key */ -#define KEY_PREVIOUS (KEY_OFFSET + 0x70) /* previous object key */ -#define KEY_REDO (KEY_OFFSET + 0x71) /* redo key */ -#define KEY_REFERENCE (KEY_OFFSET + 0x72) /* ref(erence) key */ -#define KEY_REFRESH (KEY_OFFSET + 0x73) /* refresh key */ -#define KEY_REPLACE (KEY_OFFSET + 0x74) /* replace key */ -#define KEY_RESTART (KEY_OFFSET + 0x75) /* restart key */ -#define KEY_RESUME (KEY_OFFSET + 0x76) /* resume key */ -#define KEY_SAVE (KEY_OFFSET + 0x77) /* save key */ -#define KEY_SBEG (KEY_OFFSET + 0x78) /* shifted beginning key */ -#define KEY_SCANCEL (KEY_OFFSET + 0x79) /* shifted cancel key */ -#define KEY_SCOMMAND (KEY_OFFSET + 0x7a) /* shifted command key */ -#define KEY_SCOPY (KEY_OFFSET + 0x7b) /* shifted copy key */ -#define KEY_SCREATE (KEY_OFFSET + 0x7c) /* shifted create key */ -#define KEY_SDC (KEY_OFFSET + 0x7d) /* shifted delete char key */ -#define KEY_SDL (KEY_OFFSET + 0x7e) /* shifted delete line key */ -#define KEY_SELECT (KEY_OFFSET + 0x7f) /* select key */ -#define KEY_SEND (KEY_OFFSET + 0x80) /* shifted end key */ -#define KEY_SEOL (KEY_OFFSET + 0x81) /* shifted clear line key */ -#define KEY_SEXIT (KEY_OFFSET + 0x82) /* shifted exit key */ -#define KEY_SFIND (KEY_OFFSET + 0x83) /* shifted find key */ -#define KEY_SHOME (KEY_OFFSET + 0x84) /* shifted home key */ -#define KEY_SIC (KEY_OFFSET + 0x85) /* shifted input key */ - -#define KEY_SLEFT (KEY_OFFSET + 0x87) /* shifted left arrow key */ -#define KEY_SMESSAGE (KEY_OFFSET + 0x88) /* shifted message key */ -#define KEY_SMOVE (KEY_OFFSET + 0x89) /* shifted move key */ -#define KEY_SNEXT (KEY_OFFSET + 0x8a) /* shifted next key */ -#define KEY_SOPTIONS (KEY_OFFSET + 0x8b) /* shifted options key */ -#define KEY_SPREVIOUS (KEY_OFFSET + 0x8c) /* shifted prev key */ -#define KEY_SPRINT (KEY_OFFSET + 0x8d) /* shifted print key */ -#define KEY_SREDO (KEY_OFFSET + 0x8e) /* shifted redo key */ -#define KEY_SREPLACE (KEY_OFFSET + 0x8f) /* shifted replace key */ -#define KEY_SRIGHT (KEY_OFFSET + 0x90) /* shifted right arrow */ -#define KEY_SRSUME (KEY_OFFSET + 0x91) /* shifted resume key */ -#define KEY_SSAVE (KEY_OFFSET + 0x92) /* shifted save key */ -#define KEY_SSUSPEND (KEY_OFFSET + 0x93) /* shifted suspend key */ -#define KEY_SUNDO (KEY_OFFSET + 0x94) /* shifted undo key */ -#define KEY_SUSPEND (KEY_OFFSET + 0x95) /* suspend key */ -#define KEY_UNDO (KEY_OFFSET + 0x96) /* undo key */ - -/* PDCurses-specific key definitions -- PC only */ - -#define ALT_0 (KEY_OFFSET + 0x97) -#define ALT_1 (KEY_OFFSET + 0x98) -#define ALT_2 (KEY_OFFSET + 0x99) -#define ALT_3 (KEY_OFFSET + 0x9a) -#define ALT_4 (KEY_OFFSET + 0x9b) -#define ALT_5 (KEY_OFFSET + 0x9c) -#define ALT_6 (KEY_OFFSET + 0x9d) -#define ALT_7 (KEY_OFFSET + 0x9e) -#define ALT_8 (KEY_OFFSET + 0x9f) -#define ALT_9 (KEY_OFFSET + 0xa0) -#define ALT_A (KEY_OFFSET + 0xa1) -#define ALT_B (KEY_OFFSET + 0xa2) -#define ALT_C (KEY_OFFSET + 0xa3) -#define ALT_D (KEY_OFFSET + 0xa4) -#define ALT_E (KEY_OFFSET + 0xa5) -#define ALT_F (KEY_OFFSET + 0xa6) -#define ALT_G (KEY_OFFSET + 0xa7) -#define ALT_H (KEY_OFFSET + 0xa8) -#define ALT_I (KEY_OFFSET + 0xa9) -#define ALT_J (KEY_OFFSET + 0xaa) -#define ALT_K (KEY_OFFSET + 0xab) -#define ALT_L (KEY_OFFSET + 0xac) -#define ALT_M (KEY_OFFSET + 0xad) -#define ALT_N (KEY_OFFSET + 0xae) -#define ALT_O (KEY_OFFSET + 0xaf) -#define ALT_P (KEY_OFFSET + 0xb0) -#define ALT_Q (KEY_OFFSET + 0xb1) -#define ALT_R (KEY_OFFSET + 0xb2) -#define ALT_S (KEY_OFFSET + 0xb3) -#define ALT_T (KEY_OFFSET + 0xb4) -#define ALT_U (KEY_OFFSET + 0xb5) -#define ALT_V (KEY_OFFSET + 0xb6) -#define ALT_W (KEY_OFFSET + 0xb7) -#define ALT_X (KEY_OFFSET + 0xb8) -#define ALT_Y (KEY_OFFSET + 0xb9) -#define ALT_Z (KEY_OFFSET + 0xba) - -#define CTL_LEFT (KEY_OFFSET + 0xbb) /* Control-Left-Arrow */ -#define CTL_RIGHT (KEY_OFFSET + 0xbc) -#define CTL_PGUP (KEY_OFFSET + 0xbd) -#define CTL_PGDN (KEY_OFFSET + 0xbe) -#define CTL_HOME (KEY_OFFSET + 0xbf) -#define CTL_END (KEY_OFFSET + 0xc0) - -#define KEY_A1 (KEY_OFFSET + 0xc1) /* upper left on Virtual keypad */ -#define KEY_A2 (KEY_OFFSET + 0xc2) /* upper middle on Virt. keypad */ -#define KEY_A3 (KEY_OFFSET + 0xc3) /* upper right on Vir. keypad */ -#define KEY_B1 (KEY_OFFSET + 0xc4) /* middle left on Virt. keypad */ -#define KEY_B2 (KEY_OFFSET + 0xc5) /* center on Virt. keypad */ -#define KEY_B3 (KEY_OFFSET + 0xc6) /* middle right on Vir. keypad */ -#define KEY_C1 (KEY_OFFSET + 0xc7) /* lower left on Virt. keypad */ -#define KEY_C2 (KEY_OFFSET + 0xc8) /* lower middle on Virt. keypad */ -#define KEY_C3 (KEY_OFFSET + 0xc9) /* lower right on Vir. keypad */ - -#define PADSLASH (KEY_OFFSET + 0xca) /* slash on keypad */ -#define PADENTER (KEY_OFFSET + 0xcb) /* enter on keypad */ -#define CTL_PADENTER (KEY_OFFSET + 0xcc) /* ctl-enter on keypad */ -#define ALT_PADENTER (KEY_OFFSET + 0xcd) /* alt-enter on keypad */ -#define PADSTOP (KEY_OFFSET + 0xce) /* stop on keypad */ -#define PADSTAR (KEY_OFFSET + 0xcf) /* star on keypad */ -#define PADMINUS (KEY_OFFSET + 0xd0) /* minus on keypad */ -#define PADPLUS (KEY_OFFSET + 0xd1) /* plus on keypad */ -#define CTL_PADSTOP (KEY_OFFSET + 0xd2) /* ctl-stop on keypad */ -#define CTL_PADCENTER (KEY_OFFSET + 0xd3) /* ctl-enter on keypad */ -#define CTL_PADPLUS (KEY_OFFSET + 0xd4) /* ctl-plus on keypad */ -#define CTL_PADMINUS (KEY_OFFSET + 0xd5) /* ctl-minus on keypad */ -#define CTL_PADSLASH (KEY_OFFSET + 0xd6) /* ctl-slash on keypad */ -#define CTL_PADSTAR (KEY_OFFSET + 0xd7) /* ctl-star on keypad */ -#define ALT_PADPLUS (KEY_OFFSET + 0xd8) /* alt-plus on keypad */ -#define ALT_PADMINUS (KEY_OFFSET + 0xd9) /* alt-minus on keypad */ -#define ALT_PADSLASH (KEY_OFFSET + 0xda) /* alt-slash on keypad */ -#define ALT_PADSTAR (KEY_OFFSET + 0xdb) /* alt-star on keypad */ -#define ALT_PADSTOP (KEY_OFFSET + 0xdc) /* alt-stop on keypad */ -#define CTL_INS (KEY_OFFSET + 0xdd) /* ctl-insert */ -#define ALT_DEL (KEY_OFFSET + 0xde) /* alt-delete */ -#define ALT_INS (KEY_OFFSET + 0xdf) /* alt-insert */ -#define CTL_UP (KEY_OFFSET + 0xe0) /* ctl-up arrow */ -#define CTL_DOWN (KEY_OFFSET + 0xe1) /* ctl-down arrow */ -#define CTL_TAB (KEY_OFFSET + 0xe2) /* ctl-tab */ -#define ALT_TAB (KEY_OFFSET + 0xe3) -#define ALT_MINUS (KEY_OFFSET + 0xe4) -#define ALT_EQUAL (KEY_OFFSET + 0xe5) -#define ALT_HOME (KEY_OFFSET + 0xe6) -#define ALT_PGUP (KEY_OFFSET + 0xe7) -#define ALT_PGDN (KEY_OFFSET + 0xe8) -#define ALT_END (KEY_OFFSET + 0xe9) -#define ALT_UP (KEY_OFFSET + 0xea) /* alt-up arrow */ -#define ALT_DOWN (KEY_OFFSET + 0xeb) /* alt-down arrow */ -#define ALT_RIGHT (KEY_OFFSET + 0xec) /* alt-right arrow */ -#define ALT_LEFT (KEY_OFFSET + 0xed) /* alt-left arrow */ -#define ALT_ENTER (KEY_OFFSET + 0xee) /* alt-enter */ -#define ALT_ESC (KEY_OFFSET + 0xef) /* alt-escape */ -#define ALT_BQUOTE (KEY_OFFSET + 0xf0) /* alt-back quote */ -#define ALT_LBRACKET (KEY_OFFSET + 0xf1) /* alt-left bracket */ -#define ALT_RBRACKET (KEY_OFFSET + 0xf2) /* alt-right bracket */ -#define ALT_SEMICOLON (KEY_OFFSET + 0xf3) /* alt-semi-colon */ -#define ALT_FQUOTE (KEY_OFFSET + 0xf4) /* alt-forward quote */ -#define ALT_COMMA (KEY_OFFSET + 0xf5) /* alt-comma */ -#define ALT_STOP (KEY_OFFSET + 0xf6) /* alt-stop */ -#define ALT_FSLASH (KEY_OFFSET + 0xf7) /* alt-forward slash */ -#define ALT_BKSP (KEY_OFFSET + 0xf8) /* alt-backspace */ -#define CTL_BKSP (KEY_OFFSET + 0xf9) /* ctl-backspace */ -#define PAD0 (KEY_OFFSET + 0xfa) /* keypad 0 */ - -#define CTL_PAD0 (KEY_OFFSET + 0xfb) /* ctl-keypad 0 */ -#define CTL_PAD1 (KEY_OFFSET + 0xfc) -#define CTL_PAD2 (KEY_OFFSET + 0xfd) -#define CTL_PAD3 (KEY_OFFSET + 0xfe) -#define CTL_PAD4 (KEY_OFFSET + 0xff) -#define CTL_PAD5 (KEY_OFFSET + 0x100) -#define CTL_PAD6 (KEY_OFFSET + 0x101) -#define CTL_PAD7 (KEY_OFFSET + 0x102) -#define CTL_PAD8 (KEY_OFFSET + 0x103) -#define CTL_PAD9 (KEY_OFFSET + 0x104) - -#define ALT_PAD0 (KEY_OFFSET + 0x105) /* alt-keypad 0 */ -#define ALT_PAD1 (KEY_OFFSET + 0x106) -#define ALT_PAD2 (KEY_OFFSET + 0x107) -#define ALT_PAD3 (KEY_OFFSET + 0x108) -#define ALT_PAD4 (KEY_OFFSET + 0x109) -#define ALT_PAD5 (KEY_OFFSET + 0x10a) -#define ALT_PAD6 (KEY_OFFSET + 0x10b) -#define ALT_PAD7 (KEY_OFFSET + 0x10c) -#define ALT_PAD8 (KEY_OFFSET + 0x10d) -#define ALT_PAD9 (KEY_OFFSET + 0x10e) - -#define CTL_DEL (KEY_OFFSET + 0x10f) /* clt-delete */ -#define ALT_BSLASH (KEY_OFFSET + 0x110) /* alt-back slash */ -#define CTL_ENTER (KEY_OFFSET + 0x111) /* ctl-enter */ - -#define SHF_PADENTER (KEY_OFFSET + 0x112) /* shift-enter on keypad */ -#define SHF_PADSLASH (KEY_OFFSET + 0x113) /* shift-slash on keypad */ -#define SHF_PADSTAR (KEY_OFFSET + 0x114) /* shift-star on keypad */ -#define SHF_PADPLUS (KEY_OFFSET + 0x115) /* shift-plus on keypad */ -#define SHF_PADMINUS (KEY_OFFSET + 0x116) /* shift-minus on keypad */ -#define SHF_UP (KEY_OFFSET + 0x117) /* shift-up on keypad */ -#define SHF_DOWN (KEY_OFFSET + 0x118) /* shift-down on keypad */ -#define SHF_IC (KEY_OFFSET + 0x119) /* shift-insert on keypad */ -#define SHF_DC (KEY_OFFSET + 0x11a) /* shift-delete on keypad */ - -#define KEY_MOUSE (KEY_OFFSET + 0x11b) /* "mouse" key */ -#define KEY_SHIFT_L (KEY_OFFSET + 0x11c) /* Left-shift */ -#define KEY_SHIFT_R (KEY_OFFSET + 0x11d) /* Right-shift */ -#define KEY_CONTROL_L (KEY_OFFSET + 0x11e) /* Left-control */ -#define KEY_CONTROL_R (KEY_OFFSET + 0x11f) /* Right-control */ -#define KEY_ALT_L (KEY_OFFSET + 0x120) /* Left-alt */ -#define KEY_ALT_R (KEY_OFFSET + 0x121) /* Right-alt */ -#define KEY_RESIZE (KEY_OFFSET + 0x122) /* Window resize */ -#define KEY_SUP (KEY_OFFSET + 0x123) /* Shifted up arrow */ -#define KEY_SDOWN (KEY_OFFSET + 0x124) /* Shifted down arrow */ - - /* The following were added 2011 Sep 14, and are */ - /* not returned by most flavors of PDCurses: */ - -#define CTL_SEMICOLON (KEY_OFFSET + 0x125) -#define CTL_EQUAL (KEY_OFFSET + 0x126) -#define CTL_COMMA (KEY_OFFSET + 0x127) -#define CTL_MINUS (KEY_OFFSET + 0x128) -#define CTL_STOP (KEY_OFFSET + 0x129) -#define CTL_FSLASH (KEY_OFFSET + 0x12a) -#define CTL_BQUOTE (KEY_OFFSET + 0x12b) - -#define KEY_APPS (KEY_OFFSET + 0x12c) -#define KEY_SAPPS (KEY_OFFSET + 0x12d) -#define CTL_APPS (KEY_OFFSET + 0x12e) -#define ALT_APPS (KEY_OFFSET + 0x12f) - -#define KEY_PAUSE (KEY_OFFSET + 0x130) -#define KEY_SPAUSE (KEY_OFFSET + 0x131) -#define CTL_PAUSE (KEY_OFFSET + 0x132) - -#define KEY_PRINTSCREEN (KEY_OFFSET + 0x133) -#define ALT_PRINTSCREEN (KEY_OFFSET + 0x134) -#define KEY_SCROLLLOCK (KEY_OFFSET + 0x135) -#define ALT_SCROLLLOCK (KEY_OFFSET + 0x136) - -#define CTL_0 (KEY_OFFSET + 0x137) -#define CTL_1 (KEY_OFFSET + 0x138) -#define CTL_2 (KEY_OFFSET + 0x139) -#define CTL_3 (KEY_OFFSET + 0x13a) -#define CTL_4 (KEY_OFFSET + 0x13b) -#define CTL_5 (KEY_OFFSET + 0x13c) -#define CTL_6 (KEY_OFFSET + 0x13d) -#define CTL_7 (KEY_OFFSET + 0x13e) -#define CTL_8 (KEY_OFFSET + 0x13f) -#define CTL_9 (KEY_OFFSET + 0x140) - -#define KEY_BROWSER_BACK (KEY_OFFSET + 0x141) -#define KEY_SBROWSER_BACK (KEY_OFFSET + 0x142) -#define KEY_CBROWSER_BACK (KEY_OFFSET + 0x143) -#define KEY_ABROWSER_BACK (KEY_OFFSET + 0x144) -#define KEY_BROWSER_FWD (KEY_OFFSET + 0x145) -#define KEY_SBROWSER_FWD (KEY_OFFSET + 0x146) -#define KEY_CBROWSER_FWD (KEY_OFFSET + 0x147) -#define KEY_ABROWSER_FWD (KEY_OFFSET + 0x148) -#define KEY_BROWSER_REF (KEY_OFFSET + 0x149) -#define KEY_SBROWSER_REF (KEY_OFFSET + 0x14A) -#define KEY_CBROWSER_REF (KEY_OFFSET + 0x14B) -#define KEY_ABROWSER_REF (KEY_OFFSET + 0x14C) -#define KEY_BROWSER_STOP (KEY_OFFSET + 0x14D) -#define KEY_SBROWSER_STOP (KEY_OFFSET + 0x14E) -#define KEY_CBROWSER_STOP (KEY_OFFSET + 0x14F) -#define KEY_ABROWSER_STOP (KEY_OFFSET + 0x150) -#define KEY_SEARCH (KEY_OFFSET + 0x151) -#define KEY_SSEARCH (KEY_OFFSET + 0x152) -#define KEY_CSEARCH (KEY_OFFSET + 0x153) -#define KEY_ASEARCH (KEY_OFFSET + 0x154) -#define KEY_FAVORITES (KEY_OFFSET + 0x155) -#define KEY_SFAVORITES (KEY_OFFSET + 0x156) -#define KEY_CFAVORITES (KEY_OFFSET + 0x157) -#define KEY_AFAVORITES (KEY_OFFSET + 0x158) -#define KEY_BROWSER_HOME (KEY_OFFSET + 0x159) -#define KEY_SBROWSER_HOME (KEY_OFFSET + 0x15A) -#define KEY_CBROWSER_HOME (KEY_OFFSET + 0x15B) -#define KEY_ABROWSER_HOME (KEY_OFFSET + 0x15C) -#define KEY_VOLUME_MUTE (KEY_OFFSET + 0x15D) -#define KEY_SVOLUME_MUTE (KEY_OFFSET + 0x15E) -#define KEY_CVOLUME_MUTE (KEY_OFFSET + 0x15F) -#define KEY_AVOLUME_MUTE (KEY_OFFSET + 0x160) -#define KEY_VOLUME_DOWN (KEY_OFFSET + 0x161) -#define KEY_SVOLUME_DOWN (KEY_OFFSET + 0x162) -#define KEY_CVOLUME_DOWN (KEY_OFFSET + 0x163) -#define KEY_AVOLUME_DOWN (KEY_OFFSET + 0x164) -#define KEY_VOLUME_UP (KEY_OFFSET + 0x165) -#define KEY_SVOLUME_UP (KEY_OFFSET + 0x166) -#define KEY_CVOLUME_UP (KEY_OFFSET + 0x167) -#define KEY_AVOLUME_UP (KEY_OFFSET + 0x168) -#define KEY_NEXT_TRACK (KEY_OFFSET + 0x169) -#define KEY_SNEXT_TRACK (KEY_OFFSET + 0x16A) -#define KEY_CNEXT_TRACK (KEY_OFFSET + 0x16B) -#define KEY_ANEXT_TRACK (KEY_OFFSET + 0x16C) -#define KEY_PREV_TRACK (KEY_OFFSET + 0x16D) -#define KEY_SPREV_TRACK (KEY_OFFSET + 0x16E) -#define KEY_CPREV_TRACK (KEY_OFFSET + 0x16F) -#define KEY_APREV_TRACK (KEY_OFFSET + 0x170) -#define KEY_MEDIA_STOP (KEY_OFFSET + 0x171) -#define KEY_SMEDIA_STOP (KEY_OFFSET + 0x172) -#define KEY_CMEDIA_STOP (KEY_OFFSET + 0x173) -#define KEY_AMEDIA_STOP (KEY_OFFSET + 0x174) -#define KEY_PLAY_PAUSE (KEY_OFFSET + 0x175) -#define KEY_SPLAY_PAUSE (KEY_OFFSET + 0x176) -#define KEY_CPLAY_PAUSE (KEY_OFFSET + 0x177) -#define KEY_APLAY_PAUSE (KEY_OFFSET + 0x178) -#define KEY_LAUNCH_MAIL (KEY_OFFSET + 0x179) -#define KEY_SLAUNCH_MAIL (KEY_OFFSET + 0x17A) -#define KEY_CLAUNCH_MAIL (KEY_OFFSET + 0x17B) -#define KEY_ALAUNCH_MAIL (KEY_OFFSET + 0x17C) -#define KEY_MEDIA_SELECT (KEY_OFFSET + 0x17D) -#define KEY_SMEDIA_SELECT (KEY_OFFSET + 0x17E) -#define KEY_CMEDIA_SELECT (KEY_OFFSET + 0x17F) -#define KEY_AMEDIA_SELECT (KEY_OFFSET + 0x180) -#define KEY_LAUNCH_APP1 (KEY_OFFSET + 0x181) -#define KEY_SLAUNCH_APP1 (KEY_OFFSET + 0x182) -#define KEY_CLAUNCH_APP1 (KEY_OFFSET + 0x183) -#define KEY_ALAUNCH_APP1 (KEY_OFFSET + 0x184) -#define KEY_LAUNCH_APP2 (KEY_OFFSET + 0x185) -#define KEY_SLAUNCH_APP2 (KEY_OFFSET + 0x186) -#define KEY_CLAUNCH_APP2 (KEY_OFFSET + 0x187) -#define KEY_ALAUNCH_APP2 (KEY_OFFSET + 0x188) - -#define KEY_MIN KEY_BREAK /* Minimum curses key value */ -#define KEY_MAX KEY_ALAUNCH_APP2 /* Maximum curses key */ - -#define KEY_F(n) (KEY_F0 + (n)) - -/*---------------------------------------------------------------------- - * - * PDCurses Function Declarations - * - */ - -/* Standard */ - -PDCEX int addch(const chtype); -PDCEX int addchnstr(const chtype *, int); -PDCEX int addchstr(const chtype *); -PDCEX int addnstr(const char *, int); -PDCEX int addstr(const char *); -PDCEX int attroff(chtype); -PDCEX int attron(chtype); -PDCEX int attrset(chtype); -PDCEX int attr_get(attr_t *, short *, void *); -PDCEX int attr_off(attr_t, void *); -PDCEX int attr_on(attr_t, void *); -PDCEX int attr_set(attr_t, short, void *); -PDCEX int baudrate(void); -PDCEX int beep(void); -PDCEX int bkgd(chtype); -PDCEX void bkgdset(chtype); -PDCEX int border(chtype, chtype, chtype, chtype, - chtype, chtype, chtype, chtype); -PDCEX int box(WINDOW *, chtype, chtype); -PDCEX bool can_change_color(void); -PDCEX int cbreak(void); -PDCEX int chgat(int, attr_t, short, const void *); -PDCEX int clearok(WINDOW *, bool); -PDCEX int clear(void); -PDCEX int clrtobot(void); -PDCEX int clrtoeol(void); -PDCEX int color_content(short, short *, short *, short *); -PDCEX int color_set(short, void *); -PDCEX int copywin(const WINDOW *, WINDOW *, int, int, int, - int, int, int, int); -PDCEX int curs_set(int); -PDCEX int def_prog_mode(void); -PDCEX int def_shell_mode(void); -PDCEX int delay_output(int); -PDCEX int delch(void); -PDCEX int deleteln(void); -PDCEX void delscreen(SCREEN *); -PDCEX int delwin(WINDOW *); -PDCEX WINDOW *derwin(WINDOW *, int, int, int, int); -PDCEX int doupdate(void); -PDCEX WINDOW *dupwin(WINDOW *); -PDCEX int echochar(const chtype); -PDCEX int echo(void); -PDCEX int endwin(void); -PDCEX char erasechar(void); -PDCEX int erase(void); -PDCEX void filter(void); -PDCEX int flash(void); -PDCEX int flushinp(void); -PDCEX chtype getbkgd(WINDOW *); -PDCEX int getnstr(char *, int); -PDCEX int getstr(char *); -PDCEX WINDOW *getwin(FILE *); -PDCEX int halfdelay(int); -PDCEX bool has_colors(void); -PDCEX bool has_ic(void); -PDCEX bool has_il(void); -PDCEX int hline(chtype, int); -PDCEX void idcok(WINDOW *, bool); -PDCEX int idlok(WINDOW *, bool); -PDCEX void immedok(WINDOW *, bool); -PDCEX int inchnstr(chtype *, int); -PDCEX int inchstr(chtype *); -PDCEX chtype inch(void); -PDCEX int init_color(short, short, short, short); -PDCEX int init_pair(short, short, short); -PDCEX WINDOW *initscr(void); -PDCEX int innstr(char *, int); -PDCEX int insch(chtype); -PDCEX int insdelln(int); -PDCEX int insertln(void); -PDCEX int insnstr(const char *, int); -PDCEX int insstr(const char *); -PDCEX int instr(char *); -PDCEX int intrflush(WINDOW *, bool); -PDCEX bool isendwin(void); -PDCEX bool is_linetouched(WINDOW *, int); -PDCEX bool is_wintouched(WINDOW *); -PDCEX char *keyname(int); -PDCEX int keypad(WINDOW *, bool); -PDCEX char killchar(void); -PDCEX int leaveok(WINDOW *, bool); -PDCEX char *longname(void); -PDCEX int meta(WINDOW *, bool); -PDCEX int move(int, int); -PDCEX int mvaddch(int, int, const chtype); -PDCEX int mvaddchnstr(int, int, const chtype *, int); -PDCEX int mvaddchstr(int, int, const chtype *); -PDCEX int mvaddnstr(int, int, const char *, int); -PDCEX int mvaddstr(int, int, const char *); -PDCEX int mvchgat(int, int, int, attr_t, short, const void *); -PDCEX int mvcur(int, int, int, int); -PDCEX int mvdelch(int, int); -PDCEX int mvderwin(WINDOW *, int, int); -PDCEX int mvgetch(int, int); -PDCEX int mvgetnstr(int, int, char *, int); -PDCEX int mvgetstr(int, int, char *); -PDCEX int mvhline(int, int, chtype, int); -PDCEX chtype mvinch(int, int); -PDCEX int mvinchnstr(int, int, chtype *, int); -PDCEX int mvinchstr(int, int, chtype *); -PDCEX int mvinnstr(int, int, char *, int); -PDCEX int mvinsch(int, int, chtype); -PDCEX int mvinsnstr(int, int, const char *, int); -PDCEX int mvinsstr(int, int, const char *); -PDCEX int mvinstr(int, int, char *); -PDCEX int mvprintw(int, int, const char *, ...); -PDCEX int mvscanw(int, int, const char *, ...); -PDCEX int mvvline(int, int, chtype, int); -PDCEX int mvwaddchnstr(WINDOW *, int, int, const chtype *, int); -PDCEX int mvwaddchstr(WINDOW *, int, int, const chtype *); -PDCEX int mvwaddch(WINDOW *, int, int, const chtype); -PDCEX int mvwaddnstr(WINDOW *, int, int, const char *, int); -PDCEX int mvwaddstr(WINDOW *, int, int, const char *); -PDCEX int mvwchgat(WINDOW *, int, int, int, attr_t, short, const void *); -PDCEX int mvwdelch(WINDOW *, int, int); -PDCEX int mvwgetch(WINDOW *, int, int); -PDCEX int mvwgetnstr(WINDOW *, int, int, char *, int); -PDCEX int mvwgetstr(WINDOW *, int, int, char *); -PDCEX int mvwhline(WINDOW *, int, int, chtype, int); -PDCEX int mvwinchnstr(WINDOW *, int, int, chtype *, int); -PDCEX int mvwinchstr(WINDOW *, int, int, chtype *); -PDCEX chtype mvwinch(WINDOW *, int, int); -PDCEX int mvwinnstr(WINDOW *, int, int, char *, int); -PDCEX int mvwinsch(WINDOW *, int, int, chtype); -PDCEX int mvwinsnstr(WINDOW *, int, int, const char *, int); -PDCEX int mvwinsstr(WINDOW *, int, int, const char *); -PDCEX int mvwinstr(WINDOW *, int, int, char *); -PDCEX int mvwin(WINDOW *, int, int); -PDCEX int mvwprintw(WINDOW *, int, int, const char *, ...); -PDCEX int mvwscanw(WINDOW *, int, int, const char *, ...); -PDCEX int mvwvline(WINDOW *, int, int, chtype, int); -PDCEX int napms(int); -PDCEX WINDOW *newpad(int, int); -PDCEX SCREEN *newterm(const char *, FILE *, FILE *); -PDCEX WINDOW *newwin(int, int, int, int); -PDCEX int nl(void); -PDCEX int nocbreak(void); -PDCEX int nodelay(WINDOW *, bool); -PDCEX int noecho(void); -PDCEX int nonl(void); -PDCEX void noqiflush(void); -PDCEX int noraw(void); -PDCEX int notimeout(WINDOW *, bool); -PDCEX int overlay(const WINDOW *, WINDOW *); -PDCEX int overwrite(const WINDOW *, WINDOW *); -PDCEX int pair_content(short, short *, short *); -PDCEX int pechochar(WINDOW *, chtype); -PDCEX int pnoutrefresh(WINDOW *, int, int, int, int, int, int); -PDCEX int prefresh(WINDOW *, int, int, int, int, int, int); -PDCEX int printw(const char *, ...); -PDCEX int putwin(WINDOW *, FILE *); -PDCEX void qiflush(void); -PDCEX int raw(void); -PDCEX int redrawwin(WINDOW *); -PDCEX int refresh(void); -PDCEX int reset_prog_mode(void); -PDCEX int reset_shell_mode(void); -PDCEX int resetty(void); -PDCEX int ripoffline(int, int (*)(WINDOW *, int)); -PDCEX int savetty(void); -PDCEX int scanw(const char *, ...); -PDCEX int scr_dump(const char *); -PDCEX int scr_init(const char *); -PDCEX int scr_restore(const char *); -PDCEX int scr_set(const char *); -PDCEX int scrl(int); -PDCEX int scroll(WINDOW *); -PDCEX int scrollok(WINDOW *, bool); -PDCEX SCREEN *set_term(SCREEN *); -PDCEX int setscrreg(int, int); -PDCEX int slk_attroff(const chtype); -PDCEX int slk_attr_off(const attr_t, void *); -PDCEX int slk_attron(const chtype); -PDCEX int slk_attr_on(const attr_t, void *); -PDCEX int slk_attrset(const chtype); -PDCEX int slk_attr_set(const attr_t, short, void *); -PDCEX int slk_clear(void); -PDCEX int slk_color(short); -PDCEX int slk_init(int); -PDCEX char *slk_label(int); -PDCEX int slk_noutrefresh(void); -PDCEX int slk_refresh(void); -PDCEX int slk_restore(void); -PDCEX int slk_set(int, const char *, int); -PDCEX int slk_touch(void); -PDCEX int standend(void); -PDCEX int standout(void); -PDCEX int start_color(void); -PDCEX WINDOW *subpad(WINDOW *, int, int, int, int); -PDCEX WINDOW *subwin(WINDOW *, int, int, int, int); -PDCEX int syncok(WINDOW *, bool); -PDCEX chtype termattrs(void); -PDCEX attr_t term_attrs(void); -PDCEX char *termname(void); -PDCEX void timeout(int); -PDCEX int touchline(WINDOW *, int, int); -PDCEX int touchwin(WINDOW *); -PDCEX int typeahead(int); -PDCEX int untouchwin(WINDOW *); -PDCEX void use_env(bool); -PDCEX int vidattr(chtype); -PDCEX int vid_attr(attr_t, short, void *); -PDCEX int vidputs(chtype, int (*)(int)); -PDCEX int vid_puts(attr_t, short, void *, int (*)(int)); -PDCEX int vline(chtype, int); -PDCEX int vw_printw(WINDOW *, const char *, va_list); -PDCEX int vwprintw(WINDOW *, const char *, va_list); -PDCEX int vw_scanw(WINDOW *, const char *, va_list); -PDCEX int vwscanw(WINDOW *, const char *, va_list); -PDCEX int waddchnstr(WINDOW *, const chtype *, int); -PDCEX int waddchstr(WINDOW *, const chtype *); -PDCEX int waddch(WINDOW *, const chtype); -PDCEX int waddnstr(WINDOW *, const char *, int); -PDCEX int waddstr(WINDOW *, const char *); -PDCEX int wattroff(WINDOW *, chtype); -PDCEX int wattron(WINDOW *, chtype); -PDCEX int wattrset(WINDOW *, chtype); -PDCEX int wattr_get(WINDOW *, attr_t *, short *, void *); -PDCEX int wattr_off(WINDOW *, attr_t, void *); -PDCEX int wattr_on(WINDOW *, attr_t, void *); -PDCEX int wattr_set(WINDOW *, attr_t, short, void *); -PDCEX void wbkgdset(WINDOW *, chtype); -PDCEX int wbkgd(WINDOW *, chtype); -PDCEX int wborder(WINDOW *, chtype, chtype, chtype, chtype, - chtype, chtype, chtype, chtype); -PDCEX int wchgat(WINDOW *, int, attr_t, short, const void *); -PDCEX int wclear(WINDOW *); -PDCEX int wclrtobot(WINDOW *); -PDCEX int wclrtoeol(WINDOW *); -PDCEX int wcolor_set(WINDOW *, short, void *); -PDCEX void wcursyncup(WINDOW *); -PDCEX int wdelch(WINDOW *); -PDCEX int wdeleteln(WINDOW *); -PDCEX int wechochar(WINDOW *, const chtype); -PDCEX int werase(WINDOW *); -PDCEX int wgetch(WINDOW *); -PDCEX int wgetnstr(WINDOW *, char *, int); -PDCEX int wgetstr(WINDOW *, char *); -PDCEX int whline(WINDOW *, chtype, int); -PDCEX int winchnstr(WINDOW *, chtype *, int); -PDCEX int winchstr(WINDOW *, chtype *); -PDCEX chtype winch(WINDOW *); -PDCEX int winnstr(WINDOW *, char *, int); -PDCEX int winsch(WINDOW *, chtype); -PDCEX int winsdelln(WINDOW *, int); -PDCEX int winsertln(WINDOW *); -PDCEX int winsnstr(WINDOW *, const char *, int); -PDCEX int winsstr(WINDOW *, const char *); -PDCEX int winstr(WINDOW *, char *); -PDCEX int wmove(WINDOW *, int, int); -PDCEX int wnoutrefresh(WINDOW *); -PDCEX int wprintw(WINDOW *, const char *, ...); -PDCEX int wredrawln(WINDOW *, int, int); -PDCEX int wrefresh(WINDOW *); -PDCEX int wscanw(WINDOW *, const char *, ...); -PDCEX int wscrl(WINDOW *, int); -PDCEX int wsetscrreg(WINDOW *, int, int); -PDCEX int wstandend(WINDOW *); -PDCEX int wstandout(WINDOW *); -PDCEX void wsyncdown(WINDOW *); -PDCEX void wsyncup(WINDOW *); -PDCEX void wtimeout(WINDOW *, int); -PDCEX int wtouchln(WINDOW *, int, int, int); -PDCEX int wvline(WINDOW *, chtype, int); - -/* Wide-character functions */ - -#ifdef PDC_WIDE -PDCEX int addnwstr(const wchar_t *, int); -PDCEX int addwstr(const wchar_t *); -PDCEX int add_wch(const cchar_t *); -PDCEX int add_wchnstr(const cchar_t *, int); -PDCEX int add_wchstr(const cchar_t *); -PDCEX int border_set(const cchar_t *, const cchar_t *, const cchar_t *, - const cchar_t *, const cchar_t *, const cchar_t *, - const cchar_t *, const cchar_t *); -PDCEX int box_set(WINDOW *, const cchar_t *, const cchar_t *); -PDCEX int echo_wchar(const cchar_t *); -PDCEX int erasewchar(wchar_t *); -PDCEX int getbkgrnd(cchar_t *); -PDCEX int getcchar(const cchar_t *, wchar_t *, attr_t *, short *, void *); -PDCEX int getn_wstr(wint_t *, int); -PDCEX int get_wch(wint_t *); -PDCEX int get_wstr(wint_t *); -PDCEX int hline_set(const cchar_t *, int); -PDCEX int innwstr(wchar_t *, int); -PDCEX int ins_nwstr(const wchar_t *, int); -PDCEX int ins_wch(const cchar_t *); -PDCEX int ins_wstr(const wchar_t *); -PDCEX int inwstr(wchar_t *); -PDCEX int in_wch(cchar_t *); -PDCEX int in_wchnstr(cchar_t *, int); -PDCEX int in_wchstr(cchar_t *); -PDCEX char *key_name(wchar_t); -PDCEX int killwchar(wchar_t *); -PDCEX int mvaddnwstr(int, int, const wchar_t *, int); -PDCEX int mvaddwstr(int, int, const wchar_t *); -PDCEX int mvadd_wch(int, int, const cchar_t *); -PDCEX int mvadd_wchnstr(int, int, const cchar_t *, int); -PDCEX int mvadd_wchstr(int, int, const cchar_t *); -PDCEX int mvgetn_wstr(int, int, wint_t *, int); -PDCEX int mvget_wch(int, int, wint_t *); -PDCEX int mvget_wstr(int, int, wint_t *); -PDCEX int mvhline_set(int, int, const cchar_t *, int); -PDCEX int mvinnwstr(int, int, wchar_t *, int); -PDCEX int mvins_nwstr(int, int, const wchar_t *, int); -PDCEX int mvins_wch(int, int, const cchar_t *); -PDCEX int mvins_wstr(int, int, const wchar_t *); -PDCEX int mvinwstr(int, int, wchar_t *); -PDCEX int mvin_wch(int, int, cchar_t *); -PDCEX int mvin_wchnstr(int, int, cchar_t *, int); -PDCEX int mvin_wchstr(int, int, cchar_t *); -PDCEX int mvvline_set(int, int, const cchar_t *, int); -PDCEX int mvwaddnwstr(WINDOW *, int, int, const wchar_t *, int); -PDCEX int mvwaddwstr(WINDOW *, int, int, const wchar_t *); -PDCEX int mvwadd_wch(WINDOW *, int, int, const cchar_t *); -PDCEX int mvwadd_wchnstr(WINDOW *, int, int, const cchar_t *, int); -PDCEX int mvwadd_wchstr(WINDOW *, int, int, const cchar_t *); -PDCEX int mvwgetn_wstr(WINDOW *, int, int, wint_t *, int); -PDCEX int mvwget_wch(WINDOW *, int, int, wint_t *); -PDCEX int mvwget_wstr(WINDOW *, int, int, wint_t *); -PDCEX int mvwhline_set(WINDOW *, int, int, const cchar_t *, int); -PDCEX int mvwinnwstr(WINDOW *, int, int, wchar_t *, int); -PDCEX int mvwins_nwstr(WINDOW *, int, int, const wchar_t *, int); -PDCEX int mvwins_wch(WINDOW *, int, int, const cchar_t *); -PDCEX int mvwins_wstr(WINDOW *, int, int, const wchar_t *); -PDCEX int mvwin_wch(WINDOW *, int, int, cchar_t *); -PDCEX int mvwin_wchnstr(WINDOW *, int, int, cchar_t *, int); -PDCEX int mvwin_wchstr(WINDOW *, int, int, cchar_t *); -PDCEX int mvwinwstr(WINDOW *, int, int, wchar_t *); -PDCEX int mvwvline_set(WINDOW *, int, int, const cchar_t *, int); -PDCEX int pecho_wchar(WINDOW *, const cchar_t*); -PDCEX int setcchar(cchar_t*, const wchar_t*, const attr_t, - short, const void*); -PDCEX int slk_wset(int, const wchar_t *, int); -PDCEX int unget_wch(const wchar_t); -PDCEX int vline_set(const cchar_t *, int); -PDCEX int waddnwstr(WINDOW *, const wchar_t *, int); -PDCEX int waddwstr(WINDOW *, const wchar_t *); -PDCEX int wadd_wch(WINDOW *, const cchar_t *); -PDCEX int wadd_wchnstr(WINDOW *, const cchar_t *, int); -PDCEX int wadd_wchstr(WINDOW *, const cchar_t *); -PDCEX int wbkgrnd(WINDOW *, const cchar_t *); -PDCEX void wbkgrndset(WINDOW *, const cchar_t *); -PDCEX int wborder_set(WINDOW *, const cchar_t *, const cchar_t *, - const cchar_t *, const cchar_t *, const cchar_t *, - const cchar_t *, const cchar_t *, const cchar_t *); -PDCEX int wecho_wchar(WINDOW *, const cchar_t *); -PDCEX int wgetbkgrnd(WINDOW *, cchar_t *); -PDCEX int wgetn_wstr(WINDOW *, wint_t *, int); -PDCEX int wget_wch(WINDOW *, wint_t *); -PDCEX int wget_wstr(WINDOW *, wint_t *); -PDCEX int whline_set(WINDOW *, const cchar_t *, int); -PDCEX int winnwstr(WINDOW *, wchar_t *, int); -PDCEX int wins_nwstr(WINDOW *, const wchar_t *, int); -PDCEX int wins_wch(WINDOW *, const cchar_t *); -PDCEX int wins_wstr(WINDOW *, const wchar_t *); -PDCEX int winwstr(WINDOW *, wchar_t *); -PDCEX int win_wch(WINDOW *, cchar_t *); -PDCEX int win_wchnstr(WINDOW *, cchar_t *, int); -PDCEX int win_wchstr(WINDOW *, cchar_t *); -PDCEX wchar_t *wunctrl(cchar_t *); -PDCEX int wvline_set(WINDOW *, const cchar_t *, int); -#endif - -/* Quasi-standard */ - -PDCEX chtype getattrs(WINDOW *); -PDCEX int getbegx(WINDOW *); -PDCEX int getbegy(WINDOW *); -PDCEX int getmaxx(WINDOW *); -PDCEX int getmaxy(WINDOW *); -PDCEX int getparx(WINDOW *); -PDCEX int getpary(WINDOW *); -PDCEX int getcurx(WINDOW *); -PDCEX int getcury(WINDOW *); -PDCEX void traceoff(void); -PDCEX void traceon(void); -PDCEX char *unctrl(chtype); - -PDCEX int crmode(void); -PDCEX int nocrmode(void); -PDCEX int draino(int); -PDCEX int resetterm(void); -PDCEX int fixterm(void); -PDCEX int saveterm(void); -PDCEX void setsyx(int, int); - -PDCEX int mouse_set(unsigned long); -PDCEX int mouse_on(unsigned long); -PDCEX int mouse_off(unsigned long); -PDCEX int request_mouse_pos(void); -PDCEX int map_button(unsigned long); -PDCEX void wmouse_position(WINDOW *, int *, int *); -PDCEX unsigned long getmouse(void); -PDCEX unsigned long getbmap(void); - -/* ncurses */ - -PDCEX int assume_default_colors(int, int); -PDCEX const char *curses_version(void); -PDCEX bool has_key(int); -PDCEX int use_default_colors(void); -PDCEX int wresize(WINDOW *, int, int); - -PDCEX int mouseinterval(int); -PDCEX mmask_t mousemask(mmask_t, mmask_t *); -PDCEX bool mouse_trafo(int *, int *, bool); -PDCEX int nc_getmouse(MEVENT *); -PDCEX int ungetmouse(MEVENT *); -PDCEX bool wenclose(const WINDOW *, int, int); -PDCEX bool wmouse_trafo(const WINDOW *, int *, int *, bool); - -/* PDCurses */ - -PDCEX int addrawch(chtype); -PDCEX int insrawch(chtype); -PDCEX bool is_termresized(void); -PDCEX int mvaddrawch(int, int, chtype); -PDCEX int mvdeleteln(int, int); -PDCEX int mvinsertln(int, int); -PDCEX int mvinsrawch(int, int, chtype); -PDCEX int mvwaddrawch(WINDOW *, int, int, chtype); -PDCEX int mvwdeleteln(WINDOW *, int, int); -PDCEX int mvwinsertln(WINDOW *, int, int); -PDCEX int mvwinsrawch(WINDOW *, int, int, chtype); -PDCEX int raw_output(bool); -PDCEX int resize_term(int, int); -PDCEX WINDOW *resize_window(WINDOW *, int, int); -PDCEX int waddrawch(WINDOW *, chtype); -PDCEX int winsrawch(WINDOW *, chtype); -PDCEX char wordchar(void); - -#ifdef PDC_WIDE -PDCEX wchar_t *slk_wlabel(int); -#endif - -PDCEX void PDC_debug(const char *, ...); -PDCEX int PDC_ungetch(int); -PDCEX int PDC_set_blink(bool); -PDCEX int PDC_set_line_color(short); -PDCEX void PDC_set_title(const char *); - -PDCEX int PDC_clearclipboard(void); -PDCEX int PDC_freeclipboard(char *); -PDCEX int PDC_getclipboard(char **, long *); -PDCEX int PDC_setclipboard(const char *, long); - -PDCEX unsigned long PDC_get_input_fd(void); -PDCEX unsigned long PDC_get_key_modifiers(void); -PDCEX int PDC_return_key_modifiers(bool); -PDCEX int PDC_save_key_modifiers(bool); -PDCEX void PDC_set_resize_limits( const int new_min_lines, - const int new_max_lines, - const int new_min_cols, - const int new_max_cols); - -#define FUNCTION_KEY_SHUT_DOWN 0 -#define FUNCTION_KEY_PASTE 1 -#define FUNCTION_KEY_ENLARGE_FONT 2 -#define FUNCTION_KEY_SHRINK_FONT 3 -#define FUNCTION_KEY_CHOOSE_FONT 4 -#define FUNCTION_KEY_ABORT 5 -#define PDC_MAX_FUNCTION_KEYS 6 - -PDCEX int PDC_set_function_key( const unsigned function, - const int new_key); - -PDCEX WINDOW *Xinitscr(int, char **); -#ifdef XCURSES -PDCEX void XCursesExit(void); -PDCEX int sb_init(void); -PDCEX int sb_set_horz(int, int, int); -PDCEX int sb_set_vert(int, int, int); -PDCEX int sb_get_horz(int *, int *, int *); -PDCEX int sb_get_vert(int *, int *, int *); -PDCEX int sb_refresh(void); - #endif - -/*** Functions defined as macros ***/ - -/* getch() and ungetch() conflict with some DOS libraries */ - -#define getch() wgetch(stdscr) -#define ungetch(ch) PDC_ungetch(ch) - -#define COLOR_PAIR(n) (((chtype)(n) << PDC_COLOR_SHIFT) & A_COLOR) -#define PAIR_NUMBER(n) ((((n) & A_COLOR) >> PDC_COLOR_SHIFT) & 0xff) - -/* These will _only_ work as macros */ - -#define getbegyx(w, y, x) (y = getbegy(w), x = getbegx(w)) -#define getmaxyx(w, y, x) (y = getmaxy(w), x = getmaxx(w)) -#define getparyx(w, y, x) (y = getpary(w), x = getparx(w)) -#define getyx(w, y, x) (y = getcury(w), x = getcurx(w)) - -#define getsyx(y, x) { if (curscr->_leaveit) (y)=(x)=-1; \ - else getyx(curscr,(y),(x)); } - -#ifdef NCURSES_MOUSE_VERSION -# define getmouse(x) nc_getmouse(x) -#endif - -/* return codes from PDC_getclipboard() and PDC_setclipboard() calls */ - -#define PDC_CLIP_SUCCESS 0 -#define PDC_CLIP_ACCESS_ERROR 1 -#define PDC_CLIP_EMPTY 2 -#define PDC_CLIP_MEMORY_ERROR 3 - -/* PDCurses key modifier masks */ - -#define PDC_KEY_MODIFIER_SHIFT 1 -#define PDC_KEY_MODIFIER_CONTROL 2 -#define PDC_KEY_MODIFIER_ALT 4 -#define PDC_KEY_MODIFIER_NUMLOCK 8 -#define PDC_KEY_MODIFIER_REPEAT 16 - -#ifdef __cplusplus -# undef bool -} -#endif - -#endif /* __PDCURSES__ */ diff --git a/src/cc/rogue/x86_64-w64-msvc/deps/install/include/curspriv.h b/src/cc/rogue/x86_64-w64-msvc/deps/install/include/curspriv.h deleted file mode 100644 index b5edcc173..000000000 --- a/src/cc/rogue/x86_64-w64-msvc/deps/install/include/curspriv.h +++ /dev/null @@ -1,134 +0,0 @@ -/* Public Domain Curses */ - -/* Private definitions and declarations for use within PDCurses. - These should generally not be referenced by applications. */ - -#ifndef __CURSES_INTERNALS__ -#define __CURSES_INTERNALS__ 1 - -#define CURSES_LIBRARY -#include - -#if defined(__TURBOC__) || defined(__EMX__) || defined(__DJGPP__) || \ - defined(__CYGWIN__) || defined(__MINGW32__) || \ - defined(__WATCOMC__) || defined(__PACIFIC__) -# ifndef HAVE_VSSCANF -# define HAVE_VSSCANF /* have vsscanf() */ -# endif -#endif - -#if defined(__CYGWIN__) || defined(__MINGW32__) || \ - defined(__LCC__) || defined(__WATCOMC__) -# ifndef HAVE_VSNPRINTF -# define HAVE_VSNPRINTF /* have vsnprintf() */ -# endif -#endif - -#if defined(_MSC_VER) && defined(_WIN32) && !defined(_CRT_SECURE_NO_DEPRECATE) -# define _CRT_SECURE_NO_DEPRECATE 1 /* kill nonsense warnings */ -#endif - -/*----------------------------------------------------------------------*/ - -typedef struct /* structure for ripped off lines */ -{ - int line; - int (*init)(WINDOW *, int); -} RIPPEDOFFLINE; - -/* Window properties */ - -#define _SUBWIN 0x01 /* window is a subwindow */ -#define _PAD 0x10 /* X/Open Pad. */ -#define _SUBPAD 0x20 /* X/Open subpad. */ - -/* Miscellaneous */ - -#define _NO_CHANGE -1 /* flags line edge unchanged */ - -#define _ECHAR 0x08 /* Erase char (^H) */ -#define _DWCHAR 0x17 /* Delete Word char (^W) */ -#define _DLCHAR 0x15 /* Delete Line char (^U) */ - -extern WINDOW *pdc_lastscr; -extern FILE *pdc_dbfp; /* tracing file pointer (NULL = off) */ -extern bool pdc_color_started; -extern unsigned long pdc_key_modifiers; -extern MOUSE_STATUS pdc_mouse_status; - -/*----------------------------------------------------------------------*/ - -/* Platform implementation functions */ - -void PDC_beep(void); -bool PDC_can_change_color(void); -int PDC_color_content(short, short *, short *, short *); -bool PDC_check_key(void); -int PDC_curs_set(int); -void PDC_flushinp(void); -int PDC_get_columns(void); -int PDC_get_cursor_mode(void); -int PDC_get_key(void); -int PDC_get_rows(void); -void PDC_gotoyx(int, int); -int PDC_init_color(short, short, short, short); -void PDC_init_pair(short, short, short); -int PDC_modifiers_set(void); -int PDC_mouse_set(void); -void PDC_napms(int); -int PDC_pair_content(short, short *, short *); -void PDC_reset_prog_mode(void); -void PDC_reset_shell_mode(void); -int PDC_resize_screen(int, int); -void PDC_restore_screen_mode(int); -void PDC_save_screen_mode(int); -void PDC_scr_close(void); -void PDC_scr_free(void); -int PDC_scr_open(int, char **); -void PDC_set_keyboard_binary(bool); -void PDC_transform_line(int, int, int, const chtype *); -const char *PDC_sysname(void); - -/* Internal cross-module functions */ - -void PDC_init_atrtab(void); -WINDOW *PDC_makelines(WINDOW *); -WINDOW *PDC_makenew(int, int, int, int); -int PDC_mouse_in_slk(int, int); -void PDC_slk_free(void); -void PDC_slk_initialize(void); -void PDC_sync(WINDOW *); - -#ifdef PDC_WIDE -int PDC_mbtowc(wchar_t *, const char *, size_t); -size_t PDC_mbstowcs(wchar_t *, const char *, size_t); -size_t PDC_wcstombs(char *, const wchar_t *, size_t); -#endif - -#ifdef PDCDEBUG -# define PDC_LOG(x) if (pdc_dbfp) PDC_debug x -#else -# define PDC_LOG(x) -#endif - -/* Internal macros for attributes */ - -#ifdef CHTYPE_LONG -# define PDC_COLOR_PAIRS 256 -#else -# define PDC_COLOR_PAIRS 32 -#endif - -#ifndef max -# define max(a,b) (((a) > (b)) ? (a) : (b)) -#endif -#ifndef min -# define min(a,b) (((a) < (b)) ? (a) : (b)) -#endif - -#define DIVROUND(num, divisor) (((num) + ((divisor) >> 1)) / (divisor)) - -#define PDC_CLICK_PERIOD 150 /* time to wait for a click, if - not set by mouseinterval() */ - -#endif /* __CURSES_INTERNALS__*/ diff --git a/src/cc/rogue/x86_64-w64-msvc/deps/install/include/getopt.h b/src/cc/rogue/x86_64-w64-msvc/deps/install/include/getopt.h deleted file mode 100644 index 4de6e853e..000000000 --- a/src/cc/rogue/x86_64-w64-msvc/deps/install/include/getopt.h +++ /dev/null @@ -1,93 +0,0 @@ -/* $Id: getopt.h,v 1.1 2009/10/16 19:50:28 rodney Exp rodney $ */ -/* $OpenBSD: getopt.h,v 1.1 2002/12/03 20:24:29 millert Exp $ */ -/* $NetBSD: getopt.h,v 1.4 2000/07/07 10:43:54 ad Exp $ */ - -/*- - * Copyright (c) 2000 The NetBSD Foundation, Inc. - * All rights reserved. - * - * This code is derived from software contributed to The NetBSD Foundation - * by Dieter Baron and Thomas Klausner. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * 3. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by the NetBSD - * Foundation, Inc. and its contributors. - * 4. Neither the name of The NetBSD Foundation nor the names of its - * contributors may be used to endorse or promote products derived - * from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS - * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED - * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR - * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS - * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR - * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF - * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN - * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. - */ - -#ifndef _GETOPT_H_ -#define _GETOPT_H_ - -#if 0 -#include -#endif - -/* - * GNU-like getopt_long() and 4.4BSD getsubopt()/optreset extensions - */ -#define no_argument 0 -#define required_argument 1 -#define optional_argument 2 - -struct option { - /* name of long option */ - const char *name; - /* - * one of no_argument, required_argument, and optional_argument: - * whether option takes an argument - */ - int has_arg; - /* if not NULL, set *flag to val when option found */ - int *flag; - /* if flag not NULL, value to set *flag to; else return value */ - int val; -}; - -#ifdef __cplusplus -extern "C" { -#endif - -int getopt_long(int, char * const *, const char *, - const struct option *, int *); -int getopt_long_only(int, char * const *, const char *, - const struct option *, int *); -#ifndef _GETOPT_DEFINED -#define _GETOPT_DEFINED -int getopt(int, char * const *, const char *); -int getsubopt(char **, char * const *, char **); - -extern char *optarg; /* getopt(3) external variables */ -extern int opterr; -extern int optind; -extern int optopt; -extern int optreset; -extern char *suboptarg; /* getsubopt(3) external variable */ -#endif /* _GETOPT_DEFINED */ - -#ifdef __cplusplus -} -#endif -#endif /* !_GETOPT_H_ */ diff --git a/src/cc/rogue/x86_64-w64-msvc/deps/install/include/panel.h b/src/cc/rogue/x86_64-w64-msvc/deps/install/include/panel.h deleted file mode 100644 index 7f1fb1f17..000000000 --- a/src/cc/rogue/x86_64-w64-msvc/deps/install/include/panel.h +++ /dev/null @@ -1,56 +0,0 @@ -/* Public Domain Curses */ - -/*----------------------------------------------------------------------* - * Panels for PDCurses * - *----------------------------------------------------------------------*/ - -#ifndef __PDCURSES_PANEL_H__ -#define __PDCURSES_PANEL_H__ 1 - -#include - -#if defined(__cplusplus) || defined(__cplusplus__) || defined(__CPLUSPLUS) -extern "C" -{ -#endif - -typedef struct panelobs -{ - struct panelobs *above; - struct panel *pan; -} PANELOBS; - -typedef struct panel -{ - WINDOW *win; - int wstarty; - int wendy; - int wstartx; - int wendx; - struct panel *below; - struct panel *above; - const void *user; - struct panelobs *obscure; -} PANEL; - -PDCEX int bottom_panel(PANEL *pan); -PDCEX int del_panel(PANEL *pan); -PDCEX int hide_panel(PANEL *pan); -PDCEX int move_panel(PANEL *pan, int starty, int startx); -PDCEX PANEL *new_panel(WINDOW *win); -PDCEX PANEL *panel_above(const PANEL *pan); -PDCEX PANEL *panel_below(const PANEL *pan); -PDCEX int panel_hidden(const PANEL *pan); -PDCEX const void *panel_userptr(const PANEL *pan); -PDCEX WINDOW *panel_window(const PANEL *pan); -PDCEX int replace_panel(PANEL *pan, WINDOW *win); -PDCEX int set_panel_userptr(PANEL *pan, const void *uptr); -PDCEX int show_panel(PANEL *pan); -PDCEX int top_panel(PANEL *pan); -PDCEX void update_panels(void); - -#if defined(__cplusplus) || defined(__cplusplus__) || defined(__CPLUSPLUS) -} -#endif - -#endif /* __PDCURSES_PANEL_H__ */ diff --git a/src/cc/rogue/x86_64-w64-msvc/deps/install/include/term.h b/src/cc/rogue/x86_64-w64-msvc/deps/install/include/term.h deleted file mode 100644 index 0ba0b7a7f..000000000 --- a/src/cc/rogue/x86_64-w64-msvc/deps/install/include/term.h +++ /dev/null @@ -1,48 +0,0 @@ -/* Public Domain Curses */ - -/* PDCurses doesn't operate with terminfo, but we need these functions for - compatibility, to allow some things (notably, interface libraries for - other languages) to be compiled. Anyone who tries to actually _use_ - them will be disappointed, since they only return ERR. */ - -#ifndef __PDCURSES_TERM_H__ -#define __PDCURSES_TERM_H__ 1 - -#include - -#if defined(__cplusplus) || defined(__cplusplus__) || defined(__CPLUSPLUS) -extern "C" -{ -#endif - -typedef struct -{ - const char *_termname; -} TERMINAL; - -/* PDCEX is defined in curses.h */ -PDCEX TERMINAL *cur_term; - -int del_curterm(TERMINAL *); -int putp(const char *); -int restartterm(const char *, int, int *); -TERMINAL *set_curterm(TERMINAL *); -int setterm(const char *); -int setupterm(const char *, int, int *); -int tgetent(char *, const char *); -int tgetflag(const char *); -int tgetnum(const char *); -char *tgetstr(const char *, char **); -char *tgoto(const char *, int, int); -int tigetflag(const char *); -int tigetnum(const char *); -char *tigetstr(const char *); -char *tparm(const char *, long, long, long, long, long, - long, long, long, long); -int tputs(const char *, int, int (*)(int)); - -#if defined(__cplusplus) || defined(__cplusplus__) || defined(__CPLUSPLUS) -} -#endif - -#endif /* __PDCURSES_TERM_H__ */ diff --git a/src/cc/rogue/x86_64-w64-msvc/deps/install/include/unistd.h b/src/cc/rogue/x86_64-w64-msvc/deps/install/include/unistd.h deleted file mode 100644 index 5d2440309..000000000 --- a/src/cc/rogue/x86_64-w64-msvc/deps/install/include/unistd.h +++ /dev/null @@ -1,56 +0,0 @@ -#ifndef _UNISTD_H -#define _UNISTD_H 1 - -/* This is intended as a drop-in replacement for unistd.h on Windows. - * Please add functionality as neeeded. - * https://stackoverflow.com/a/826027/1202830 - */ - -#include -#include -#include /* getopt at: https://gist.github.com/ashelly/7776712 */ -#include /* for getpid() and the exec..() family */ -#include /* for _getcwd() and _chdir() */ - -#define srandom srand -#define random rand - -/* Values for the second argument to access. - These may be OR'd together. */ -#define R_OK 4 /* Test for read permission. */ -#define W_OK 2 /* Test for write permission. */ -//#define X_OK 1 /* execute permission - unsupported in windows*/ -#define F_OK 0 /* Test for existence. */ - -#define access _access -#define dup2 _dup2 -#define execve _execve -#define ftruncate _chsize -#define unlink _unlink -#define fileno _fileno -#define getcwd _getcwd -#define chdir _chdir -#define isatty _isatty -#define lseek _lseek -/* read, write, and close are NOT being #defined here, because while there are file handle specific versions for Windows, they probably don't work for sockets. You need to look at your app and consider whether to call e.g. closesocket(). */ - -#ifdef _WIN64 -#define ssize_t __int64 -#else -#define ssize_t long -#endif - -#define STDIN_FILENO 0 -#define STDOUT_FILENO 1 -#define STDERR_FILENO 2 -/* should be in some equivalent to */ -typedef __int8 int8_t; -typedef __int16 int16_t; -typedef __int32 int32_t; -typedef __int64 int64_t; -typedef unsigned __int8 uint8_t; -typedef unsigned __int16 uint16_t; -typedef unsigned __int32 uint32_t; -typedef unsigned __int64 uint64_t; - -#endif /* unistd.h */ \ No newline at end of file diff --git a/src/cc/rogue/xcrypt.c b/src/cc/rogue/xcrypt.c deleted file mode 100644 index 6effe3b57..000000000 --- a/src/cc/rogue/xcrypt.c +++ /dev/null @@ -1,711 +0,0 @@ -// Copyright (c) 2016-2023 The Hush developers -// Distributed under the GPLv3 software license, see the accompanying -// file COPYING or https://www.gnu.org/licenses/gpl-3.0.en.html -/* - * FreeSec: libcrypt - * - * Copyright (C) 1994 David Burren - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * 3. Neither the name(s) of the author(s) nor the names of other contributors - * may be used to endorse or promote products derived from this software - * without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR(S) AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR(S) OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - * - * - * This is an original implementation of the DES and the crypt(3) interfaces - * by David Burren . - * - * An excellent reference on the underlying algorithm (and related - * algorithms) is: - * - * B. Schneier, Applied Cryptography: protocols, algorithms, - * and source code in C, John Wiley & Sons, 1994. - * - * Note that in that book's description of DES the lookups for the initial, - * pbox, and final permutations are inverted (this has been brought to the - * attention of the author). A list of errata for this book has been - * posted to the sci.crypt newsgroup by the author and is available for FTP. - * - * NOTE: - * This file has a static version of des_setkey() so that crypt.o exports - * only the crypt() interface. This is required to make binaries linked - * against crypt.o exportable or re-exportable from the USA. - * NOTE2: Math is freedom of speech. -- Duke Leto - */ - -#include -#include - -unsigned int md_endian = 0x01020304; - -unsigned int -xntohl(unsigned int x) -{ - if ( *((char *)&md_endian) == 0x01 ) - return(x); - else - return( ((x & 0x000000ffU) << 24) | - ((x & 0x0000ff00U) << 8) | - ((x & 0x00ff0000U) >> 8) | - ((x & 0xff000000U) >> 24) ); -} - -unsigned -xhtonl(unsigned int x) -{ - if ( *((char *)&md_endian) == 0x01 ) - return(x); - else - return( ((x & 0x000000ffU) << 24) | - ((x & 0x0000ff00U) << 8) | - ((x & 0x00ff0000U) >> 8) | - ((x & 0xff000000U) >> 24) ); -} - -#define _PASSWORD_EFMT1 '_' - -static unsigned char IP[64] = { - 58, 50, 42, 34, 26, 18, 10, 2, 60, 52, 44, 36, 28, 20, 12, 4, - 62, 54, 46, 38, 30, 22, 14, 6, 64, 56, 48, 40, 32, 24, 16, 8, - 57, 49, 41, 33, 25, 17, 9, 1, 59, 51, 43, 35, 27, 19, 11, 3, - 61, 53, 45, 37, 29, 21, 13, 5, 63, 55, 47, 39, 31, 23, 15, 7 -}; - -static unsigned char inv_key_perm[64]; -static unsigned char key_perm[56] = { - 57, 49, 41, 33, 25, 17, 9, 1, 58, 50, 42, 34, 26, 18, - 10, 2, 59, 51, 43, 35, 27, 19, 11, 3, 60, 52, 44, 36, - 63, 55, 47, 39, 31, 23, 15, 7, 62, 54, 46, 38, 30, 22, - 14, 6, 61, 53, 45, 37, 29, 21, 13, 5, 28, 20, 12, 4 -}; - -static unsigned char key_shifts[16] = { - 1, 1, 2, 2, 2, 2, 2, 2, 1, 2, 2, 2, 2, 2, 2, 1 -}; - -static unsigned char inv_comp_perm[56]; -static unsigned char comp_perm[48] = { - 14, 17, 11, 24, 1, 5, 3, 28, 15, 6, 21, 10, - 23, 19, 12, 4, 26, 8, 16, 7, 27, 20, 13, 2, - 41, 52, 31, 37, 47, 55, 30, 40, 51, 45, 33, 48, - 44, 49, 39, 56, 34, 53, 46, 42, 50, 36, 29, 32 -}; - -/* - * No E box is used, as it's replaced by some ANDs, shifts, and ORs. - */ - -static unsigned char u_sbox[8][64]; -static unsigned char sbox[8][64] = { - { - 14, 4, 13, 1, 2, 15, 11, 8, 3, 10, 6, 12, 5, 9, 0, 7, - 0, 15, 7, 4, 14, 2, 13, 1, 10, 6, 12, 11, 9, 5, 3, 8, - 4, 1, 14, 8, 13, 6, 2, 11, 15, 12, 9, 7, 3, 10, 5, 0, - 15, 12, 8, 2, 4, 9, 1, 7, 5, 11, 3, 14, 10, 0, 6, 13 - }, - { - 15, 1, 8, 14, 6, 11, 3, 4, 9, 7, 2, 13, 12, 0, 5, 10, - 3, 13, 4, 7, 15, 2, 8, 14, 12, 0, 1, 10, 6, 9, 11, 5, - 0, 14, 7, 11, 10, 4, 13, 1, 5, 8, 12, 6, 9, 3, 2, 15, - 13, 8, 10, 1, 3, 15, 4, 2, 11, 6, 7, 12, 0, 5, 14, 9 - }, - { - 10, 0, 9, 14, 6, 3, 15, 5, 1, 13, 12, 7, 11, 4, 2, 8, - 13, 7, 0, 9, 3, 4, 6, 10, 2, 8, 5, 14, 12, 11, 15, 1, - 13, 6, 4, 9, 8, 15, 3, 0, 11, 1, 2, 12, 5, 10, 14, 7, - 1, 10, 13, 0, 6, 9, 8, 7, 4, 15, 14, 3, 11, 5, 2, 12 - }, - { - 7, 13, 14, 3, 0, 6, 9, 10, 1, 2, 8, 5, 11, 12, 4, 15, - 13, 8, 11, 5, 6, 15, 0, 3, 4, 7, 2, 12, 1, 10, 14, 9, - 10, 6, 9, 0, 12, 11, 7, 13, 15, 1, 3, 14, 5, 2, 8, 4, - 3, 15, 0, 6, 10, 1, 13, 8, 9, 4, 5, 11, 12, 7, 2, 14 - }, - { - 2, 12, 4, 1, 7, 10, 11, 6, 8, 5, 3, 15, 13, 0, 14, 9, - 14, 11, 2, 12, 4, 7, 13, 1, 5, 0, 15, 10, 3, 9, 8, 6, - 4, 2, 1, 11, 10, 13, 7, 8, 15, 9, 12, 5, 6, 3, 0, 14, - 11, 8, 12, 7, 1, 14, 2, 13, 6, 15, 0, 9, 10, 4, 5, 3 - }, - { - 12, 1, 10, 15, 9, 2, 6, 8, 0, 13, 3, 4, 14, 7, 5, 11, - 10, 15, 4, 2, 7, 12, 9, 5, 6, 1, 13, 14, 0, 11, 3, 8, - 9, 14, 15, 5, 2, 8, 12, 3, 7, 0, 4, 10, 1, 13, 11, 6, - 4, 3, 2, 12, 9, 5, 15, 10, 11, 14, 1, 7, 6, 0, 8, 13 - }, - { - 4, 11, 2, 14, 15, 0, 8, 13, 3, 12, 9, 7, 5, 10, 6, 1, - 13, 0, 11, 7, 4, 9, 1, 10, 14, 3, 5, 12, 2, 15, 8, 6, - 1, 4, 11, 13, 12, 3, 7, 14, 10, 15, 6, 8, 0, 5, 9, 2, - 6, 11, 13, 8, 1, 4, 10, 7, 9, 5, 0, 15, 14, 2, 3, 12 - }, - { - 13, 2, 8, 4, 6, 15, 11, 1, 10, 9, 3, 14, 5, 0, 12, 7, - 1, 15, 13, 8, 10, 3, 7, 4, 12, 5, 6, 11, 0, 14, 9, 2, - 7, 11, 4, 1, 9, 12, 14, 2, 0, 6, 10, 13, 15, 3, 5, 8, - 2, 1, 14, 7, 4, 10, 8, 13, 15, 12, 9, 0, 3, 5, 6, 11 - } -}; - -static unsigned char un_pbox[32]; -static unsigned char pbox[32] = { - 16, 7, 20, 21, 29, 12, 28, 17, 1, 15, 23, 26, 5, 18, 31, 10, - 2, 8, 24, 14, 32, 27, 3, 9, 19, 13, 30, 6, 22, 11, 4, 25 -}; - -static unsigned int bits32[32] = -{ - 0x80000000, 0x40000000, 0x20000000, 0x10000000, - 0x08000000, 0x04000000, 0x02000000, 0x01000000, - 0x00800000, 0x00400000, 0x00200000, 0x00100000, - 0x00080000, 0x00040000, 0x00020000, 0x00010000, - 0x00008000, 0x00004000, 0x00002000, 0x00001000, - 0x00000800, 0x00000400, 0x00000200, 0x00000100, - 0x00000080, 0x00000040, 0x00000020, 0x00000010, - 0x00000008, 0x00000004, 0x00000002, 0x00000001 -}; - -static unsigned char bits8[8] = { 0x80, 0x40, 0x20, 0x10, 0x08, 0x04, 0x02, 0x01 }; - -static unsigned int saltbits; -static int old_salt; -static unsigned int *bits28, *bits24; -static unsigned char init_perm[64], final_perm[64]; -static unsigned int en_keysl[16], en_keysr[16]; -static unsigned int de_keysl[16], de_keysr[16]; -static int des_initialised = 0; -static unsigned char m_sbox[4][4096]; -static unsigned int psbox[4][256]; -static unsigned int ip_maskl[8][256], ip_maskr[8][256]; -static unsigned int fp_maskl[8][256], fp_maskr[8][256]; -static unsigned int key_perm_maskl[8][128], key_perm_maskr[8][128]; -static unsigned int comp_maskl[8][128], comp_maskr[8][128]; -static unsigned int old_rawkey0, old_rawkey1; - -static unsigned char ascii64[] = - "./0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz"; -/* 0000000000111111111122222222223333333333444444444455555555556666 */ -/* 0123456789012345678901234567890123456789012345678901234567890123 */ - -static __inline int -ascii_to_bin(char ch) -{ - if (ch > 'z') - return(0); - if (ch >= 'a') - return(ch - 'a' + 38); - if (ch > 'Z') - return(0); - if (ch >= 'A') - return(ch - 'A' + 12); - if (ch > '9') - return(0); - if (ch >= '.') - return(ch - '.'); - return(0); -} - -static void -des_init() -{ - int i, j, b, k, inbit, obit; - unsigned int *p, *il, *ir, *fl, *fr; - - old_rawkey0 = old_rawkey1 = 0; - saltbits = 0; - old_salt = 0; - bits24 = (bits28 = bits32 + 4) + 4; - - /* - * Invert the S-boxes, reordering the input bits. - */ - for (i = 0; i < 8; i++) - for (j = 0; j < 64; j++) { - b = (j & 0x20) | ((j & 1) << 4) | ((j >> 1) & 0xf); - u_sbox[i][j] = sbox[i][b]; - } - - /* - * Convert the inverted S-boxes into 4 arrays of 8 bits. - * Each will handle 12 bits of the S-box input. - */ - for (b = 0; b < 4; b++) - for (i = 0; i < 64; i++) - for (j = 0; j < 64; j++) - m_sbox[b][(i << 6) | j] = - (u_sbox[(b << 1)][i] << 4) | - u_sbox[(b << 1) + 1][j]; - - /* - * Set up the initial & final permutations into a useful form, and - * initialise the inverted key permutation. - */ - for (i = 0; i < 64; i++) { - init_perm[final_perm[i] = IP[i] - 1] = (unsigned char) i; - inv_key_perm[i] = 255; - } - - /* - * Invert the key permutation and initialise the inverted key - * compression permutation. - */ - for (i = 0; i < 56; i++) { - inv_key_perm[key_perm[i] - 1] = (unsigned char) i; - inv_comp_perm[i] = 255; - } - - /* - * Invert the key compression permutation. - */ - for (i = 0; i < 48; i++) { - inv_comp_perm[comp_perm[i] - 1] = (unsigned char) i; - } - - /* - * Set up the OR-mask arrays for the initial and final permutations, - * and for the key initial and compression permutations. - */ - for (k = 0; k < 8; k++) { - for (i = 0; i < 256; i++) { - *(il = &ip_maskl[k][i]) = 0; - *(ir = &ip_maskr[k][i]) = 0; - *(fl = &fp_maskl[k][i]) = 0; - *(fr = &fp_maskr[k][i]) = 0; - for (j = 0; j < 8; j++) { - inbit = 8 * k + j; - if (i & bits8[j]) { - if ((obit = init_perm[inbit]) < 32) - *il |= bits32[obit]; - else - *ir |= bits32[obit-32]; - if ((obit = final_perm[inbit]) < 32) - *fl |= bits32[obit]; - else - *fr |= bits32[obit - 32]; - } - } - } - for (i = 0; i < 128; i++) { - *(il = &key_perm_maskl[k][i]) = 0; - *(ir = &key_perm_maskr[k][i]) = 0; - for (j = 0; j < 7; j++) { - inbit = 8 * k + j; - if (i & bits8[j + 1]) { - if ((obit = inv_key_perm[inbit]) == 255) - continue; - if (obit < 28) - *il |= bits28[obit]; - else - *ir |= bits28[obit - 28]; - } - } - *(il = &comp_maskl[k][i]) = 0; - *(ir = &comp_maskr[k][i]) = 0; - for (j = 0; j < 7; j++) { - inbit = 7 * k + j; - if (i & bits8[j + 1]) { - if ((obit=inv_comp_perm[inbit]) == 255) - continue; - if (obit < 24) - *il |= bits24[obit]; - else - *ir |= bits24[obit - 24]; - } - } - } - } - - /* - * Invert the P-box permutation, and convert into OR-masks for - * handling the output of the S-box arrays setup above. - */ - for (i = 0; i < 32; i++) - un_pbox[pbox[i] - 1] = (unsigned char) i; - - for (b = 0; b < 4; b++) - for (i = 0; i < 256; i++) { - *(p = &psbox[b][i]) = 0; - for (j = 0; j < 8; j++) { - if (i & bits8[j]) - *p |= bits32[un_pbox[8 * b + j]]; - } - } - - des_initialised = 1; -} - -static void -setup_salt(int salt) -{ - unsigned int obit, saltbit; - int i; - - if (salt == old_salt) - return; - old_salt = salt; - - saltbits = 0; - saltbit = 1; - obit = 0x800000; - for (i = 0; i < 24; i++) { - if (salt & saltbit) - saltbits |= obit; - saltbit <<= 1; - obit >>= 1; - } -} - -static int -des_setkey(const char *key) -{ - unsigned int k0, k1, rawkey0, rawkey1; - int shifts, round; - - if (!des_initialised) - des_init(); - - rawkey0 = xntohl(*(unsigned int *) key); - rawkey1 = xntohl(*(unsigned int *) (key + 4)); - - if ((rawkey0 | rawkey1) - && rawkey0 == old_rawkey0 - && rawkey1 == old_rawkey1) { - /* - * Already setup for this key. - * This optimisation fails on a zero key (which is weak and - * has bad parity anyway) in order to simplify the starting - * conditions. - */ - return(0); - } - old_rawkey0 = rawkey0; - old_rawkey1 = rawkey1; - - /* - * Do key permutation and split into two 28-bit subkeys. - */ - k0 = key_perm_maskl[0][rawkey0 >> 25] - | key_perm_maskl[1][(rawkey0 >> 17) & 0x7f] - | key_perm_maskl[2][(rawkey0 >> 9) & 0x7f] - | key_perm_maskl[3][(rawkey0 >> 1) & 0x7f] - | key_perm_maskl[4][rawkey1 >> 25] - | key_perm_maskl[5][(rawkey1 >> 17) & 0x7f] - | key_perm_maskl[6][(rawkey1 >> 9) & 0x7f] - | key_perm_maskl[7][(rawkey1 >> 1) & 0x7f]; - k1 = key_perm_maskr[0][rawkey0 >> 25] - | key_perm_maskr[1][(rawkey0 >> 17) & 0x7f] - | key_perm_maskr[2][(rawkey0 >> 9) & 0x7f] - | key_perm_maskr[3][(rawkey0 >> 1) & 0x7f] - | key_perm_maskr[4][rawkey1 >> 25] - | key_perm_maskr[5][(rawkey1 >> 17) & 0x7f] - | key_perm_maskr[6][(rawkey1 >> 9) & 0x7f] - | key_perm_maskr[7][(rawkey1 >> 1) & 0x7f]; - /* - * Rotate subkeys and do compression permutation. - */ - shifts = 0; - for (round = 0; round < 16; round++) { - unsigned int t0, t1; - - shifts += key_shifts[round]; - - t0 = (k0 << shifts) | (k0 >> (28 - shifts)); - t1 = (k1 << shifts) | (k1 >> (28 - shifts)); - - de_keysl[15 - round] = - en_keysl[round] = comp_maskl[0][(t0 >> 21) & 0x7f] - | comp_maskl[1][(t0 >> 14) & 0x7f] - | comp_maskl[2][(t0 >> 7) & 0x7f] - | comp_maskl[3][t0 & 0x7f] - | comp_maskl[4][(t1 >> 21) & 0x7f] - | comp_maskl[5][(t1 >> 14) & 0x7f] - | comp_maskl[6][(t1 >> 7) & 0x7f] - | comp_maskl[7][t1 & 0x7f]; - - de_keysr[15 - round] = - en_keysr[round] = comp_maskr[0][(t0 >> 21) & 0x7f] - | comp_maskr[1][(t0 >> 14) & 0x7f] - | comp_maskr[2][(t0 >> 7) & 0x7f] - | comp_maskr[3][t0 & 0x7f] - | comp_maskr[4][(t1 >> 21) & 0x7f] - | comp_maskr[5][(t1 >> 14) & 0x7f] - | comp_maskr[6][(t1 >> 7) & 0x7f] - | comp_maskr[7][t1 & 0x7f]; - } - return(0); -} - -static int -do_des(unsigned int l_in, unsigned int r_in, unsigned int *l_out, - unsigned int *r_out, int count) -{ - /* - * l_in, r_in, l_out, and r_out are in pseudo-"big-endian" format. - */ - unsigned int l, r, *kl, *kr, *kl1, *kr1; - unsigned int f = 0, r48l, r48r; - int round; - - if (count == 0) { - return(1); - } else if (count > 0) { - /* - * Encrypting - */ - kl1 = en_keysl; - kr1 = en_keysr; - } else { - /* - * Decrypting - */ - count = -count; - kl1 = de_keysl; - kr1 = de_keysr; - } - - /* - * Do initial permutation (IP). - */ - l = ip_maskl[0][l_in >> 24] - | ip_maskl[1][(l_in >> 16) & 0xff] - | ip_maskl[2][(l_in >> 8) & 0xff] - | ip_maskl[3][l_in & 0xff] - | ip_maskl[4][r_in >> 24] - | ip_maskl[5][(r_in >> 16) & 0xff] - | ip_maskl[6][(r_in >> 8) & 0xff] - | ip_maskl[7][r_in & 0xff]; - r = ip_maskr[0][l_in >> 24] - | ip_maskr[1][(l_in >> 16) & 0xff] - | ip_maskr[2][(l_in >> 8) & 0xff] - | ip_maskr[3][l_in & 0xff] - | ip_maskr[4][r_in >> 24] - | ip_maskr[5][(r_in >> 16) & 0xff] - | ip_maskr[6][(r_in >> 8) & 0xff] - | ip_maskr[7][r_in & 0xff]; - - while (count--) { - /* - * Do each round. - */ - kl = kl1; - kr = kr1; - round = 16; - while (round--) { - /* - * Expand R to 48 bits (simulate the E-box). - */ - r48l = ((r & 0x00000001) << 23) - | ((r & 0xf8000000) >> 9) - | ((r & 0x1f800000) >> 11) - | ((r & 0x01f80000) >> 13) - | ((r & 0x001f8000) >> 15); - - r48r = ((r & 0x0001f800) << 7) - | ((r & 0x00001f80) << 5) - | ((r & 0x000001f8) << 3) - | ((r & 0x0000001f) << 1) - | ((r & 0x80000000) >> 31); - /* - * Do salting for crypt() and friends, and - * XOR with the permuted key. - */ - f = (r48l ^ r48r) & saltbits; - r48l ^= f ^ *kl++; - r48r ^= f ^ *kr++; - /* - * Do sbox lookups (which shrink it back to 32 bits) - * and do the pbox permutation at the same time. - */ - f = psbox[0][m_sbox[0][r48l >> 12]] - | psbox[1][m_sbox[1][r48l & 0xfff]] - | psbox[2][m_sbox[2][r48r >> 12]] - | psbox[3][m_sbox[3][r48r & 0xfff]]; - /* - * Now that we've permuted things, complete f(). - */ - f ^= l; - l = r; - r = f; - } - r = l; - l = f; - } - /* - * Do final permutation (inverse of IP). - */ - *l_out = fp_maskl[0][l >> 24] - | fp_maskl[1][(l >> 16) & 0xff] - | fp_maskl[2][(l >> 8) & 0xff] - | fp_maskl[3][l & 0xff] - | fp_maskl[4][r >> 24] - | fp_maskl[5][(r >> 16) & 0xff] - | fp_maskl[6][(r >> 8) & 0xff] - | fp_maskl[7][r & 0xff]; - *r_out = fp_maskr[0][l >> 24] - | fp_maskr[1][(l >> 16) & 0xff] - | fp_maskr[2][(l >> 8) & 0xff] - | fp_maskr[3][l & 0xff] - | fp_maskr[4][r >> 24] - | fp_maskr[5][(r >> 16) & 0xff] - | fp_maskr[6][(r >> 8) & 0xff] - | fp_maskr[7][r & 0xff]; - return(0); -} - -static int -des_cipher(const char *in, char *out, int salt, int count) -{ - unsigned int l_out, r_out, rawl, rawr; - unsigned int x[2]; - int retval; - - if (!des_initialised) - des_init(); - - setup_salt(salt); - - memcpy(x, in, sizeof x); - rawl = xntohl(x[0]); - rawr = xntohl(x[1]); - retval = do_des(rawl, rawr, &l_out, &r_out, count); - - x[0] = xhtonl(l_out); - x[1] = xhtonl(r_out); - memcpy(out, x, sizeof x); - return(retval); -} - -char * -xcrypt( char *key, char *setting) -{ - int i; - unsigned int count, salt, l, r0, r1, keybuf[2]; - unsigned char *p, *q; - static unsigned char output[21]; - - if (!des_initialised) - des_init(); - - /* - * Copy the key, shifting each character up by one bit - * and padding with zeros. - */ - q = (unsigned char *) keybuf; - while ((q - (unsigned char *) keybuf) < sizeof(keybuf)) { - if ((*q++ = *key << 1)) - key++; - } - if (des_setkey((const char *) keybuf)) - return(NULL); - - if (*setting == _PASSWORD_EFMT1) { - /* - * "new"-style: - * setting - underscore, 4 bytes of count, 4 bytes of salt - * key - unlimited characters - */ - for (i = 1, count = 0; i < 5; i++) - count |= ascii_to_bin(setting[i]) << (i - 1) * 6; - - for (i = 5, salt = 0; i < 9; i++) - salt |= ascii_to_bin(setting[i]) << (i - 5) * 6; - - while (*key) { - /* - * Encrypt the key with itself. - */ - if (des_cipher((const char*)keybuf, (char*)keybuf, 0, 1)) - return(NULL); - /* - * And XOR with the next 8 characters of the key. - */ - q = (unsigned char *) keybuf; - while (((q - (unsigned char *) keybuf) < sizeof(keybuf)) && - *key) - *q++ ^= *key++ << 1; - - if (des_setkey((const char *) keybuf)) - return(NULL); - } - strncpy((char *)output, setting, 9); - - /* - * Double check that we weren't given a short setting. - * If we were, the above code will probably have created - * wierd values for count and salt, but we don't really care. - * Just make sure the output string doesn't have an extra - * NUL in it. - */ - output[9] = '\0'; - p = output + strlen((const char *)output); - } else { - /* - * "old"-style: - * setting - 2 bytes of salt - * key - up to 8 characters - */ - count = 25; - - salt = (ascii_to_bin(setting[1]) << 6) - | ascii_to_bin(setting[0]); - - output[0] = setting[0]; - /* - * If the encrypted password that the salt was extracted from - * is only 1 character long, the salt will be corrupted. We - * need to ensure that the output string doesn't have an extra - * NUL in it! - */ - output[1] = setting[1] ? setting[1] : output[0]; - - p = output + 2; - } - setup_salt(salt); - /* - * Do it. - */ - if (do_des(0, 0, &r0, &r1, count)) - return(NULL); - /* - * Now encode the result... - */ - l = (r0 >> 8); - *p++ = ascii64[(l >> 18) & 0x3f]; - *p++ = ascii64[(l >> 12) & 0x3f]; - *p++ = ascii64[(l >> 6) & 0x3f]; - *p++ = ascii64[l & 0x3f]; - - l = (r0 << 16) | ((r1 >> 16) & 0xffff); - *p++ = ascii64[(l >> 18) & 0x3f]; - *p++ = ascii64[(l >> 12) & 0x3f]; - *p++ = ascii64[(l >> 6) & 0x3f]; - *p++ = ascii64[l & 0x3f]; - - l = r1 << 2; - *p++ = ascii64[(l >> 12) & 0x3f]; - *p++ = ascii64[(l >> 6) & 0x3f]; - *p++ = ascii64[l & 0x3f]; - *p = 0; - - return((char *)output); -} diff --git a/src/cc/rogue_rpc.cpp b/src/cc/rogue_rpc.cpp deleted file mode 100644 index 88d18b620..000000000 --- a/src/cc/rogue_rpc.cpp +++ /dev/null @@ -1,1657 +0,0 @@ -// Copyright (c) 2016-2023 The Hush developers -// Distributed under the GPLv3 software license, see the accompanying -// file COPYING or https://www.gnu.org/licenses/gpl-3.0.en.html - -/****************************************************************************** - * Copyright © 2014-2019 The SuperNET Developers. * - * * - * See the AUTHORS, DEVELOPER-AGREEMENT and LICENSE files at * - * the top-level directory of this distribution for the individual copyright * - * holder information and the developer policies on copyright and licensing. * - * * - * Unless otherwise agreed in a custom licensing agreement, no part of the * - * SuperNET software, including this file may be copied, modified, propagated * - * or distributed except according to the terms contained in the LICENSE file * - * * - * Removal or modification of this copyright notice is prohibited. * - * * - ******************************************************************************/ - -#include "cJSON.h" -#include "CCinclude.h" - -#define ROGUE_REGISTRATION 5 -#define ROGUE_REGISTRATIONSIZE (100 * 10000) -#define ROGUE_MAXPLAYERS 64 // need to send unused fees back to globalCC address to prevent leeching -#define ROGUE_MAXKEYSTROKESGAP 60 -#define ROGUE_MAXITERATIONS 777 -#define ROGUE_MAXCASHOUT (777 * COIN) - -#include "rogue/rogue_player.h" - -std::string Rogue_pname = ""; - -/* - Roguelander - using highlander competition between rogue players - - anybody can create a game by specifying maxplayers and buyin. Buyin of 0.00 ROGUE is for newbies and a good way to get experience. All players will start in the identical level, but each level after that will be unique to each player. - - There are two different modes that is based on the maxplayers. If maxplayers is one, then it is basically a practice/farming game where there are no time limits. Also, the gold -> ROGUE conversion rate is cut in half. You can start a single player game as soon as the newgame tx is confirmed. - - If maxplayers is more than one, then it goes into highlander mode. There can only be one winner. Additionally, multiplayer mode adds a timelimit of ROGUE_MAXKEYSTROKESGAP (60) blocks between keystrokes updates. That is approx. one hour and every level it does an automatic update, so as long as you are actively playing, it wont be a problem. The is ROGUE_REGISTRATION blocks waiting period before any of the players can start. The random seed for the game is based on the future blockhash so that way, nobody is able to start before the others. - - rogue is not an easy game to win, so it could be that the winner for a specific group is simply the last one standing. If you bailout of a game you cant win, but you can convert all the ingame gold you gathered at 0.001 ROGUE each. [In the event that there arent enough globally locked funds to payout the ROGUE, you will have to wait until there is. Since 10% of all economic activity creates more globally locked funds, it is just a matter of time before there will be enough funds to payout. Also, you can help speed this up by encouraging others to transact in ROGUE] - - Of course, the most direct way to win, is to get the amulet and come back out of the dungeon. The winner will get all of the buyins from all the players in addition to 0.01 ROGUE for every ingame gold. - - The above alone is enough to make the timeless classic solitaire game into a captivating multiplayer game, where real coins are at stake. However, there is an even better aspect to ROGUE! Whenever your player survives a game, even when you bailout, the entire player and his pack is preserved on the blockchain and becomes a nonfungible asset that you can trade for ROGUE. - - Additionally, instead of just being a collectors item with unique characteristics, the rogue playerdata can be used in any ROGUE game. Just specify the txid that created your character when you register and your character is restored. The better your characteristics your playerdata has, the more likely you are to win in multiplayer mode to win all the buyins. So there is definite economic value to a strong playerdata. - - You can farm characters in single player mode to earn ROGUE or to make competitive playerdata sets. You can purchase existing playerdata for collecting, or for using in battle. - - Here is how to play: - - ./hush-cli -ac_name=ROGUE cclib newgame 17 \"[3,10]\" -> this will create a hex transaction that when broadcast with sendrawtransaction will get a gametxid onto the blockchain. This specific command was for 3 players and a buyin of 10 ROGUE. Lets assume the gametxid is 4fd6f5cad0fac455e5989ca6eef111b00292845447075a802e9335879146ad5a, most all the other commands will need the gametxid. - - you can always find all the existing games with: - - ./hush-cli -ac_name=ROGUE cclib pending 17 - - and info about a specific game with: - - ./hush-cli -ac_name=ROGUE cclib gameinfo 17 \"[%224fd6f5cad0fac455e5989ca6eef111b00292845447075a802e9335879146ad5a%22]\" - - due to quirks of various parsing at the shell, rpc and internal level, the above convention is used where %22 is added where " should be. also all fields are separated by , without any space. - - When you do a gameinfo command it will show a "run" field and that will tell you if you are registered for the game or not. If not, the "run" field shows the register syntax you need to do, if you are registered, it will show the command line to start the rogue game that is playing the registered game. - -./hush-cli -ac_name=ROGUE cclib register 17 \"[%224fd6f5cad0fac455e5989ca6eef111b00292845447075a802e9335879146ad5a%22,%22playerdata_txid%22]\" - - If you want to cash in your ingame gold and preserve your character for another battle, do the bailout: - -./hush-cli -ac_name=ROGUE cclib bailout 17 \"[%224fd6f5cad0fac455e5989ca6eef111b00292845447075a802e9335879146ad5a%22]\" - - If you won your game before anybody else did or if you are the last one left who didnt bailout, you can claim the prize: - - ./hush-cli -ac_name=ROGUE cclib highlander 17 \"[%224fd6f5cad0fac455e5989ca6eef111b00292845447075a802e9335879146ad5a%22]\" - - The txid you get from the bailout or highlander transactions is the "playerdata_txid" that you can use in future games. - - - Transaction details - creategame - vout0 -> txfee highlander vout TCBOO creation - vout1 to vout.maxplayers+1 -> 1of2 registration ROGUE_REGISTRATIONSIZE batons - vout2+maxplayers to vout.2*maxplayers+1 -> 1of2 registration txfee batons for game completion - - register - vin0 -> ROGUE_REGISTRATIONSIZE 1of2 registration baton from creategame - vin1 -> optional nonfungible character vout @ - vin2 -> original creation TCBOO playerdata used - vin3+ -> buyin - vout0 -> keystrokes/completion baton - - keystrokes - vin0 -> txfee 1of2 baton from registration or previous keystrokes - opret -> user input chars - - bailout: must be within ROGUE_MAXKEYSTROKESGAP blocks of last keystrokes - vin0 -> keystrokes baton of completed game with Q - vout0 -> 1% ingame gold - - highlander - vin0 -> txfee highlander vout from creategame TCBOO creation - vin1 -> keystrokes baton of completed game, must be last to quit or first to win, only spent registration batons matter. If more than ROGUE_MAXKEYSTROKESGAP blocks since last keystrokes, it is forfeit - vins -> rest of unspent registration utxo so all newgame vouts are spent - vout0 -> nonfungible character with pack @ - vout1 -> 1% ingame gold and all the buyins - - - then to register you need to spend one of the vouts and also provide the buyin - once you register the gui mode is making automatic keystrokes tx with the raw chars in opreturn. - if during the registration, you provide a character as an input, your gameplay starts with that character instead of the default - - each keystrokes tx spends a baton vout that you had in your register tx - - so from the creategame tx, you can trace the maxplayers vouts to find all the registrations and all the keystrokes to get the keyboard events - - If you quit out of the game, then the in game gold that you earned can be converted to ROGUE coins, but unless you are the last one remaining, any character you input, is permanently spent - - so you can win a multiplayer by being the last player to quit or the first one to win. In either case, you would need to spend a special highlander vout in the original creategame tx. having this as an input allows to create a tx that has the character as the nonfungible token, collect all the buyin and of course the ingame gold - - once you have a non-fungible token, ownership of it can be transferred or traded or spent in a game - */ - -// todo: -// add some more conditions to multiplayer -// how does it work with playertxid instead of pubkey -// keystrokes retry - -//////////////////////// start of CClib interface -//./hushd -ac_name=ROGUE -ac_supply=1000000 -pubkey=03951a6f7967ad784453116bc55cd30c54f91ea8a5b1e9b04d6b29cfd6b395ba6c -addnode=5.9.102.210 -ac_cclib=rogue -ac_perc=10000000 -ac_reward=100000000 -ac_cc=60001 -ac_script=2ea22c80203d1579313abe7d8ea85f48c65ea66fc512c878c0d0e6f6d54036669de940febf8103120c008203000401cc > /dev/null & - -// cclib newgame 17 \"[3,10]\" -// cclib pending 17 -// ./c cclib gameinfo 17 \"[%226d3243c6e5ab383898b28a87e01f6c00b5bdd9687020f17f5caacc8a61febd19%22]\" -// cclib register 17 \"[%22aa81321d8889f881fe3d7c68c905b7447d9143832b0abbef6c2cab49dff8b0cc%22]\" -// ./rogue gui -> creates keystroke files -// ./c cclib register 17 \"[%226d3243c6e5ab383898b28a87e01f6c00b5bdd9687020f17f5caacc8a61febd19%22,%222475182f9d5169d8a3249d17640e4eccd90f4ee43ab04791129b0fa3f177b14a%22]\" -// ./c cclib bailout 17 \"[%226d3243c6e5ab383898b28a87e01f6c00b5bdd9687020f17f5caacc8a61febd19%22]\" -// ./hush-cli -ac_name=ROGUE cclib register 17 \"[%22a898f4ceef7647ba113b9f3c24ef045f5d134935a3b09bdd1a997b9d474f4c1b%22,%22f11d0cb4e2e4c21f029a1146f8e5926f11456885b7ab7d665096f5efedec8ea0%22]\" - - -CScript rogue_newgameopret(int64_t buyin,int32_t maxplayers) -{ - CScript opret; uint8_t evalcode = EVAL_ROGUE; - opret << OP_RETURN << E_MARSHAL(ss << evalcode << 'G' << buyin << maxplayers); - return(opret); -} - -CScript rogue_registeropret(uint256 gametxid,uint256 playertxid) -{ - CScript opret; uint8_t evalcode = EVAL_ROGUE; - //fprintf(stderr,"opret.(%s %s).R\n",gametxid.GetHex().c_str(),playertxid.GetHex().c_str()); - opret << OP_RETURN << E_MARSHAL(ss << evalcode << 'R' << gametxid << playertxid); - return(opret); -} - -CScript rogue_keystrokesopret(uint256 gametxid,uint256 batontxid,CPubKey pk,std::vectorkeystrokes) -{ - CScript opret; uint8_t evalcode = EVAL_ROGUE; - opret << OP_RETURN << E_MARSHAL(ss << evalcode << 'K' << gametxid << batontxid << pk << keystrokes); - return(opret); -} - -CScript rogue_highlanderopret(uint8_t funcid,uint256 gametxid,int32_t regslot,CPubKey pk,std::vectorplayerdata,std::string pname) -{ - CScript opret; uint8_t evalcode = EVAL_ROGUE; std::string symbol(SMART_CHAIN_SYMBOL); - opret << OP_RETURN << E_MARSHAL(ss << evalcode << funcid << gametxid << symbol << pname << regslot << pk << playerdata ); - return(opret); -} - -uint8_t rogue_highlanderopretdecode(uint256 &gametxid, uint256 &tokenid, int32_t ®slot, CPubKey &pk, std::vector &playerdata, std::string &symbol, std::string &pname,CScript scriptPubKey) -{ - std::string name, description; std::vector vorigPubkey; - std::vector> oprets, opretsDummy; - std::vector vopretNonfungible, vopret, vopretDummy,origpubkey; - uint8_t e, f,*script; std::vector voutPubkeys; - tokenid = zeroid; - GetOpReturnData(scriptPubKey, vopret); - script = (uint8_t *)vopret.data(); - if ( script[1] == 'c' && (f= DecodeTokenCreateOpRet(scriptPubKey,origpubkey,name,description, oprets)) == 'c' ) - { - GetOpretBlob(oprets, OPRETID_NONFUNGIBLEDATA, vopretNonfungible); - vopret = vopretNonfungible; - } - else if ( script[1] != 'H' && script[1] != 'Q' && (f= DecodeTokenOpRet(scriptPubKey, e, tokenid, voutPubkeys, opretsDummy)) != 0 ) - { - //fprintf(stderr,"decode opret %c tokenid.%s\n",script[1],tokenid.GetHex().c_str()); - GetNonfungibleData(tokenid, vopretNonfungible); //load nonfungible data from the 'tokenbase' tx - vopret = vopretNonfungible; - } - if ( vopret.size() > 2 && E_UNMARSHAL(vopret, ss >> e; ss >> f; ss >> gametxid; ss >> symbol; ss >> pname; ss >> regslot; ss >> pk; ss >> playerdata) != 0 && e == EVAL_ROGUE && (f == 'H' || f == 'Q') ) - { - return(f); - } - fprintf(stderr,"SKIP obsolete: e.%d f.%c game.%s regslot.%d psize.%d\n",e,f,gametxid.GetHex().c_str(),regslot,(int32_t)playerdata.size()); - return(0); -} - -uint8_t rogue_keystrokesopretdecode(uint256 &gametxid,uint256 &batontxid,CPubKey &pk,std::vector &keystrokes,CScript scriptPubKey) -{ - std::vector vopret; uint8_t e,f; - GetOpReturnData(scriptPubKey,vopret); - if ( vopret.size() > 2 && E_UNMARSHAL(vopret,ss >> e; ss >> f; ss >> gametxid; ss >> batontxid; ss >> pk; ss >> keystrokes) != 0 && e == EVAL_ROGUE && f == 'K' ) - { - return(f); - } - return(0); -} - -uint8_t rogue_registeropretdecode(uint256 &gametxid,uint256 &tokenid,uint256 &playertxid,CScript scriptPubKey) -{ - std::string name, description; std::vector vorigPubkey; - std::vector> oprets; - std::vector vopretNonfungible, vopret, vopretDummy,origpubkey; - uint8_t e, f,*script; std::vector voutPubkeys; - tokenid = zeroid; - GetOpReturnData(scriptPubKey, vopret); - script = (uint8_t *)vopret.data(); - if ( script[1] == 'c' && (f= DecodeTokenCreateOpRet(scriptPubKey,origpubkey,name,description,oprets)) == 'c' ) - { - GetOpretBlob(oprets, OPRETID_NONFUNGIBLEDATA, vopretNonfungible); - vopret = vopretNonfungible; - } - else if ( script[1] != 'R' && (f= DecodeTokenOpRet(scriptPubKey, e, tokenid, voutPubkeys, oprets)) != 0 ) - { - GetOpretBlob(oprets, OPRETID_ROGUEGAMEDATA, vopretDummy); // blob from non-creation tx opret - vopret = vopretDummy; - } - if ( vopret.size() > 2 && E_UNMARSHAL(vopret,ss >> e; ss >> f; ss >> gametxid; ss >> playertxid) != 0 && e == EVAL_ROGUE && f == 'R' ) - { - return(f); - } - //fprintf(stderr,"e.%d f.%c game.%s playertxid.%s\n",e,f,gametxid.GetHex().c_str(),playertxid.GetHex().c_str()); - return(0); -} - -uint8_t rogue_newgameopreturndecode(int64_t &buyin,int32_t &maxplayers,CScript scriptPubKey) -{ - std::vector vopret; uint8_t e,f; - GetOpReturnData(scriptPubKey,vopret); - if ( vopret.size() > 2 && E_UNMARSHAL(vopret,ss >> e; ss >> f; ss >> buyin; ss >> maxplayers) != 0 && e == EVAL_ROGUE && f == 'G' ) - { - return(f); - } - return(0); -} - -void rogue_univalue(UniValue &result,const char *method,int64_t maxplayers,int64_t buyin) -{ - if ( method != 0 ) - { - result.push_back(Pair("name","rogue")); - result.push_back(Pair("method",method)); - } - if ( maxplayers > 0 ) - result.push_back(Pair("maxplayers",maxplayers)); - if ( buyin >= 0 ) - { - result.push_back(Pair("buyin",ValueFromAmount(buyin))); - if ( buyin == 0 ) - result.push_back(Pair("type","newbie")); - else result.push_back(Pair("type","buyin")); - } -} - -int32_t rogue_iamregistered(int32_t maxplayers,uint256 gametxid,CTransaction tx,char *myrogueaddr) -{ - int32_t i,vout; uint256 spenttxid,hashBlock; CTransaction spenttx; char destaddr[64]; - for (i=0; i= 0 ) - { - if ( myGetTransaction(spenttxid,spenttx,hashBlock) != 0 && spenttx.vout.size() > 0 ) - { - Getscriptaddress(destaddr,spenttx.vout[0].scriptPubKey); - if ( strcmp(myrogueaddr,destaddr) == 0 ) - return(1); - //else fprintf(stderr,"myaddr.%s vs %s\n",myrogueaddr,destaddr); - } //else fprintf(stderr,"cant find spenttxid.%s\n",spenttxid.GetHex().c_str()); - } //else fprintf(stderr,"vout %d is unspent\n",vout); - } - return(0); -} - -int64_t rogue_buyins(uint256 gametxid,int32_t maxplayers) -{ - int32_t i,vout; uint256 spenttxid,hashBlock; CTransaction spenttx; int64_t buyins = 0; - for (i=0; i= 0 ) - { - if ( myGetTransaction(spenttxid,spenttx,hashBlock) != 0 && spenttx.vout.size() > 0 ) - { - if ( spenttx.vout[0].nValue > ROGUE_REGISTRATIONSIZE ) - buyins += (spenttx.vout[0].nValue - ROGUE_REGISTRATIONSIZE); - } //else fprintf(stderr,"cant find spenttxid.%s\n",spenttxid.GetHex().c_str()); - } //else fprintf(stderr,"vout %d is unspent\n",vout); - } - return(buyins); -} - -int32_t rogue_isvalidgame(struct CCcontract_info *cp,int32_t &gameheight,CTransaction &tx,int64_t &buyin,int32_t &maxplayers,uint256 txid,int32_t unspentv0) -{ - uint256 hashBlock; int32_t i,numvouts; char coinaddr[64]; CPubKey roguepk; uint64_t txfee = 10000; - buyin = maxplayers = 0; - if ( (txid == zeroid || myGetTransaction(txid,tx,hashBlock) != 0) && (numvouts= tx.vout.size()) > 1 ) - { - if ( txid != zeroid ) - gameheight = hush_blockheight(hashBlock); - else - { - txid = tx.GetHash(); - //fprintf(stderr,"set txid %s %llu\n",txid.GetHex().c_str(),(long long)CCgettxout(txid,0,1)); - } - if ( IsCClibvout(cp,tx,0,cp->unspendableCCaddr) == txfee && (unspentv0 == 0 || CCgettxout(txid,0,1,0) == txfee) ) - { - if ( rogue_newgameopreturndecode(buyin,maxplayers,tx.vout[numvouts-1].scriptPubKey) == 'G' ) - { - if ( maxplayers < 1 || maxplayers > ROGUE_MAXPLAYERS || buyin < 0 ) - return(-6); - if ( numvouts > 2*maxplayers+1 ) - { - for (i=0; i playerdata) -{ - struct rogue_player P; int32_t i; char packitemstr[512]; - if ( playerdata.size() > 0 ) - { - for (i=0; i>16,P.level,P.experience,P.dungeonlevel); - for (i=0; i playerdata,uint256 playertxid,uint256 tokenid,std::string symbol,std::string pname,uint256 gametxid) -{ - int32_t i,vout,spentvini,numvouts,n=0; uint256 txid,spenttxid,hashBlock; struct rogue_player P; char packitemstr[512],*datastr=0; UniValue obj(UniValue::VOBJ),a(UniValue::VARR); CTransaction tx; - memset(&P,0,sizeof(P)); - if ( playerdata.size() > 0 ) - { - datastr = (char *)malloc(playerdata.size()*2+1); - for (i=0; i= 0 ) - txid = spenttxid; - else if ( myIsutxo_spentinmempool(spenttxid,spentvini,txid,vout) == 0 || spenttxid == zeroid ) - { - fprintf(stderr,"mempool tracking error %s/v0\n",txid.ToString().c_str()); - break; - } - txid = spenttxid; - vout = 0; - if ( myGetTransaction(txid,tx,hashBlock) != 0 && (numvouts= tx.vout.size()) > 1 ) - { - for (i=0; i ROGUE_MAXITERATIONS ) - break; - } - obj.push_back(Pair("gametxid",gametxid.GetHex())); - if ( txid != playertxid ) - obj.push_back(Pair("batontxid",txid.GetHex())); - obj.push_back(Pair("playertxid",playertxid.GetHex())); - if ( tokenid != zeroid ) - obj.push_back(Pair("tokenid",tokenid.GetHex())); - else obj.push_back(Pair("tokenid",playertxid.GetHex())); - if ( datastr != 0 ) - { - obj.push_back(Pair("data",datastr)); - free(datastr); - } - obj.push_back(Pair("pack",a)); - obj.push_back(Pair("packsize",(int64_t)P.packsize)); - obj.push_back(Pair("hitpoints",(int64_t)P.hitpoints)); - obj.push_back(Pair("strength",(int64_t)(P.strength&0xffff))); - obj.push_back(Pair("maxstrength",(int64_t)(P.strength>>16))); - obj.push_back(Pair("level",(int64_t)P.level)); - obj.push_back(Pair("experience",(int64_t)P.experience)); - obj.push_back(Pair("dungeonlevel",(int64_t)P.dungeonlevel)); - obj.push_back(Pair("chain",symbol)); - obj.push_back(Pair("pname",pname)); - return(obj); -} - -int32_t rogue_iterateplayer(uint256 ®istertxid,uint256 firsttxid,int32_t firstvout,uint256 lasttxid) // retrace playertxid vins to reach highlander <- this verifies player is valid and rogue_playerdataspend makes sure it can only be used once -{ - uint256 spenttxid,txid = firsttxid; int32_t spentvini,n,vout = firstvout; - registertxid = zeroid; - if ( vout < 0 ) - return(-1); - n = 0; - while ( (spentvini= myIsutxo_spent(spenttxid,txid,vout)) == 0 ) - { - txid = spenttxid; - vout = spentvini; - if ( registertxid == zeroid ) - registertxid = txid; - if ( ++n >= ROGUE_MAXITERATIONS ) - { - fprintf(stderr,"rogue_iterateplayer n.%d, seems something is wrong\n",n); - return(-2); - } - } - if ( txid == lasttxid ) - return(0); - else - { - fprintf(stderr,"firsttxid.%s/v%d -> %s != last.%s\n",firsttxid.ToString().c_str(),firstvout,txid.ToString().c_str(),lasttxid.ToString().c_str()); - return(-1); - } -} - -/* - playertxid is whoever owns the nonfungible satoshi and it might have been bought and sold many times. - highlander is the game winning tx with the player data and is the only place where the unique player data exists - origplayergame is the gametxid that ends up being won by the highlander and they are linked directly as the highlander tx spends gametxid.vout0 - */ - -int32_t rogue_playerdata(struct CCcontract_info *cp,uint256 &origplayergame,uint256 &tokenid,CPubKey &pk,std::vector &playerdata,std::string &symbol,std::string &pname,uint256 playertxid) -{ - uint256 origplayertxid,hashBlock,gametxid,registertxid; CTransaction gametx,playertx,highlandertx; std::vector vopret; uint8_t *script,e,f; int32_t i,regslot,gameheight,numvouts,maxplayers; int64_t buyin; - if ( myGetTransaction(playertxid,playertx,hashBlock) != 0 && (numvouts= playertx.vout.size()) > 0 ) - { - if ( (f= rogue_highlanderopretdecode(gametxid,tokenid,regslot,pk,playerdata,symbol,pname,playertx.vout[numvouts-1].scriptPubKey)) == 'H' || f == 'Q' ) - { - origplayergame = gametxid; - if ( tokenid != zeroid ) - { - playertxid = tokenid; - if ( myGetTransaction(playertxid,playertx,hashBlock) == 0 || (numvouts= playertx.vout.size()) <= 0 ) - { - fprintf(stderr,"couldnt get tokenid.%s\n",playertxid.GetHex().c_str()); - return(-2); - } - } - if ( rogue_isvalidgame(cp,gameheight,gametx,buyin,maxplayers,gametxid,0) == 0 ) - { - //fprintf(stderr,"playertxid.%s got vin.%s/v%d gametxid.%s iterate.%d\n",playertxid.ToString().c_str(),playertx.vin[1].prevout.hash.ToString().c_str(),(int32_t)playertx.vin[1].prevout.n-maxplayers,gametxid.ToString().c_str(),rogue_iterateplayer(registertxid,gametxid,playertx.vin[1].prevout.n-maxplayers,playertxid)); - if ( (tokenid != zeroid || playertx.vin[1].prevout.hash == gametxid) && rogue_iterateplayer(registertxid,gametxid,playertx.vin[1].prevout.n-maxplayers,playertxid) == 0 ) - { - // if registertxid has vin from pk, it can be used - return(0); - } else fprintf(stderr,"hash mismatch or illegal gametxid\n"); - } else fprintf(stderr,"invalid game %s\n",gametxid.GetHex().c_str()); - } //else fprintf(stderr,"invalid player funcid.%c\n",f); - } else fprintf(stderr,"couldnt get playertxid.%s\n",playertxid.GetHex().c_str()); - return(-1); -} - -int32_t rogue_playerdataspend(CMutableTransaction &mtx,uint256 playertxid,int32_t vout,uint256 origplayergame) -{ - int64_t txfee = 10000; CTransaction tx; uint256 hashBlock; - if ( CCgettxout(playertxid,vout,1,0) == 1 ) // not sure if this is enough validation - { - mtx.vin.push_back(CTxIn(playertxid,vout,CScript())); - return(0); - } - else - { - vout = 0; - if ( myGetTransaction(playertxid,tx,hashBlock) != 0 && tx.vout[vout].nValue == 1 && tx.vout[vout].scriptPubKey.IsPayToCryptoCondition() != 0 ) - { - if ( CCgettxout(playertxid,vout,1,0) == 1 ) // not sure if this is enough validation - { - mtx.vin.push_back(CTxIn(playertxid,vout,CScript())); - return(0); - } - } - return(-1); - } -} - -int32_t rogue_findbaton(struct CCcontract_info *cp,uint256 &playertxid,char **keystrokesp,int32_t &numkeys,int32_t ®slot,std::vector &playerdata,uint256 &batontxid,int32_t &batonvout,int64_t &batonvalue,int32_t &batonht,uint256 gametxid,CTransaction gametx,int32_t maxplayers,char *destaddr,int32_t &numplayers,std::string &symbol,std::string &pname) -{ - int32_t i,numvouts,spentvini,n,matches = 0; CPubKey pk; uint256 tid,active,spenttxid,tokenid,hashBlock,txid,origplayergame; CTransaction spenttx,matchtx,batontx; std::vector checkdata; CBlockIndex *pindex; char ccaddr[64],*keystrokes=0; - batonvalue = numkeys = numplayers = batonht = 0; - playertxid = batontxid = zeroid; - if ( keystrokesp != 0 ) - *keystrokesp = 0; - for (i=0; i= 0 ) - { - if ( myGetTransaction(spenttxid,spenttx,hashBlock) != 0 && spenttx.vout.size() > 0 ) - { - numplayers++; - Getscriptaddress(ccaddr,spenttx.vout[0].scriptPubKey); - if ( strcmp(destaddr,ccaddr) == 0 ) - { - matches++; - regslot = i; - matchtx = spenttx; - } //else fprintf(stderr,"%d+1 doesnt match %s vs %s\n",i,ccaddr,destaddr); - } //else fprintf(stderr,"%d+1 couldnt find spenttx.%s\n",i,spenttxid.GetHex().c_str()); - } //else fprintf(stderr,"%d+1 unspent\n",i); - } - if ( matches == 1 ) - { - numvouts = matchtx.vout.size(); - //fprintf(stderr,"matchtxid.%s matches.%d numvouts.%d\n",matchtx.GetHash().GetHex().c_str(),matches,numvouts); - if ( rogue_registeropretdecode(txid,tokenid,playertxid,matchtx.vout[numvouts-1].scriptPubKey) == 'R' )//&& txid == gametxid ) - { - //fprintf(stderr,"tokenid.%s txid.%s vs gametxid.%s player.%s\n",tokenid.GetHex().c_str(),txid.GetHex().c_str(),gametxid.GetHex().c_str(),playertxid.GetHex().c_str()); - if ( tokenid != zeroid ) - active = tokenid; - else active = playertxid; - if ( active == zeroid || rogue_playerdata(cp,origplayergame,tid,pk,playerdata,symbol,pname,active) == 0 ) - { - txid = matchtx.GetHash(); - //fprintf(stderr,"scan forward active.%s spenttxid.%s\n",active.GetHex().c_str(),txid.GetHex().c_str()); - n = 0; - while ( CCgettxout(txid,0,1,0) < 0 ) - { - spenttxid = zeroid; - spentvini = -1; - if ( (spentvini= myIsutxo_spent(spenttxid,txid,0)) >= 0 ) - txid = spenttxid; - else - { - if ( myIsutxo_spentinmempool(spenttxid,spentvini,txid,0) == 0 || spenttxid == zeroid ) - { - fprintf(stderr,"mempool tracking error %s/v0\n",txid.ToString().c_str()); - return(-2); - } - } - txid = spenttxid; - //fprintf(stderr,"n.%d next txid.%s/v%d\n",n,txid.GetHex().c_str(),spentvini); - if ( spentvini != 0 ) // game is over? - { - return(0); - } - if ( keystrokesp != 0 && myGetTransaction(spenttxid,spenttx,hashBlock) != 0 && spenttx.vout.size() >= 2 ) - { - uint256 g,b; CPubKey p; std::vector k; - if ( rogue_keystrokesopretdecode(g,b,p,k,spenttx.vout[spenttx.vout.size()-1].scriptPubKey) == 'K' ) - { - keystrokes = (char *)realloc(keystrokes,numkeys + (int32_t)k.size()); - for (i=0; i= ROGUE_MAXITERATIONS ) - { - fprintf(stderr,"rogue_findbaton n.%d, seems something is wrong\n",n); - return(-5); - } - } - //fprintf(stderr,"set baton %s\n",txid.GetHex().c_str()); - batontxid = txid; - batonvout = 0; // not vini - // how to detect timeout, bailedout, highlander - hashBlock = zeroid; - if ( myGetTransaction(batontxid,batontx,hashBlock) != 0 && batontx.vout.size() > 0 ) - { - if ( hashBlock == zeroid ) - batonht = hush_nextheight(); - else if ( (pindex= hush_blockindex(hashBlock)) == 0 ) - return(-4); - else batonht = pindex->GetHeight(); - batonvalue = batontx.vout[0].nValue; - //printf("batonht.%d keystrokes[%d]\n",batonht,numkeys); - return(0); - } else fprintf(stderr,"couldnt find baton\n"); - } else fprintf(stderr,"error with playerdata\n"); - } else fprintf(stderr,"findbaton opret error\n"); - } - return(-1); -} - -int32_t rogue_playersalive(int32_t &openslots,int32_t &numplayers,uint256 gametxid,int32_t maxplayers,int32_t gameht,CTransaction gametx) -{ - int32_t i,n,vout,spentvini,registration_open = 0,alive = 0; CTransaction tx; uint256 txid,spenttxid,hashBlock; CBlockIndex *pindex; uint64_t txfee = 10000; - numplayers = openslots = 0; - if ( hush_nextheight() <= gameht+ROGUE_MAXKEYSTROKESGAP ) - registration_open = 1; - for (i=0; i= 0 ) - txid = spenttxid; - else if ( myIsutxo_spentinmempool(spenttxid,spentvini,txid,vout) == 0 || spenttxid == zeroid ) - { - fprintf(stderr,"mempool tracking error %s/v0\n",txid.ToString().c_str()); - break; - } - txid = spenttxid; - vout = 0; - //fprintf(stderr,"n.%d next txid.%s/v%d\n",n,txid.GetHex().c_str(),spentvini); - if ( spentvini != 0 ) - break; - if ( n++ > ROGUE_MAXITERATIONS ) - break; - } - if ( txid != zeroid ) - { - if ( myGetTransaction(txid,tx,hashBlock) != 0 ) - { - if ( (pindex= hush_blockindex(hashBlock)) != 0 ) - { - if ( pindex->GetHeight() <= gameht+ROGUE_MAXKEYSTROKESGAP ) - alive++; - } - } - } - } - } - else if ( registration_open != 0 ) - openslots++; - } - //fprintf(stderr,"numalive.%d openslots.%d\n",alive,openslots); - return(alive); -} - -uint64_t rogue_gamefields(UniValue &obj,int64_t maxplayers,int64_t buyin,uint256 gametxid,char *myrogueaddr) -{ - CBlockIndex *pindex; int32_t ht,openslots,delay,numplayers; uint256 hashBlock; uint64_t seed=0; char cmd[512]; CTransaction tx; - if ( myGetTransaction(gametxid,tx,hashBlock) != 0 && (pindex= hush_blockindex(hashBlock)) != 0 ) - { - ht = pindex->GetHeight(); - delay = ROGUE_REGISTRATION * (maxplayers > 1); - obj.push_back(Pair("height",ht)); - obj.push_back(Pair("start",ht+delay)); - if ( hush_nextheight() > ht+delay ) - { - if ( (pindex= hush_chainactive(ht+delay)) != 0 ) - { - hashBlock = pindex->GetBlockHash(); - obj.push_back(Pair("starthash",hashBlock.ToString())); - memcpy(&seed,&hashBlock,sizeof(seed)); - seed &= (1LL << 62) - 1; - obj.push_back(Pair("seed",(int64_t)seed)); - if ( rogue_iamregistered(maxplayers,gametxid,tx,myrogueaddr) > 0 ) - sprintf(cmd,"cc/rogue/rogue %llu %s",(long long)seed,gametxid.ToString().c_str()); - else sprintf(cmd,"./hush-cli -ac_name=%s cclib register %d \"[%%22%s%%22]\"",SMART_CHAIN_SYMBOL,EVAL_ROGUE,gametxid.ToString().c_str()); - obj.push_back(Pair("run",cmd)); - } - } - obj.push_back(Pair("alive",rogue_playersalive(openslots,numplayers,gametxid,maxplayers,ht,tx))); - obj.push_back(Pair("openslots",openslots)); - obj.push_back(Pair("numplayers",numplayers)); - obj.push_back(Pair("buyins",ValueFromAmount(rogue_buyins(gametxid,maxplayers)))); - } - obj.push_back(Pair("maxplayers",maxplayers)); - obj.push_back(Pair("buyin",ValueFromAmount(buyin))); - return(seed); -} - -void rogue_gameplayerinfo(struct CCcontract_info *cp,UniValue &obj,uint256 gametxid,CTransaction gametx,int32_t vout,int32_t maxplayers,char *myrogueaddr) -{ - // identify if bailout or quit or timed out - uint256 batontxid,spenttxid,gtxid,ptxid,tokenid,hashBlock,playertxid; CTransaction spenttx,batontx; int32_t numplayers,regslot,numkeys,batonvout,batonht,retval; int64_t batonvalue; std::vector playerdata; char destaddr[64]; std::string symbol,pname; - destaddr[0] = 0; - if ( myIsutxo_spent(spenttxid,gametxid,vout) >= 0 ) - { - if ( myGetTransaction(spenttxid,spenttx,hashBlock) != 0 && spenttx.vout.size() > 0 ) - Getscriptaddress(destaddr,spenttx.vout[0].scriptPubKey); - } - obj.push_back(Pair("slot",(int64_t)vout-1)); - if ( (retval= rogue_findbaton(cp,playertxid,0,numkeys,regslot,playerdata,batontxid,batonvout,batonvalue,batonht,gametxid,gametx,maxplayers,destaddr,numplayers,symbol,pname)) == 0 ) - { - if ( CCgettxout(gametxid,maxplayers+vout,1,0) == 10000 ) - { - if ( myGetTransaction(batontxid,batontx,hashBlock) != 0 && batontx.vout.size() > 1 ) - { - if ( rogue_registeropretdecode(gtxid,tokenid,ptxid,batontx.vout[batontx.vout.size()-1].scriptPubKey) == 'R' && ptxid == playertxid && gtxid == gametxid ) - obj.push_back(Pair("status","registered")); - else obj.push_back(Pair("status","alive")); - } else obj.push_back(Pair("status","error")); - } else obj.push_back(Pair("status","finished")); - obj.push_back(Pair("baton",batontxid.ToString())); - obj.push_back(Pair("tokenid",tokenid.ToString())); - obj.push_back(Pair("batonaddr",destaddr)); - obj.push_back(Pair("ismine",strcmp(myrogueaddr,destaddr)==0)); - obj.push_back(Pair("batonvout",(int64_t)batonvout)); - obj.push_back(Pair("batonvalue",ValueFromAmount(batonvalue))); - obj.push_back(Pair("batonht",(int64_t)batonht)); - if ( playerdata.size() > 0 ) - obj.push_back(Pair("player",rogue_playerobj(playerdata,playertxid,tokenid,symbol,pname,gametxid))); - } else fprintf(stderr,"findbaton err.%d\n",retval); -} - -int64_t rogue_registrationbaton(CMutableTransaction &mtx,uint256 gametxid,CTransaction gametx,int32_t maxplayers) -{ - int32_t vout,j,r; int64_t nValue; - if ( gametx.vout.size() > maxplayers+1 ) - { - r = rand() % maxplayers; - for (j=0; j 0 ) - { - result.push_back(Pair("hex",rawtx)); - if ( DecodeHexTx(tx,rawtx) != 0 ) - { - if ( broadcastflag != 0 && myAddtomempool(tx) != 0 ) - RelayTransaction(tx); - result.push_back(Pair("txid",tx.GetHash().ToString())); - result.push_back(Pair("result","success")); - } else result.push_back(Pair("error","decode hex")); - } else result.push_back(Pair("error","couldnt finalize CCtx")); - return(result); -} - -UniValue rogue_newgame(uint64_t txfee,struct CCcontract_info *cp,cJSON *params) -{ - CMutableTransaction mtx = CreateNewContextualCMutableTransaction(Params().GetConsensus(), hush_nextheight()); - UniValue result(UniValue::VOBJ); std::string rawtx; CPubKey roguepk,mypk; char *jsonstr; uint64_t inputsum,change,required,buyin=0; int32_t i,n,maxplayers = 1; - if ( txfee == 0 ) - txfee = 10000; - if ( params != 0 && (n= cJSON_GetArraySize(params)) > 0 ) - { - if ( n > 0 ) - { - maxplayers = juint(jitem(params,0),0); - if ( n > 1 ) - buyin = jdouble(jitem(params,1),0) * COIN + 0.0000000049; - } - } - if ( maxplayers < 1 || maxplayers > ROGUE_MAXPLAYERS ) - return(cclib_error(result,"illegal maxplayers")); - mypk = pubkey2pk(Mypubkey()); - roguepk = GetUnspendable(cp,0); - rogue_univalue(result,"newgame",maxplayers,buyin); - required = (3*txfee + maxplayers*(ROGUE_REGISTRATIONSIZE+txfee)); - if ( (inputsum= AddCClibInputs(cp,mtx,roguepk,required,16,cp->unspendableCCaddr,1)) >= required ) - { - mtx.vout.push_back(MakeCC1vout(cp->evalcode,txfee,roguepk)); // for highlander TCBOO creation - for (i=0; ievalcode,ROGUE_REGISTRATIONSIZE,roguepk,roguepk)); - for (i=0; ievalcode,txfee,roguepk,roguepk)); - if ( (change= inputsum - required) >= txfee ) - mtx.vout.push_back(MakeCC1vout(cp->evalcode,change,roguepk)); - rawtx = FinalizeCCTx(0,cp,mtx,mypk,txfee,rogue_newgameopret(buyin,maxplayers)); - return(rogue_rawtxresult(result,rawtx,1)); - } - else return(cclib_error(result,"illegal maxplayers")); - return(result); -} - -UniValue rogue_playerinfo(uint64_t txfee,struct CCcontract_info *cp,cJSON *params) -{ - UniValue result(UniValue::VOBJ); std::vector playerdata; uint256 playertxid,tokenid,origplayergame;int32_t n; CPubKey pk; bits256 t; std::string symbol,pname; - result.push_back(Pair("result","success")); - rogue_univalue(result,"playerinfo",-1,-1); - if ( params != 0 && (n= cJSON_GetArraySize(params)) > 0 ) - { - if ( n > 0 ) - { - playertxid = juint256(jitem(params,0)); - if ( rogue_playerdata(cp,origplayergame,tokenid,pk,playerdata,symbol,pname,playertxid) < 0 ) - return(cclib_error(result,"invalid playerdata")); - result.push_back(Pair("player",rogue_playerobj(playerdata,playertxid,tokenid,symbol,pname,origplayergame))); - } else return(cclib_error(result,"no playertxid")); - return(result); - } else return(cclib_error(result,"couldnt reparse params")); -} - -UniValue rogue_register(uint64_t txfee,struct CCcontract_info *cp,cJSON *params) -{ - // vin0 -> ROGUE_REGISTRATIONSIZE 1of2 registration baton from creategame - // vin1 -> optional nonfungible character vout @ - // vin2 -> original creation TCBOO playerdata used - // vin3+ -> buyin - // vout0 -> keystrokes/completion baton - CMutableTransaction mtx = CreateNewContextualCMutableTransaction(Params().GetConsensus(), hush_nextheight()); - UniValue result(UniValue::VOBJ); char destaddr[64],coinaddr[64]; uint256 tokenid,gametxid,origplayergame,playertxid,hashBlock; int32_t err,maxplayers,gameheight,n,numvouts,vout=1; int64_t inputsum,buyin,CCchange=0; CPubKey pk,mypk,roguepk,burnpk; CTransaction tx,playertx; std::vector playerdata; std::string rawtx,symbol,pname; bits256 t; - - if ( txfee == 0 ) - txfee = 10000; - mypk = pubkey2pk(Mypubkey()); - burnpk = pubkey2pk(ParseHex(CC_BURNPUBKEY)); - roguepk = GetUnspendable(cp,0); - rogue_univalue(result,"register",-1,-1); - playertxid = tokenid = zeroid; - if ( params != 0 && (n= cJSON_GetArraySize(params)) > 0 ) - { - if ( n > 0 ) - { - gametxid = juint256(jitem(params,0)); - if ( (err= rogue_isvalidgame(cp,gameheight,tx,buyin,maxplayers,gametxid,1)) == 0 ) - { - if ( n > 1 ) - { - playertxid = juint256(jitem(params,1)); - if ( rogue_playerdata(cp,origplayergame,tokenid,pk,playerdata,symbol,pname,playertxid) < 0 ) - return(cclib_error(result,"couldnt extract valid playerdata")); - if ( tokenid != zeroid ) // if it is tokentransfer this will be 0 - vout = 1; - } - if ( hush_nextheight() > gameheight + ROGUE_MAXKEYSTROKESGAP ) - return(cclib_error(result,"didnt register in time, ROGUE_MAXKEYSTROKESGAP")); - rogue_univalue(result,0,maxplayers,buyin); - GetCCaddress1of2(cp,coinaddr,roguepk,mypk); - if ( rogue_iamregistered(maxplayers,gametxid,tx,coinaddr) > 0 ) - return(cclib_error(result,"already registered")); - if ( (inputsum= rogue_registrationbaton(mtx,gametxid,tx,maxplayers)) != ROGUE_REGISTRATIONSIZE ) - return(cclib_error(result,"couldnt find available registration baton")); - else if ( playertxid != zeroid && rogue_playerdataspend(mtx,playertxid,vout,origplayergame) < 0 ) - return(cclib_error(result,"couldnt find playerdata to spend")); - else if ( buyin > 0 && AddNormalinputs(mtx,mypk,buyin,64) < buyin ) - return(cclib_error(result,"couldnt find enough normal funds for buyin")); - if ( tokenid != zeroid ) - { - mtx.vin.push_back(CTxIn(tokenid,0)); // spending cc marker as token is burned - char unspendableTokenAddr[64]; uint8_t tokenpriv[32]; struct CCcontract_info *cpTokens, tokensC; - cpTokens = CCinit(&tokensC, EVAL_TOKENS); - CPubKey unspPk = GetUnspendable(cpTokens, tokenpriv); - GetCCaddress(cpTokens, unspendableTokenAddr, unspPk); - CCaddr2set(cp, EVAL_TOKENS, unspPk, tokenpriv, unspendableTokenAddr); - } - mtx.vout.push_back(MakeCC1of2vout(cp->evalcode,buyin + inputsum - txfee,roguepk,mypk)); - GetCCaddress1of2(cp,destaddr,roguepk,roguepk); - CCaddr1of2set(cp,roguepk,roguepk,cp->CCpriv,destaddr); - mtx.vout.push_back(MakeTokensCC1vout(cp->evalcode, 1, burnpk)); - - uint8_t e, funcid; uint256 tid; std::vector voutPubkeys, voutPubkeysEmpty; int32_t didtx = 0; - CScript opretRegister = rogue_registeropret(gametxid, playertxid); - if ( playertxid != zeroid ) - { - voutPubkeysEmpty.push_back(burnpk); - if ( myGetTransaction(playertxid,playertx,hashBlock) != 0 ) - { - std::vector> oprets; - if ( (funcid= DecodeTokenOpRet(playertx.vout.back().scriptPubKey, e, tid, voutPubkeys, oprets)) != 0) - { // if token in the opret - didtx = 1; - if ( funcid == 'c' ) - tid = tokenid == zeroid ? playertxid : tokenid; - vscript_t vopretRegister; - GetOpReturnData(opretRegister, vopretRegister); - rawtx = FinalizeCCTx(0, cp, mtx, mypk, txfee, - EncodeTokenOpRet(tid, voutPubkeysEmpty /*=never spent*/, std::make_pair(OPRETID_ROGUEGAMEDATA, vopretRegister))); - } - } - } - if ( didtx == 0 ) - rawtx = FinalizeCCTx(0, cp, mtx, mypk, txfee, opretRegister); - - return(rogue_rawtxresult(result,rawtx,1)); - } else return(cclib_error(result,"invalid gametxid")); - } else return(cclib_error(result,"no gametxid")); - } else return(cclib_error(result,"couldnt reparse params")); -} - -UniValue rogue_keystrokes(uint64_t txfee,struct CCcontract_info *cp,cJSON *params) -{ - // vin0 -> baton from registration or previous keystrokes - // vout0 -> new baton - // opret -> user input chars - // being killed should auto broadcast (possible to be suppressed?) - // respawn to be prevented by including timestamps - int32_t nextheight = hush_nextheight(); - CMutableTransaction mtx = CreateNewContextualCMutableTransaction(Params().GetConsensus(),nextheight); - UniValue result(UniValue::VOBJ); CPubKey roguepk,mypk; uint256 gametxid,playertxid,batontxid; int64_t batonvalue,buyin; std::vector keystrokes,playerdata; int32_t numplayers,regslot,numkeys,batonht,batonvout,n,elapsed,gameheight,maxplayers; CTransaction tx; CTxOut txout; char *keystrokestr,destaddr[64]; std::string rawtx,symbol,pname; bits256 t; uint8_t mypriv[32]; - // if ( txfee == 0 ) - txfee = 1000; // smaller than normal on purpose - rogue_univalue(result,"keystrokes",-1,-1); - if ( params != 0 && (n= cJSON_GetArraySize(params)) == 2 && (keystrokestr= jstr(jitem(params,1),0)) != 0 ) - { - gametxid = juint256(jitem(params,0)); - result.push_back(Pair("gametxid",gametxid.GetHex())); - result.push_back(Pair("keystrokes",keystrokestr)); - keystrokes = ParseHex(keystrokestr); - mypk = pubkey2pk(Mypubkey()); - roguepk = GetUnspendable(cp,0); - GetCCaddress1of2(cp,destaddr,roguepk,mypk); - if ( rogue_isvalidgame(cp,gameheight,tx,buyin,maxplayers,gametxid,1) == 0 ) - { - if ( rogue_findbaton(cp,playertxid,0,numkeys,regslot,playerdata,batontxid,batonvout,batonvalue,batonht,gametxid,tx,maxplayers,destaddr,numplayers,symbol,pname) == 0 ) - { - result.push_back(Pair("batontxid",batontxid.GetHex())); - result.push_back(Pair("playertxid",playertxid.GetHex())); - if ( maxplayers == 1 || nextheight <= batonht+ROGUE_MAXKEYSTROKESGAP ) - { - mtx.vin.push_back(CTxIn(batontxid,batonvout,CScript())); //this validates user if pk - mtx.vout.push_back(MakeCC1of2vout(cp->evalcode,batonvalue-txfee,roguepk,mypk)); - Myprivkey(mypriv); - CCaddr1of2set(cp,roguepk,mypk,mypriv,destaddr); - rawtx = FinalizeCCTx(0,cp,mtx,mypk,txfee,rogue_keystrokesopret(gametxid,batontxid,mypk,keystrokes)); - //fprintf(stderr,"KEYSTROKES.(%s)\n",rawtx.c_str()); - memset(mypriv,0,32); - return(rogue_rawtxresult(result,rawtx,1)); - } else return(cclib_error(result,"keystrokes tx was too late")); - } else return(cclib_error(result,"couldnt find batontxid")); - } else return(cclib_error(result,"invalid gametxid")); - } else return(cclib_error(result,"couldnt reparse params")); -} - -char *rogue_extractgame(int32_t makefiles,char *str,int32_t *numkeysp,std::vector &newdata,uint64_t &seed,uint256 &playertxid,struct CCcontract_info *cp,uint256 gametxid,char *rogueaddr) -{ - CPubKey roguepk; int32_t i,num,retval,maxplayers,gameheight,batonht,batonvout,numplayers,regslot,numkeys,err; std::string symbol,pname; CTransaction gametx; int64_t buyin,batonvalue; char fname[64],*keystrokes = 0; std::vector playerdata; uint256 batontxid; FILE *fp; uint8_t newplayer[10000]; struct rogue_player P,endP; - roguepk = GetUnspendable(cp,0); - *numkeysp = 0; - seed = 0; - num = numkeys = 0; - playertxid = zeroid; - str[0] = 0; - if ( (err= rogue_isvalidgame(cp,gameheight,gametx,buyin,maxplayers,gametxid,0)) == 0 ) - { - if ( (retval= rogue_findbaton(cp,playertxid,&keystrokes,numkeys,regslot,playerdata,batontxid,batonvout,batonvalue,batonht,gametxid,gametx,maxplayers,rogueaddr,numplayers,symbol,pname)) == 0 ) - { - UniValue obj; - seed = rogue_gamefields(obj,maxplayers,buyin,gametxid,rogueaddr); -//fprintf(stderr,"(%s) found baton %s numkeys.%d seed.%llu playerdata.%d playertxid.%s\n",pname.size()!=0?pname.c_str():Rogue_pname.c_str(),batontxid.ToString().c_str(),numkeys,(long long)seed,(int32_t)playerdata.size(),playertxid.GetHex().c_str()); - memset(&P,0,sizeof(P)); - if ( playerdata.size() > 0 ) - { - for (i=0; i no playerdata\n"); - newdata.resize(0); - *numkeysp = numkeys; - return(keystrokes); - /* P.gold = (P.gold * 8) / 10; - if ( keystrokes != 0 ) - { - free(keystrokes); - keystrokes = 0; - *numkeysp = 0; - return(keystrokes); - }*/ - } - else - { - sprintf(str,"$$$gold.%d hp.%d strength.%d/%d level.%d exp.%d dl.%d",endP.gold,endP.hitpoints,endP.strength&0xffff,endP.strength>>16,endP.level,endP.experience,endP.dungeonlevel); - //fprintf(stderr,"%s\n",str); - *numkeysp = numkeys; - return(keystrokes); - } - } else num = 0; - } - else - { - fprintf(stderr,"extractgame: couldnt find baton keystrokes.%p retval.%d\n",keystrokes,retval); - if ( keystrokes != 0 ) - free(keystrokes), keystrokes = 0; - } - } else fprintf(stderr,"extractgame: invalid game\n"); - //fprintf(stderr,"extract %s\n",gametxid.GetHex().c_str()); - return(0); -} - -UniValue rogue_extract(uint64_t txfee,struct CCcontract_info *cp,cJSON *params) -{ - UniValue result(UniValue::VOBJ); CPubKey pk,roguepk; int32_t i,n,numkeys,flag = 0; uint64_t seed; char str[512],rogueaddr[64],*pubstr,*hexstr,*keystrokes = 0; std::vector newdata; uint256 gametxid,playertxid; FILE *fp; uint8_t pub33[33]; - pk = pubkey2pk(Mypubkey()); - roguepk = GetUnspendable(cp,0); - result.push_back(Pair("name","rogue")); - result.push_back(Pair("method","extract")); - rogueaddr[0] = 0; - if ( params != 0 && (n= cJSON_GetArraySize(params)) > 0 ) - { - if ( n > 0 ) - { - gametxid = juint256(jitem(params,0)); - result.push_back(Pair("gametxid",gametxid.GetHex())); - if ( n == 2 ) - { - if ( (pubstr= jstr(jitem(params,1),0)) != 0 ) - { - if (strlen(pubstr) == 66 ) - { - decode_hex(pub33,33,pubstr); - pk = buf2pk(pub33); - } - else if ( strlen(pubstr) < 36 ) - strcpy(rogueaddr,pubstr); - } - //fprintf(stderr,"gametxid.%s %s\n",gametxid.GetHex().c_str(),pubstr); - } - if ( rogueaddr[0] == 0 ) - GetCCaddress1of2(cp,rogueaddr,roguepk,pk); - result.push_back(Pair("rogueaddr",rogueaddr)); - str[0] = 0; - if ( (keystrokes= rogue_extractgame(1,str,&numkeys,newdata,seed,playertxid,cp,gametxid,rogueaddr)) != 0 ) - { - result.push_back(Pair("status","success")); - flag = 1; - hexstr = (char *)malloc(numkeys*2 + 1); - for (i=0; iamulet != 0 ) - mult *= 5; - dungeonlevel = P->dungeonlevel; - if ( P->amulet != 0 && dungeonlevel < 26 ) - dungeonlevel = 26; - if ( dungeonlevel > 42 ) - dungeonlevel = 42; - cashout = (uint64_t)P->gold * P->gold * mult * dungeonlevel; - return(cashout); -} - -int32_t rogue_playerdata_validate(int64_t *cashoutp,uint256 &playertxid,struct CCcontract_info *cp,std::vector playerdata,uint256 gametxid,CPubKey pk) -{ - static uint32_t good,bad; static uint256 prevgame; - char str[512],*keystrokes,rogueaddr[64],str2[67],fname[64]; int32_t i,dungeonlevel,numkeys; std::vector newdata; uint64_t seed,mult = 10; CPubKey roguepk; struct rogue_player P; - *cashoutp = 0; - roguepk = GetUnspendable(cp,0); - GetCCaddress1of2(cp,rogueaddr,roguepk,pk); - if ( (keystrokes= rogue_extractgame(0,str,&numkeys,newdata,seed,playertxid,cp,gametxid,rogueaddr)) != 0 ) - { - free(keystrokes); - sprintf(fname,"rogue.%llu.pack",(long long)seed); - remove(fname); - for (i=0; i no playerdata, good.%d bad.%d\n",good,bad); - } - *cashoutp = 0; - return(0); - } - } - if ( gametxid != prevgame ) - { - prevgame = gametxid; - bad++; - disp_playerdata(newdata); - disp_playerdata(playerdata); - fprintf(stderr,"%s playerdata: gold.%d hp.%d strength.%d/%d level.%d exp.%d dl.%d\n",gametxid.GetHex().c_str(),P.gold,P.hitpoints,P.strength&0xffff,P.strength>>16,P.level,P.experience,P.dungeonlevel); - fprintf(stderr,"newdata[%d] != playerdata[%d], numkeys.%d %s pub.%s playertxid.%s good.%d bad.%d\n",(int32_t)newdata.size(),(int32_t)playerdata.size(),numkeys,rogueaddr,pubkey33_str(str2,(uint8_t *)&pk),playertxid.GetHex().c_str(),good,bad); - } - } - sprintf(fname,"rogue.%llu.pack",(long long)seed); - remove(fname); - //fprintf(stderr,"no keys rogue_extractgame %s\n",gametxid.GetHex().c_str()); - return(-1); -} - -UniValue rogue_finishgame(uint64_t txfee,struct CCcontract_info *cp,cJSON *params,char *method) -{ - //vin0 -> highlander vout from creategame TCBOO - //vin1 -> keystrokes baton of completed game, must be last to quit or first to win, only spent registration batons matter. If more than 60 blocks since last keystrokes, it is forfeit - //vins2+ -> rest of unspent registration utxo so all newgame vouts are spent - //vout0 -> nonfungible character with pack @ - //vout1 -> 1% ingame gold and all the buyins - - // detect if last to bailout - // vin0 -> kestrokes baton of completed game with Q - // vout0 -> playerdata marker - // vout0 -> 1% ingame gold - // get any playerdata, get all keystrokes, replay game and compare final state - CMutableTransaction mtx = CreateNewContextualCMutableTransaction(Params().GetConsensus(), hush_nextheight()); - UniValue result(UniValue::VOBJ); std::string rawtx,symbol,pname; CTransaction gametx; uint64_t seed,mult; int64_t buyin,batonvalue,inputsum,cashout=0,CCchange=0; int32_t i,err,gameheight,tmp,numplayers,regslot,n,num,dungeonlevel,numkeys,maxplayers,batonht,batonvout; char myrogueaddr[64],*keystrokes = 0; std::vector playerdata,newdata,nodata; uint256 batontxid,playertxid,gametxid; CPubKey mypk,roguepk; uint8_t player[10000],mypriv[32],funcid; - struct CCcontract_info *cpTokens, tokensC; - - if ( txfee == 0 ) - txfee = 10000; - mypk = pubkey2pk(Mypubkey()); - roguepk = GetUnspendable(cp,0); - GetCCaddress1of2(cp,myrogueaddr,roguepk,mypk); - result.push_back(Pair("name","rogue")); - result.push_back(Pair("method",method)); - result.push_back(Pair("myrogueaddr",myrogueaddr)); - mult = 10; //100000; - if ( strcmp(method,"bailout") == 0 ) - funcid = 'Q'; - else funcid = 'H'; - if ( params != 0 && (n= cJSON_GetArraySize(params)) > 0 ) - { - if ( n > 0 ) - { - gametxid = juint256(jitem(params,0)); - result.push_back(Pair("gametxid",gametxid.GetHex())); - if ( (err= rogue_isvalidgame(cp,gameheight,gametx,buyin,maxplayers,gametxid,1)) == 0 ) - { - if ( rogue_findbaton(cp,playertxid,&keystrokes,numkeys,regslot,playerdata,batontxid,batonvout,batonvalue,batonht,gametxid,gametx,maxplayers,myrogueaddr,numplayers,symbol,pname) == 0 ) - { - UniValue obj; struct rogue_player P; - seed = rogue_gamefields(obj,maxplayers,buyin,gametxid,myrogueaddr); - fprintf(stderr,"(%s) found baton %s numkeys.%d seed.%llu playerdata.%d\n",pname.size()!=0?pname.c_str():Rogue_pname.c_str(),batontxid.ToString().c_str(),numkeys,(long long)seed,(int32_t)playerdata.size()); - memset(&P,0,sizeof(P)); - if ( playerdata.size() > 0 ) - { - for (i=0; i 0 ) - { - newdata.resize(num); - for (i=0; i no playerdata\n"); - newdata.resize(0); - //P.gold = (P.gold * 8) / 10; - } - else - { - cpTokens = CCinit(&tokensC, EVAL_TOKENS); - mtx.vout.push_back(MakeCC1vout(EVAL_TOKENS, txfee, GetUnspendable(cpTokens,NULL))); // marker to token cc addr, burnable and validated - mtx.vout.push_back(MakeTokensCC1vout(cp->evalcode,1,mypk)); - cashout = rogue_cashout(&P); - fprintf(stderr,"\nextracted $$$gold.%d -> %.8f ROGUE hp.%d strength.%d/%d level.%d exp.%d dl.%d n.%d amulet.%d\n",P.gold,(double)cashout/COIN,P.hitpoints,P.strength&0xffff,P.strength>>16,P.level,P.experience,P.dungeonlevel,n,P.amulet); - if ( hush_nextheight() > 77777 && cashout > ROGUE_MAXCASHOUT ) - cashout = ROGUE_MAXCASHOUT; - if ( funcid == 'H' && maxplayers > 1 ) - { - if ( P.amulet == 0 ) - { - if ( numplayers != maxplayers ) - return(cclib_error(result,"numplayers != maxplayers")); - else if ( rogue_playersalive(tmp,tmp,gametxid,maxplayers,gameheight,gametx) > 1 ) - return(cclib_error(result,"highlander must be a winner or last one standing")); - } - cashout *= 2; - cashout += numplayers * buyin; - } - if ( cashout > 0 ) - { - if ( (inputsum= AddCClibInputs(cp,mtx,roguepk,cashout,60,cp->unspendableCCaddr,1)) > cashout ) - CCchange = (inputsum - cashout); - else fprintf(stderr,"couldnt find enough utxos\n"); - } - mtx.vout.push_back(CTxOut(cashout,CScript() << ParseHex(HexStr(mypk)) << OP_CHECKSIG)); - } - } - if ( CCchange + (batonvalue-3*txfee) >= txfee ) - mtx.vout.push_back(MakeCC1vout(cp->evalcode,CCchange + (batonvalue-3*txfee),roguepk)); - Myprivkey(mypriv); - CCaddr1of2set(cp,roguepk,mypk,mypriv,myrogueaddr); - CScript opret; - if ( pname.size() == 0 ) - pname = Rogue_pname; - if ( newdata.size() == 0 ) - { - opret = rogue_highlanderopret(funcid, gametxid, regslot, mypk, nodata,pname); - rawtx = FinalizeCCTx(0,cp,mtx,mypk,txfee,opret); - //fprintf(stderr,"nodata finalizetx.(%s)\n",rawtx.c_str()); - } - else - { - opret = rogue_highlanderopret(funcid, gametxid, regslot, mypk, newdata,pname); - char seedstr[32]; - sprintf(seedstr,"%llu",(long long)seed); - std::vector vopretNonfungible; - GetOpReturnData(opret, vopretNonfungible); - rawtx = FinalizeCCTx(0, cp, mtx, mypk, txfee, EncodeTokenCreateOpRet('c', Mypubkey(), std::string(seedstr), gametxid.GetHex(), vopretNonfungible)); - } - memset(mypriv,0,32); - return(rogue_rawtxresult(result,rawtx,1)); - } - result.push_back(Pair("result","success")); - } else fprintf(stderr,"illegal game err.%d\n",err); - } else fprintf(stderr,"parameters only n.%d\n",n); - } - return(result); -} - -UniValue rogue_bailout(uint64_t txfee,struct CCcontract_info *cp,cJSON *params) -{ - return(rogue_finishgame(txfee,cp,params,(char *)"bailout")); -} - -UniValue rogue_highlander(uint64_t txfee,struct CCcontract_info *cp,cJSON *params) -{ - return(rogue_finishgame(txfee,cp,params,(char *)"highlander")); -} - -UniValue rogue_gameinfo(uint64_t txfee,struct CCcontract_info *cp,cJSON *params) -{ - UniValue result(UniValue::VOBJ),a(UniValue::VARR); int32_t i,n,gameheight,maxplayers,numvouts; uint256 txid; CTransaction tx; int64_t buyin; uint64_t seed; bits256 t; char myrogueaddr[64],str[64]; CPubKey mypk,roguepk; - result.push_back(Pair("name","rogue")); - result.push_back(Pair("method","gameinfo")); - if ( params != 0 && (n= cJSON_GetArraySize(params)) > 0 ) - { - if ( n > 0 ) - { - txid = juint256(jitem(params,0)); - result.push_back(Pair("gametxid",txid.GetHex())); - if ( rogue_isvalidgame(cp,gameheight,tx,buyin,maxplayers,txid,0) == 0 ) - { - result.push_back(Pair("result","success")); - result.push_back(Pair("gameheight",(int64_t)gameheight)); - mypk = pubkey2pk(Mypubkey()); - roguepk = GetUnspendable(cp,0); - GetCCaddress1of2(cp,myrogueaddr,roguepk,mypk); - //fprintf(stderr,"myrogueaddr.%s\n",myrogueaddr); - seed = rogue_gamefields(result,maxplayers,buyin,txid,myrogueaddr); - result.push_back(Pair("seed",(int64_t)seed)); - for (i=0; i > unspentOutputs; - roguepk = GetUnspendable(cp,0); - GetCCaddress(cp,coinaddr,roguepk); - SetCCunspents(unspentOutputs,coinaddr,true); - nextheight = hush_nextheight(); - for (std::vector >::const_iterator it=unspentOutputs.begin(); it!=unspentOutputs.end(); it++) - { - txid = it->first.txhash; - vout = (int32_t)it->first.index; - //char str[65]; fprintf(stderr,"%s check %s/v%d %.8f\n",coinaddr,uint256_str(str,txid),vout,(double)it->second.satoshis/COIN); - if ( it->second.satoshis != txfee || vout != 0 ) // reject any that are not highlander markers - continue; - if ( rogue_isvalidgame(cp,gameheight,tx,buyin,maxplayers,txid,1) == 0 && nextheight <= gameheight+ROGUE_MAXKEYSTROKESGAP ) - { - rogue_playersalive(openslots,numplayers,txid,maxplayers,gameheight,tx); - if ( openslots > 0 ) - a.push_back(txid.GetHex()); - } - } - result.push_back(Pair("result","success")); - rogue_univalue(result,"pending",-1,-1); - result.push_back(Pair("pending",a)); - result.push_back(Pair("numpending",(int64_t)a.size())); - return(result); -} - -UniValue rogue_players(uint64_t txfee,struct CCcontract_info *cp,cJSON *params) -{ - UniValue result(UniValue::VOBJ),a(UniValue::VARR); int64_t buyin; uint256 tokenid,gametxid,txid,hashBlock; CTransaction playertx,tx; int32_t maxplayers,vout,numvouts; std::vector playerdata; CPubKey roguepk,mypk,pk; std::string symbol,pname; char coinaddr[64]; - std::vector > unspentOutputs; - roguepk = GetUnspendable(cp,0); - mypk = pubkey2pk(Mypubkey()); - GetTokensCCaddress(cp,coinaddr,mypk); - SetCCunspents(unspentOutputs,coinaddr,true); - rogue_univalue(result,"players",-1,-1); - for (std::vector >::const_iterator it=unspentOutputs.begin(); it!=unspentOutputs.end(); it++) - { - txid = it->first.txhash; - vout = (int32_t)it->first.index; - //char str[65]; fprintf(stderr,"%s check %s/v%d %.8f\n",coinaddr,uint256_str(str,txid),vout,(double)it->second.satoshis/COIN); - if ( it->second.satoshis != 1 || vout > 1 ) - continue; - if ( rogue_playerdata(cp,gametxid,tokenid,pk,playerdata,symbol,pname,txid) == 0 )//&& pk == mypk ) - { - a.push_back(txid.GetHex()); - //a.push_back(Pair("playerdata",rogue_playerobj(playerdata))); - } - } - result.push_back(Pair("playerdata",a)); - result.push_back(Pair("numplayerdata",(int64_t)a.size())); - return(result); -} - -UniValue rogue_games(uint64_t txfee,struct CCcontract_info *cp,cJSON *params) -{ - UniValue result(UniValue::VOBJ),a(UniValue::VARR),b(UniValue::VARR); uint256 txid,hashBlock,gametxid,tokenid,playertxid; int32_t vout,maxplayers,gameheight,numvouts; CPubKey roguepk,mypk; char coinaddr[64]; CTransaction tx,gametx; int64_t buyin; - std::vector txids; - //std::vector > unspentOutputs; - roguepk = GetUnspendable(cp,0); - mypk = pubkey2pk(Mypubkey()); - GetCCaddress1of2(cp,coinaddr,roguepk,mypk); - //SetCCunspents(unspentOutputs,coinaddr); - SetCCtxids(txids,coinaddr,true,cp->evalcode,zeroid,'R'); - rogue_univalue(result,"games",-1,-1); - for (std::vector::const_iterator it=txids.begin(); it!=txids.end(); it++) - //for (std::vector >::const_iterator it=unspentOutputs.begin(); it!=unspentOutputs.end(); it++) - { - txid = it->first.txhash; - vout = (int32_t)it->first.index; - //char str[65]; fprintf(stderr,"%s check %s/v%d %.8f\n",coinaddr,uint256_str(str,txid),vout,(double)it->second.satoshis/COIN); - if ( vout == 0 ) - { - if ( myGetTransaction(txid,tx,hashBlock) != 0 && (numvouts= tx.vout.size()) > 1 ) - { - if ( rogue_registeropretdecode(gametxid,tokenid,playertxid,tx.vout[numvouts-1].scriptPubKey) == 'R' ) - { - if ( rogue_isvalidgame(cp,gameheight,gametx,buyin,maxplayers,gametxid,0) == 0 ) - { - if ( CCgettxout(txid,vout,1,0) < 0 ) - b.push_back(gametxid.GetHex()); - else a.push_back(gametxid.GetHex()); - } - } - } - } - } - result.push_back(Pair("pastgames",b)); - result.push_back(Pair("games",a)); - result.push_back(Pair("numgames",(int64_t)(a.size()+b.size()))); - return(result); -} - -UniValue rogue_setname(uint64_t txfee,struct CCcontract_info *cp,cJSON *params) -{ - UniValue result(UniValue::VOBJ); int32_t n; char *namestr = 0; - rogue_univalue(result,"setname",-1,-1); - if ( params != 0 && (n= cJSON_GetArraySize(params)) > 0 ) - { - if ( n > 0 ) - { - if ( (namestr= jstri(params,0)) != 0 ) - { - result.push_back(Pair("result","success")); - result.push_back(Pair("pname",namestr)); - Rogue_pname = namestr; - return(result); - } - } - } - result.push_back(Pair("result","error")); - result.push_back(Pair("error","couldnt get name")); - return(result); -} - -bool rogue_validate(struct CCcontract_info *cp,int32_t height,Eval *eval,const CTransaction tx) -{ - CScript scriptPubKey; std::vector vopret; uint8_t *script,e,f,funcid,tokentx=0; int32_t i,maxplayers,enabled = 0,decoded=0,regslot,ind,err,dispflag,gameheight,score,numvouts; CTransaction vintx,gametx; CPubKey pk; uint256 hashBlock,gametxid,txid,tokenid,batontxid,playertxid,ptxid; int64_t buyin,cashout; std::vector playerdata,keystrokes; std::string symbol,pname; - if ( strcmp(SMART_CHAIN_SYMBOL,"ROGUE") == 0 ) - { - if (height < 21274 ) - return(true); - else if ( height > 50000 ) - enabled = 1; - } else enabled = 1; - if ( (numvouts= tx.vout.size()) > 1 ) - { - txid = tx.GetHash(); - if ( txid == Parseuint256("1ae04dc0c5f2fca2053819a3a1b2efe5d355c34f58d6f16d59e5e2573e7baf7f") || txid == Parseuint256("2a34b36cc1292aecfaabdad79b42cab9989fa6dcc87ac8ca88aa6162dab1e2c4") ) // osx rogue chain ht.50902, 69522 - enabled = 0; - scriptPubKey = tx.vout[numvouts-1].scriptPubKey; - GetOpReturnData(scriptPubKey,vopret); - if ( vopret.size() > 2 ) - { - script = (uint8_t *)vopret.data(); - funcid = script[1]; - if ( (e= script[0]) == EVAL_TOKENS ) - { - tokentx = funcid; - if ( (funcid= rogue_highlanderopretdecode(gametxid,tokenid,regslot,pk,playerdata,symbol,pname,scriptPubKey)) == 0 ) - { - if ( (funcid= rogue_registeropretdecode(gametxid,tokenid,playertxid,scriptPubKey)) == 0 ) - { - fprintf(stderr,"ht.%d couldnt decode tokens opret (%c)\n",height,script[1]); - } else e = EVAL_ROGUE, decoded = 1; - } else e = EVAL_ROGUE, decoded = 1; - } - if ( e == EVAL_ROGUE ) - { - //fprintf(stderr,"ht.%d rogue.(%c)\n",height,script[1]); - if ( decoded == 0 ) - { - switch ( funcid ) - { - case 'G': // seems just need to make sure no vout abuse is left to do - gametx = tx; - gametxid = tx.GetHash(); - gameheight = height; - if ( (err= rogue_isvalidgame(cp,gameheight,gametx,buyin,maxplayers,zeroid,0)) != 0 ) - { - fprintf(stderr,"height.%d %s rogue_isvalidgame error.%d\n",height,gametxid.GetHex().c_str(),err); - return eval->Invalid("invalid gametxid"); - } - //fprintf(stderr,"height.%d %s rogue_isvalidgame\n",height,gametxid.GetHex().c_str()); - return(true); - break; - case 'R': - if ( (funcid= rogue_registeropretdecode(gametxid,tokenid,playertxid,scriptPubKey)) != 'R' ) - { - return eval->Invalid("couldnt decode register opret"); - } - // baton is created - // validation is done below - break; - case 'K': - if ( (funcid= rogue_keystrokesopretdecode(gametxid,batontxid,pk,keystrokes,scriptPubKey)) != 'K' ) - { - return eval->Invalid("couldnt decode keystrokes opret"); - } - // spending the baton proves it is the user if the pk is the signer - return(true); - break; - case 'H': case 'Q': - // done in the next switch statement as there are some H/Q tx with playerdata which would skip this section - break; - default: - return eval->Invalid("illegal rogue non-decoded funcid"); - break; - } - } - switch ( funcid ) - { - case 'R': // register - // verify vout amounts are as they should be and no vins that shouldnt be - return(true); - case 'H': // win - case 'Q': // bailout - if ( (f= rogue_highlanderopretdecode(gametxid,tokenid,regslot,pk,playerdata,symbol,pname,scriptPubKey)) != funcid ) - { - //fprintf(stderr,"height.%d couldnt decode H/Q opret\n",height); - //if ( height > 20000 ) - return eval->Invalid("couldnt decode H/Q opret"); - } - // verify pk belongs to this tx - if ( tokentx == 'c' ) - { - if ( playerdata.size() > 0 ) - { - static char laststr[512]; char cashstr[512]; - if ( rogue_playerdata_validate(&cashout,ptxid,cp,playerdata,gametxid,pk) < 0 ) - { - sprintf(cashstr,"tokentx.(%c) decoded.%d ht.%d gametxid.%s player.%s invalid playerdata[%d]\n",tokentx,decoded,height,gametxid.GetHex().c_str(),ptxid.GetHex().c_str(),(int32_t)playerdata.size()); - if ( strcmp(laststr,cashstr) != 0 ) - { - strcpy(laststr,cashstr); - fprintf(stderr,"%s\n",cashstr); - } - if ( enabled != 0 ) - return eval->Invalid("mismatched playerdata"); - } - if ( height > 777777 && cashout > ROGUE_MAXCASHOUT ) - cashout = ROGUE_MAXCASHOUT; - if ( funcid == 'H' ) - { - cashout *= 2; - cashout += rogue_buyins(gametxid,maxplayers); - } - sprintf(cashstr,"tokentx.(%c) decoded.%d ht.%d txid.%s %.8f vs vout2 %.8f",tokentx,decoded,height,txid.GetHex().c_str(),(double)cashout/COIN,(double)tx.vout[2].nValue/COIN); - if ( strcmp(laststr,cashstr) != 0 ) - { - strcpy(laststr,cashstr); - fprintf(stderr,"%s\n",cashstr); - } - } else cashout = 10000; - if ( enabled != 0 && tx.vout[2].nValue > cashout ) - return eval->Invalid("mismatched cashout amount"); - } - if ( funcid == 'Q' ) - { - // verify vin/vout - } - else // 'H' - { - // verify vin/vout and proper payouts - } - return(true); - break; - default: - return eval->Invalid("illegal rogue funcid"); - break; - } - } else return eval->Invalid("illegal evalcode"); - } else return eval->Invalid("opret too small"); - } else return eval->Invalid("not enough vouts"); - return(true); -} - From de7a5fb6d732e3dc905815dc5724372675b19b45 Mon Sep 17 00:00:00 2001 From: Duke Date: Fri, 12 Jan 2024 20:47:46 -0500 Subject: [PATCH 027/108] remove cc payments and rewards --- src/Makefile.am | 2 - src/cc/CCPayments.h | 46 -- src/cc/CCcustom.cpp | 10 +- src/cc/CCrewards.h | 38 - src/cc/Makefile_rogue | 38 - src/cc/payments.cpp | 1572 -------------------------------------- src/cc/rewards.cpp | 756 ------------------ src/rpc/server.cpp | 21 - src/rpc/server.h | 17 - src/wallet/rpcwallet.cpp | 334 -------- 10 files changed, 4 insertions(+), 2830 deletions(-) delete mode 100644 src/cc/CCPayments.h delete mode 100644 src/cc/CCrewards.h delete mode 100644 src/cc/Makefile_rogue delete mode 100644 src/cc/payments.cpp delete mode 100644 src/cc/rewards.cpp diff --git a/src/Makefile.am b/src/Makefile.am index d376665a5..d08f0d49e 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -281,11 +281,9 @@ libbitcoin_server_a_SOURCES = \ cc/CCtokens.cpp \ cc/assets.cpp \ cc/faucet.cpp \ - cc/rewards.cpp \ cc/fsm.cpp \ cc/heir.cpp \ cc/oracles.cpp \ - cc/payments.cpp \ cc/auction.cpp \ cc/betprotocol.cpp \ chain.cpp \ diff --git a/src/cc/CCPayments.h b/src/cc/CCPayments.h deleted file mode 100644 index 246a980d1..000000000 --- a/src/cc/CCPayments.h +++ /dev/null @@ -1,46 +0,0 @@ -// Copyright (c) 2016-2023 The Hush developers -// Distributed under the GPLv3 software license, see the accompanying -// file COPYING or https://www.gnu.org/licenses/gpl-3.0.en.html -/****************************************************************************** - * Copyright © 2014-2019 The SuperNET Developers. * - * * - * See the AUTHORS, DEVELOPER-AGREEMENT and LICENSE files at * - * the top-level directory of this distribution for the individual copyright * - * holder information and the developer policies on copyright and licensing. * - * * - * Unless otherwise agreed in a custom licensing agreement, no part of the * - * SuperNET software, including this file may be copied, modified, propagated * - * or distributed except according to the terms contained in the LICENSE file * - * * - * Removal or modification of this copyright notice is prohibited. * - * * - ******************************************************************************/ - - -#ifndef CC_PAYMENTS_H -#define CC_PAYMENTS_H - -#include "CCinclude.h" -#include -#include - -#define PAYMENTS_TXFEE 10000 -#define PAYMENTS_MERGEOFSET 60 // 1H extra. -extern std::vector > vAddressSnapshot; -extern int32_t lastSnapShotHeight; - -bool PaymentsValidate(struct CCcontract_info *cp,Eval* eval,const CTransaction &tx, uint32_t nIn); - -// CCcustom -UniValue PaymentsRelease(struct CCcontract_info *cp,char *jsonstr); -UniValue PaymentsFund(struct CCcontract_info *cp,char *jsonstr); -UniValue PaymentsMerge(struct CCcontract_info *cp,char *jsonstr); -UniValue PaymentsTxidopret(struct CCcontract_info *cp,char *jsonstr); -UniValue PaymentsCreate(struct CCcontract_info *cp,char *jsonstr); -UniValue PaymentsAirdrop(struct CCcontract_info *cp,char *jsonstr); -UniValue PaymentsAirdropTokens(struct CCcontract_info *cp,char *jsonstr); -UniValue PaymentsInfo(struct CCcontract_info *cp,char *jsonstr); -UniValue PaymentsList(struct CCcontract_info *cp,char *jsonstr); - -#endif - diff --git a/src/cc/CCcustom.cpp b/src/cc/CCcustom.cpp index be3dccd17..fb3ff024a 100644 --- a/src/cc/CCcustom.cpp +++ b/src/cc/CCcustom.cpp @@ -20,14 +20,12 @@ #include "CCinclude.h" #include "CCassets.h" #include "CCfaucet.h" -#include "CCrewards.h" #include "CCauction.h" #include "CCfsm.h" #include "CCHeir.h" #include "CCOracles.h" #include "CCPrices.h" #include "CCPegs.h" -#include "CCPayments.h" #include "CCtokens.h" #include "CCImportGateway.h" @@ -314,8 +312,8 @@ struct CCcontract_info *CCinit(struct CCcontract_info *cp, uint8_t evalcode) strcpy(cp->normaladdr,RewardsNormaladdr); strcpy(cp->CChexstr,RewardsCChexstr); memcpy(cp->CCpriv,RewardsCCpriv,32); - cp->validate = RewardsValidate; - cp->ismyvin = IsRewardsInput; + //cp->validate = RewardsValidate; + //cp->ismyvin = IsRewardsInput; break; case EVAL_DICE: strcpy(cp->unspendableCCaddr,DiceCCaddr); @@ -394,8 +392,8 @@ struct CCcontract_info *CCinit(struct CCcontract_info *cp, uint8_t evalcode) strcpy(cp->normaladdr,PaymentsNormaladdr); strcpy(cp->CChexstr,PaymentsCChexstr); memcpy(cp->CCpriv,PaymentsCCpriv,32); - cp->validate = PaymentsValidate; - cp->ismyvin = IsPaymentsInput; + //cp->validate = PaymentsValidate; + //cp->ismyvin = IsPaymentsInput; break; case EVAL_GATEWAYS: strcpy(cp->unspendableCCaddr,GatewaysCCaddr); diff --git a/src/cc/CCrewards.h b/src/cc/CCrewards.h deleted file mode 100644 index e78e20cdd..000000000 --- a/src/cc/CCrewards.h +++ /dev/null @@ -1,38 +0,0 @@ -// Copyright (c) 2016-2023 The Hush developers -// Distributed under the GPLv3 software license, see the accompanying -// file COPYING or https://www.gnu.org/licenses/gpl-3.0.en.html -/****************************************************************************** - * Copyright © 2014-2019 The SuperNET Developers. * - * * - * See the AUTHORS, DEVELOPER-AGREEMENT and LICENSE files at * - * the top-level directory of this distribution for the individual copyright * - * holder information and the developer policies on copyright and licensing. * - * * - * Unless otherwise agreed in a custom licensing agreement, no part of the * - * SuperNET software, including this file may be copied, modified, propagated * - * or distributed except according to the terms contained in the LICENSE file * - * * - * Removal or modification of this copyright notice is prohibited. * - * * - ******************************************************************************/ - - -#ifndef CC_REWARDS_H -#define CC_REWARDS_H - -#include "CCinclude.h" -#include - -#define EVAL_REWARDS 0xe5 -#define REWARDSCC_MAXAPR (COIN * 25) - -bool RewardsValidate(struct CCcontract_info *cp,Eval* eval,const CTransaction &tx, uint32_t nIn); -UniValue RewardsInfo(uint256 rewardid); -UniValue RewardsList(); - -std::string RewardsCreateFunding(uint64_t txfee,char *planstr,int64_t funds,int64_t APR,int64_t minseconds,int64_t maxseconds,int64_t mindeposit); -std::string RewardsAddfunding(uint64_t txfee,char *planstr,uint256 fundingtxid,int64_t amount); -std::string RewardsLock(uint64_t txfee,char *planstr,uint256 fundingtxid,int64_t amount); -std::string RewardsUnlock(uint64_t txfee,char *planstr,uint256 fundingtxid,uint256 locktxid); - -#endif diff --git a/src/cc/Makefile_rogue b/src/cc/Makefile_rogue deleted file mode 100644 index 3b2f65e00..000000000 --- a/src/cc/Makefile_rogue +++ /dev/null @@ -1,38 +0,0 @@ -SHELL = /bin/sh -CC = gcc -CC_DARWIN = g++-8 -CC_WIN = x86_64-w64-mingw32-gcc-posix -CFLAGS_DARWIN = -DBUILD_ROGUE -std=c++11 -arch x86_64 -I../../depends/$(shell echo `../..//depends/config.guess`/include) -I../univalue/include -I../cryptoconditions/include -I../cryptoconditions/src -I../cryptoconditions/src/asn -I.. -I. -fPIC -Wl,-undefined -Wl,dynamic_lookup -Wno-write-strings -shared -dynamiclib -CFLAGS = -Wno-write-strings -DBUILD_ROGUE -std=c++11 -I../../depends/$(shell echo `../..//depends/config.guess`/include) -I../univalue/include -I../cryptoconditions/include -I../cryptoconditions/src -I../cryptoconditions/src/asn -I.. -I. -fPIC -shared -CFLAGS_WIN = -Wno-write-strings -DBUILD_ROGUE -std=c++11 -I./rogue/x86_64-w64-mingw32/include -I./rogue/x86_64-w64-mingw32/include/ncursesw -I../univalue/include -I../cryptoconditions/include -I../cryptoconditions/src -I../cryptoconditions/src/asn -I.. -I. -fPIC -shared -DEBUGFLAGS = -O0 -D _DEBUG -RELEASEFLAGS = -O2 -D NDEBUG -combine -fwhole-program -$(info $(OS)) -OS := $(shell uname -s) -$(info $(OS)) -TARGET = librogue.so -TARGET_DARWIN = librogue.dylib -TARGET_WIN = librogue.dll -SOURCES = cclib.cpp -#HEADERS = $(shell echo ../cryptoconditions/include/*.h) -I/usr/local/Cellar/gcc\@8/8.3.0/include/c++/8.3.0/ - -all: $(TARGET) - -$(TARGET): $(SOURCES) - $(info Building cclib to src/) -ifeq ($(OS),Darwin) - $(CC_DARWIN) $(CFLAGS_DARWIN) $(DEBUGFLAGS) -o $(TARGET_DARWIN) -c $(SOURCES) - cp $(TARGET_DARWIN) ../libcc.dylib -else ifeq ($(HOST),x86_64-w64-mingw32) - $(info WINDOWS) - $(CC_WIN) $(CFLAGS_WIN) $(DEBUGFLAGS) -o $(TARGET_WIN) -c $(SOURCES) - cp $(TARGET_WIN) ../libcc.dll -#else ifeq ($(WIN_HOST),True) - todo: pass ENV var from build.sh if WIN host -else - $(info LINUX) - $(CC) $(CFLAGS) $(DEBUGFLAGS) -o $(TARGET) -c $(SOURCES) - cp $(TARGET) ../libcc.so -endif - -clean: - rm -rf $(TARGET) diff --git a/src/cc/payments.cpp b/src/cc/payments.cpp deleted file mode 100644 index d212cc387..000000000 --- a/src/cc/payments.cpp +++ /dev/null @@ -1,1572 +0,0 @@ -// Copyright (c) 2016-2023 The Hush developers -// Distributed under the GPLv3 software license, see the accompanying -// file COPYING or https://www.gnu.org/licenses/gpl-3.0.en.html -/****************************************************************************** - * Copyright © 2014-2019 The SuperNET Developers. * - * * - * See the AUTHORS, DEVELOPER-AGREEMENT and LICENSE files at * - * the top-level directory of this distribution for the individual copyright * - * holder information and the developer policies on copyright and licensing. * - * * - * Unless otherwise agreed in a custom licensing agreement, no part of the * - * SuperNET software, including this file may be copied, modified, propagated * - * or distributed except according to the terms contained in the LICENSE file * - * * - * Removal or modification of this copyright notice is prohibited. * - * * - ******************************************************************************/ - -#include "CCPayments.h" - -/* - 0) txidopret <- allocation, scriptPubKey, opret - 1) create <- locked_blocks, minrelease, list of txidopret - - 2) fund createtxid amount opretflag to global CC address with opret or txidaddr without - - 3) release amount -> vout[i] will be scriptPubKeys[i] and (amount * allocations[i]) / sumallocations[] (only using vins that have been locked for locked_blocks+). - - 4) info txid -> display parameters, funds - 5) list -> all txids - - First step is to create txids with the info needed in their opreturns. this info is the weight, scriptPubKey and opret if needed. To do that txidopret is used: - - ./c is a script that invokes hush-cli with the correct -ac_name - - ./c paymentstxidopret \"[9,%222102d6f13a8f745921cdb811e32237bb98950af1a5952be7b3d429abd9152f8e388dac%22]\" -> rawhex with txid 95d9fc8d8a3ef63693c7427e59ff5e177ef63b7345d5f6d6497ac262699a8def - - ./c paymentstxidopret \"[1,%2221039433dc3749aece1bd568f374a45da3b0bc6856990d7da3cd175399577940a775ac%22]\" -> rawhex txid 00469695a08b975ceaf7258896abbf1455eb0f383e8a98fc650deace4cbf02a1 - - now we have 2 txid with the required info in the opreturn. one of them has a 9 and the other a 1 for a 90%/10% split. - - ./c paymentscreate \"[0,0,%2295d9fc8d8a3ef63693c7427e59ff5e177ef63b7345d5f6d6497ac262699a8def%22,%2200469695a08b975ceaf7258896abbf1455eb0f383e8a98fc650deace4cbf02a1%22]\" -> created txid 318d827cc6d8f25f40517e7fb0982e3f707b4aa749d322483fc336686a87b28a that will be the createtxid that the other rpc calls will use. - - lets see if this appears in the list - - ./c paymentslist -> - { - "result": "success", - "createtxids": [ - "318d827cc6d8f25f40517e7fb0982e3f707b4aa749d322483fc336686a87b28a" - ] - } - - It appeared! now lets get more info on it: - ./c paymentsinfo \"[%22318d827cc6d8f25f40517e7fb0982e3f707b4aa749d322483fc336686a87b28a%22]\" - { - "lockedblocks": 0, - "totalallocations": 10, - "minrelease": 0, - "RWRM36sC8jSctyFZtsu7CyDcHYPdZX7nPZ": 0.00000000, - "REpyKi7avsVduqZ3eimncK4uKqSArLTGGK": 0.00000000, - "totalfunds": 0.00000000, - "result": "success" - } - - There are 2 possible places the funds for this createtxid can be, the first is the special address that is derived from combining the globalCC address with the txidaddr. txidaddr is a non-spendable markeraddress created by converting the txid into a 33 byte pubkey by prefixing 0x02 to the txid. It is a 1of2 address, so it doesnt matter that nobody knows the privkey for this txidaddr. the second address is the global CC address and only utxo to that address with an opreturn containing the createtxid are funds valid for this payments CC createtxid - - next let us add some funds to it. the funds can be to either of the two addresses, controlled by useopret (defaults to 0) - - ./c paymentsfund \"[%22318d827cc6d8f25f40517e7fb0982e3f707b4aa749d322483fc336686a87b28a%22,1,0]\" -> txid 28f69b925bb7a21d2a3ba2327e85eb2031b014e976e43f5c2c6fb8a76767b221, which indeed sent funds to RWRM36sC8jSctyFZtsu7CyDcHYPdZX7nPZ without an opreturn and it appears on the payments info. - - ./c paymentsfund \"[%22318d827cc6d8f25f40517e7fb0982e3f707b4aa749d322483fc336686a87b28a%22,1,1]\" -> txid cc93330b5c951b724b246b3b138d00519c33f2a600a7c938bc9e51aff6e20e32, which indeed sent funds to REpyKi7avsVduqZ3eimncK4uKqSArLTGGK with an opreturn and it appears on the payments info. - - -./c paymentsrelease \"[%22318d827cc6d8f25f40517e7fb0982e3f707b4aa749d322483fc336686a87b28a%22,1.5]\" -> a8d5dbbb8ee94c05e75c4f3c5221091f59dcb86e0e9c4e1e3d2cf69e6fce6b81 - - it used both fund utxos - -*/ - -// start of consensus code - -void mpz_set_lli( mpz_t rop, long long op ) -{ - mpz_import(rop, 1, 1, sizeof(op), 0, 0, &op); -} - -int64_t mpz_get_si2( mpz_t op ) -{ - int64_t ret = 0; - mpz_export(&ret, NULL, 1, sizeof(ret), 0, 0, op); - return ret; -} - -uint64_t mpz_get_ui2( mpz_t op ) -{ - uint64_t ret = 0; - mpz_export(&ret, NULL, 1, sizeof(ret), 0, 0, op); - return ret; -} - -CScript EncodePaymentsTxidOpRet(int64_t allocation,std::vector scriptPubKey,std::vector destopret) -{ - CScript opret; uint8_t evalcode = EVAL_PAYMENTS; - opret << OP_RETURN << E_MARSHAL(ss << evalcode << 'T' << allocation << scriptPubKey << destopret); - return(opret); -} - -uint8_t DecodePaymentsTxidOpRet(CScript scriptPubKey,int64_t &allocation,std::vector &destscriptPubKey,std::vector &destopret) -{ - std::vector vopret; uint8_t *script,e,f; - GetOpReturnData(scriptPubKey, vopret); - script = (uint8_t *)vopret.data(); - if ( vopret.size() > 2 && E_UNMARSHAL(vopret,ss >> e; ss >> f; ss >> allocation; ss >> destscriptPubKey; ss >> destopret) != 0 ) - { - if ( e == EVAL_PAYMENTS && f == 'T' ) - return(f); - } - return(0); -} - -CScript EncodePaymentsFundOpRet(uint256 checktxid) -{ - CScript opret; uint8_t evalcode = EVAL_PAYMENTS; - opret << OP_RETURN << E_MARSHAL(ss << evalcode << 'F' << checktxid); - return(opret); -} - -uint8_t DecodePaymentsFundOpRet(CScript scriptPubKey,uint256 &checktxid) -{ - std::vector vopret; uint8_t *script,e,f; - GetOpReturnData(scriptPubKey, vopret); - script = (uint8_t *)vopret.data(); - if ( vopret.size() > 2 && E_UNMARSHAL(vopret,ss >> e; ss >> f; ss >> checktxid) != 0 ) - { - if ( e == EVAL_PAYMENTS && f == 'F' ) - return(f); - } - return(0); -} - -CScript EncodePaymentsMergeOpRet(uint256 checktxid) -{ - CScript opret; uint8_t evalcode = EVAL_PAYMENTS; - opret << OP_RETURN << E_MARSHAL(ss << evalcode << 'M' << checktxid); - return(opret); -} - -uint8_t DecodePaymentsMergeOpRet(CScript scriptPubKey,uint256 &checktxid) -{ - std::vector vopret; uint8_t *script,e,f; - GetOpReturnData(scriptPubKey, vopret); - script = (uint8_t *)vopret.data(); - if ( vopret.size() > 2 && E_UNMARSHAL(vopret,ss >> e; ss >> f; ss >> checktxid) != 0 ) - { - if ( e == EVAL_PAYMENTS && f == 'M' ) - return(f); - } - return(0); -} - -CScript EncodePaymentsReleaseOpRet(uint256 checktxid, int64_t amountReleased) -{ - CScript opret; uint8_t evalcode = EVAL_PAYMENTS; - opret << OP_RETURN << E_MARSHAL(ss << evalcode << 'R' << checktxid << amountReleased); - return(opret); -} - -uint8_t DecodePaymentsReleaseOpRet(CScript scriptPubKey,uint256 &checktxid,int64_t &amountReleased) -{ - std::vector vopret; uint8_t *script,e,f; - GetOpReturnData(scriptPubKey, vopret); - script = (uint8_t *)vopret.data(); - if ( vopret.size() > 2 && E_UNMARSHAL(vopret,ss >> e; ss >> f; ss >> checktxid; ss >> amountReleased) != 0 ) - { - if ( e == EVAL_PAYMENTS && f == 'R' ) - return(f); - } - return(0); -} - -CScript EncodePaymentsOpRet(int32_t lockedblocks,int32_t minrelease,int64_t totalallocations,std::vector txidoprets) -{ - CScript opret; uint8_t evalcode = EVAL_PAYMENTS; - opret << OP_RETURN << E_MARSHAL(ss << evalcode << 'C' << lockedblocks << minrelease << totalallocations << txidoprets); - return(opret); -} - -uint8_t DecodePaymentsOpRet(CScript scriptPubKey,int32_t &lockedblocks,int32_t &minrelease,int64_t &totalallocations,std::vector &txidoprets) -{ - std::vector vopret; uint8_t *script,e,f; - GetOpReturnData(scriptPubKey, vopret); - script = (uint8_t *)vopret.data(); - if ( vopret.size() > 2 && E_UNMARSHAL(vopret,ss >> e; ss >> f; ss >> lockedblocks; ss >> minrelease; ss >> totalallocations; ss >> txidoprets) != 0 ) - { - if ( e == EVAL_PAYMENTS && f == 'C' && txidoprets.size() > 1 ) - return(f); - } - return(0); -} - -CScript EncodePaymentsSnapsShotOpRet(int32_t lockedblocks,int32_t minrelease,int32_t minimum,int32_t top,int32_t bottom,int8_t fixedAmount,std::vector> excludeScriptPubKeys) -{ - CScript opret; uint8_t evalcode = EVAL_PAYMENTS; - opret << OP_RETURN << E_MARSHAL(ss << evalcode << 'S' << lockedblocks << minrelease << minimum << top << bottom << fixedAmount << excludeScriptPubKeys); - return(opret); -} - -uint8_t DecodePaymentsSnapsShotOpRet(CScript scriptPubKey,int32_t &lockedblocks,int32_t &minrelease,int32_t &minimum,int32_t &top,int32_t &bottom,int8_t &fixedAmount,std::vector> &excludeScriptPubKeys) -{ - std::vector vopret; uint8_t *script,e,f; - GetOpReturnData(scriptPubKey, vopret); - script = (uint8_t *)vopret.data(); - if ( vopret.size() > 2 && E_UNMARSHAL(vopret,ss >> e; ss >> f; ss >> lockedblocks; ss >> minrelease; ss >> minimum; ss >> top; ; ss >> bottom; ss >> fixedAmount; ss >> excludeScriptPubKeys) != 0 ) - { - if ( e == EVAL_PAYMENTS && f == 'S' ) - return(f); - } - return(0); -} - -CScript EncodePaymentsTokensOpRet(int32_t lockedblocks,int32_t minrelease,int32_t minimum,int32_t top,int32_t bottom,int8_t fixedAmount,std::vector> excludeScriptPubKeys,uint256 tokenid) -{ - CScript opret; uint8_t evalcode = EVAL_PAYMENTS; - opret << OP_RETURN << E_MARSHAL(ss << evalcode << 'O' << lockedblocks << minrelease << minimum << top << bottom << fixedAmount << excludeScriptPubKeys << tokenid); - return(opret); -} - -uint8_t DecodePaymentsTokensOpRet(CScript scriptPubKey,int32_t &lockedblocks,int32_t &minrelease,int32_t &minimum,int32_t &top,int32_t &bottom,int8_t &fixedAmount,std::vector> &excludeScriptPubKeys, uint256 &tokenid) -{ - std::vector vopret; uint8_t *script,e,f; - GetOpReturnData(scriptPubKey, vopret); - script = (uint8_t *)vopret.data(); - if ( vopret.size() > 2 && E_UNMARSHAL(vopret,ss >> e; ss >> f; ss >> lockedblocks; ss >> minimum; ss >> top; ; ss >> bottom; ss >> fixedAmount; ss >> excludeScriptPubKeys; ss >> tokenid) != 0 ) - { - if ( e == EVAL_PAYMENTS && f == 'O' ) - return(f); - } - return(0); -} - -int64_t IsPaymentsvout(struct CCcontract_info *cp,const CTransaction& tx,int32_t v,char *cmpaddr, CScript &ccopret) -{ - char destaddr[64]; - if ( getCCopret(tx.vout[v].scriptPubKey, ccopret) ) - { - if ( Getscriptaddress(destaddr,tx.vout[v].scriptPubKey) > 0 && (cmpaddr[0] == 0 || strcmp(destaddr,cmpaddr) == 0) ) - return(tx.vout[v].nValue); - } - return(0); -} - -bool payments_game(int32_t &top, int32_t &bottom) -{ - uint64_t x; - uint256 tmphash = chainActive[lastSnapShotHeight]->GetBlockHash(); - memcpy(&x,&tmphash,sizeof(x)); - bottom = ((x & 0xff) % 50); - if ( bottom == 0 ) bottom = 1; - top = (((x>>8) & 0xff) % 100); - if ( top < 50 ) top += 50; - bottom = (vAddressSnapshot.size()*bottom)/100; - top = (vAddressSnapshot.size()*top)/100; - //fprintf(stderr, "bottom.%i top.%i\n",bottom,top); - return true; -} - -bool payments_lockedblocks(uint256 blockhash,int32_t lockedblocks,int32_t &blocksleft) -{ - int32_t ht = chainActive.Height(); - CBlockIndex* pblockindex = hush_blockindex(blockhash); - if ( pblockindex == 0 || pblockindex->GetHeight()+lockedblocks > ht) - { - blocksleft = pblockindex->GetHeight()+lockedblocks - ht; - fprintf(stderr, "not elegible to be spent yet height.%i vs elegible_ht.%i blocksleft.%i\n",ht,(pblockindex!=0?pblockindex->GetHeight():0)+lockedblocks,blocksleft); - return false; - } - return true; -} - -int32_t payments_getallocations(int32_t top, int32_t bottom, const std::vector> &excludeScriptPubKeys, mpz_t &mpzTotalAllocations, std::vector &scriptPubKeys, std::vector &allocations) -{ - mpz_t mpzAllocation; int32_t i =0; - for (int32_t j = bottom; j < vAddressSnapshot.size(); j++) - { - auto &address = vAddressSnapshot[j]; - CScript scriptPubKey = GetScriptForDestination(address.second); - bool skip = false; - // skip excluded addresses. - for ( auto skipkey : excludeScriptPubKeys ) - { - if ( scriptPubKey == CScript(skipkey.begin(), skipkey.end()) ) - skip = true; - } - if ( !skip ) - { - mpz_init(mpzAllocation); - i++; - //fprintf(stderr, "address: %s nValue.%li \n", CBitcoinAddress(address.second).ToString().c_str(), address.first); - scriptPubKeys.push_back(scriptPubKey); - allocations.push_back(address.first); - mpz_set_lli(mpzAllocation,address.first); - mpz_add(mpzTotalAllocations,mpzTotalAllocations,mpzAllocation); - mpz_clear(mpzAllocation); - } - if ( i+bottom == top ) - break; // we reached top amount to pay, it can be less than this, if less address exist on chain, return the number we got. - } - return(i); -} - -int32_t payments_gettokenallocations(int32_t top, int32_t bottom, const std::vector> &excludeScriptPubKeys, uint256 tokenid, mpz_t &mpzTotalAllocations, std::vector &scriptPubKeys, std::vector &allocations) -{ - /* - - check tokenid exists. - - iterate tokenid address and extract all pubkeys, add to map. - - rewind to last notarized height for balances? see main.cpp: line# 660. - - convert balances to mpz_t and add up totalallocations - - sort the map into a vector, then convert to the correct output. - */ - return(0); -} - -bool PaymentsValidate(struct CCcontract_info *cp,Eval* eval,const CTransaction &tx, uint32_t nIn) -{ - char temp[128], txidaddr[64]={0}; std::string scriptpubkey; uint256 createtxid, blockhash, tokenid; CTransaction plantx; int8_t funcid=0, fixedAmount=0; - int32_t i,lockedblocks,minrelease,blocksleft,dust = 0, top,bottom=0,minimum=10000; int64_t change,totalallocations,actualtxfee,amountReleased=0; std::vector txidoprets; bool fHasOpret = false,fIsMerge = false; CPubKey txidpk,Paymentspk; - std::vector> excludeScriptPubKeys; bool fFixedAmount = false; CScript ccopret; - mpz_t mpzTotalAllocations,mpzAllocation,mpzCheckamount; - mpz_init(mpzCheckamount); mpz_init(mpzTotalAllocations); - // Check change is in vout[0], and also fetch the ccopret to determine what type of tx this is. txidaddr is unknown, recheck this later. - if ( (change= IsPaymentsvout(cp,tx,0,txidaddr,ccopret)) != 0 && ccopret.size() > 2 ) - { - // get the checktxid and the amount released if doing release tx. - if ( DecodePaymentsMergeOpRet(ccopret,createtxid) == 'M' ) - fIsMerge = true; - else if ( DecodePaymentsReleaseOpRet(ccopret,createtxid,amountReleased) != 'R' ) - return(eval->Invalid("could not decode ccopret")); - if ( tx.vout.back().scriptPubKey.IsOpReturn() ) - fHasOpret = true; - mpz_set_lli(mpzCheckamount,amountReleased); - } else return(eval->Invalid("could not decode ccopret")); - - // use the createtxid to fetch the tx and all of the plans info. - if ( myGetTransaction(createtxid,plantx,blockhash) != 0 && plantx.vout.size() > 0 ) - { - if ( ((funcid= DecodePaymentsOpRet(plantx.vout[plantx.vout.size()-1].scriptPubKey,lockedblocks,minrelease,totalallocations,txidoprets)) == 'C' || (funcid= DecodePaymentsSnapsShotOpRet(plantx.vout[plantx.vout.size()-1].scriptPubKey,lockedblocks,minrelease,minimum,top,bottom,fixedAmount,excludeScriptPubKeys)) == 'S' || (funcid= DecodePaymentsTokensOpRet(plantx.vout[plantx.vout.size()-1].scriptPubKey,lockedblocks,minrelease,minimum,top,bottom,fixedAmount,excludeScriptPubKeys,tokenid)) == 'O') ) - { - if ( lockedblocks < 0 || minrelease < 0 || (totalallocations <= 0 && top <= 0 ) ) - return(eval->Invalid("negative values")); - if ( minimum < 10000 ) - return(eval->Invalid("minimum must be over 10000")); - Paymentspk = GetUnspendable(cp,0); - txidpk = CCtxidaddr(txidaddr,createtxid); - GetCCaddress1of2(cp,txidaddr,Paymentspk,txidpk); - //fprintf(stderr, "lockedblocks.%i minrelease.%i totalallocations.%i txidopret1.%s txidopret2.%s\n",lockedblocks, minrelease, totalallocations, txidoprets[0].ToString().c_str(), txidoprets[1].ToString().c_str() ); - if ( !CheckTxFee(tx, PAYMENTS_TXFEE+1, chainActive.LastTip()->GetHeight(), chainActive.LastTip()->nTime, actualtxfee) ) - return eval->Invalid("txfee is too high"); - // Check that the change vout is playing the txid address. - if ( IsPaymentsvout(cp,tx,0,txidaddr,ccopret) == 0 ) - return eval->Invalid("change pays wrong address"); - - if ( !fIsMerge ) - { - if ( amountReleased < minrelease*COIN ) - { - fprintf(stderr, "does not meet minrelease amount.%li minrelease.%li\n",amountReleased, (int64_t)minrelease*COIN); - return(eval->Invalid("amount is too small")); - } - // Get all the script pubkeys and allocations - std::vector allocations; - std::vector scriptPubKeys; - i = 0; - if ( funcid == 'C' ) - { - // normal payment - int64_t checkallocations = 0; - for ( auto txidopret : txidoprets) - { - CTransaction tx0; std::vector scriptPubKey,opret; int64_t allocation; - if ( myGetTransaction(txidopret,tx0,blockhash) != 0 && tx0.vout.size() > 1 && DecodePaymentsTxidOpRet(tx0.vout[tx0.vout.size()-1].scriptPubKey,allocation,scriptPubKey,opret) == 'T' ) - { - scriptPubKeys.push_back(CScript(scriptPubKey.begin(), scriptPubKey.end())); - allocations.push_back(allocation); - //fprintf(stderr, "i.%i scriptpubkey.%s allocation.%li\n",i,scriptPubKeys[i].ToString().c_str(),allocation); - checkallocations += allocation; - // if we have an op_return to pay to need to check it exists and is paying the correct opret. - if ( !opret.empty() ) - { - if ( !fHasOpret ) - { - fprintf(stderr, "missing opret.%s in payments release.\n",HexStr(opret.begin(), opret.end()).c_str()); - return(eval->Invalid("missing opret in payments release")); - } - else if ( CScript(opret.begin(),opret.end()) != tx.vout[tx.vout.size()-1].scriptPubKey ) - { - fprintf(stderr, "opret.%s vs opret.%s\n",HexStr(opret.begin(), opret.end()).c_str(), HexStr(tx.vout[tx.vout.size()-1].scriptPubKey.begin(), tx.vout[tx.vout.size()-1].scriptPubKey.end()).c_str()); - return(eval->Invalid("pays incorrect opret")); - } - } - } - i++; - } - //fprintf(stderr, "totalallocations.%li checkallocations.%li\n",totalallocations, checkallocations); - if ( totalallocations != checkallocations ) - return(eval->Invalid("allocation missmatch")); - mpz_set_lli(mpzTotalAllocations,totalallocations); - } - else if ( funcid == 'S' || funcid == 'O' ) - { - // snapshot payment - if ( HUSH_SNAPSHOT_INTERVAL == 0 ) - return(eval->Invalid("snapshots not activated on this chain")); - if ( vAddressSnapshot.size() == 0 ) - return(eval->Invalid("need first snapshot")); - if ( top > 3999 ) - return(eval->Invalid("transaction too big")); - if ( fixedAmount == 7 ) - { - // game setting, randomise bottom and top values - fFixedAmount = payments_game(top,bottom); - } - else if ( fixedAmount != 0 ) - { - fFixedAmount = true; - } - if ( funcid == 'S' ) - payments_getallocations(top, bottom, excludeScriptPubKeys, mpzTotalAllocations, scriptPubKeys, allocations); - else - { - // token snapshot - // payments_gettokenallocations(top, bottom, excludeScriptPubKeys, tokenid, mpzTotalAllocations, scriptPubKeys, allocations); - return(eval->Invalid("tokens not yet implemented")); - } - } - // sanity check to make sure we got all the required info, skip for merge type tx - //fprintf(stderr, " allocations.size().%li scriptPubKeys.size.%li\n",allocations.size(), scriptPubKeys.size()); - if ( (allocations.size() == 0 || scriptPubKeys.size() == 0 || allocations.size() != scriptPubKeys.size()) ) - return(eval->Invalid("missing data cannot validate")); - - // Check vouts go to the right place and pay the right amounts. - int64_t amount = 0; int32_t n = 0; - // We place amount released into ccopret, so that these calcualtion are accurate! - // If you change the amount released in the RPC these calcs will be wrong, and validation will fail. - for (i = 1; i < (fHasOpret ? tx.vout.size()-1 : tx.vout.size()); i++) - { - int64_t test; - if ( scriptPubKeys[n] != tx.vout[i].scriptPubKey ) - { - fprintf(stderr, "pays wrong destination destscriptPubKey.%s voutscriptPubKey.%s\n", HexStr(scriptPubKeys[n].begin(),scriptPubKeys[n].end()).c_str(), HexStr(tx.vout[i].scriptPubKey.begin(),tx.vout[i].scriptPubKey.end()).c_str()); - return(eval->Invalid("pays wrong address")); - } - if ( fFixedAmount ) - { - if ( (top-bottom) > 0 ) - test = amountReleased / (top-bottom); - else - return(eval->Invalid("top/bottom range is illegal")); - } - else - { - mpz_init(mpzAllocation); - mpz_set_lli(mpzAllocation,allocations[n]); - mpz_mul(mpzAllocation,mpzAllocation,mpzCheckamount); - mpz_tdiv_q(mpzAllocation,mpzAllocation,mpzTotalAllocations); - test = mpz_get_si2(mpzAllocation); - mpz_clear(mpzAllocation); - } - //fprintf(stderr, "vout.%i test.%lli vs nVlaue.%lli\n",i, (long long)test, (long long)tx.vout[i].nValue); - if ( test != tx.vout[i].nValue ) - { - fprintf(stderr, "vout.%i test.%lli vs nVlaue.%lli\n",i, (long long)test, (long long)tx.vout[i].nValue); - return(eval->Invalid("amounts do not match")); - } - if ( test < minimum ) - { - // prevent anyone being paid the minimum. - fprintf(stderr, "vout.%i test.%li vs minimum.%i\n",i, test, minimum); - return(eval->Invalid("under minimum size")); - } - amount += tx.vout[i].nValue; - n++; - } - if ( allocations.size() > n ) - { - // need to check that the next allocation was less than minimum, otherwise ppl can truncate the tx at any place not paying all elegible addresses. - mpz_init(mpzAllocation); - mpz_set_lli(mpzAllocation,allocations[n+1]); - mpz_mul(mpzAllocation,mpzAllocation,mpzCheckamount); - mpz_tdiv_q(mpzAllocation,mpzAllocation,mpzTotalAllocations); - int64_t test = mpz_get_si2(mpzAllocation); - //fprintf(stderr, "check next vout pays under min: test.%li > minimuim.%i\n", test, minimum); - if ( test > minimum ) - return(eval->Invalid("next allocation was not under minimum")); - } - mpz_clear(mpzTotalAllocations); mpz_clear(mpzCheckamount); - } - // Check vins - i = 0; - for (auto vin : tx.vin) - { - CTransaction txin; - if ( myGetTransaction(vin.prevout.hash,txin,blockhash) ) - { - // check the vin comes from the CC address's - char fromaddr[64]; int32_t mergeoffset = 0; CScript vinccopret; uint256 checktxid; - Getscriptaddress(fromaddr,txin.vout[vin.prevout.n].scriptPubKey); - if ( fIsMerge && txin.vout[vin.prevout.n].nValue < COIN ) - dust++; - if ( IsPaymentsvout(cp,txin,vin.prevout.n,cp->unspendableCCaddr,vinccopret) != 0 ) - { - // if from global payments address get ccopret to detemine pays correct plan. - uint256 checktxid; - if ( vinccopret.size() < 2 || DecodePaymentsFundOpRet(vinccopret,checktxid) != 'F' || checktxid != createtxid ) - { - fprintf(stderr, "vin.%i is not a payments CC vout: txid.%s vout.%i\n", i, txin.GetHash().ToString().c_str(), vin.prevout.n); - return(eval->Invalid("vin is not paymentsCC type")); - } - } - else if ( IsPaymentsvout(cp,txin,vin.prevout.n,txidaddr,vinccopret) != 0 ) - { - // if in txid address apply merge offset if applicable. - if ( fIsMerge && vinccopret.size() > 2 && DecodePaymentsMergeOpRet(vinccopret,checktxid) == 'M' ) - { - // Apply merge offset to locked blocks, this prevents people spaming payments fund and payments merge to prevent release happening. - mergeoffset = PAYMENTS_MERGEOFSET; - } - } - else // not from global payments plan, or txid address. - return(eval->Invalid("utxo comes from incorrect address")); - // check the chain depth vs locked blocks requirement. - if ( !payments_lockedblocks(blockhash, lockedblocks+mergeoffset, blocksleft) ) - { - fprintf(stderr, "vin.%i is not elegible for.%i blocks \n",i, blocksleft); - return(eval->Invalid("vin not elegible")); - } - i++; - } else return(eval->Invalid("cant get vin transaction")); - } - if ( fIsMerge ) - { - if ( i < 2 ) - return(eval->Invalid("must have at least 2 vins to carry out merge")); - else if ( i == dust+1 ) - return(eval->Invalid("cannot merge only dust")); - } - } else return(eval->Invalid("cannot decode create transaction")); - } else return(eval->Invalid("could not get contract transaction")); - return(true); -} -// end of consensus code - -// helper functions for rpc calls in rpcwallet.cpp -int64_t AddPaymentsInputs(bool fLockedBlocks,int8_t GetBalance,struct CCcontract_info *cp,CMutableTransaction &mtx,CPubKey txidpk,int64_t total,int32_t maxinputs,uint256 createtxid,int32_t lockedblocks,int64_t minrelease,int32_t &blocksleft) -{ - char coinaddr[64]; CPubKey Paymentspk; int64_t nValue,threshold,price,totalinputs = 0; uint256 txid,checktxid,hashBlock; std::vector origpubkey; CTransaction vintx; int32_t iter,vout,ht,n = 0; - std::vector > unspentOutputs; CScript ccopret; - std::vector > blocksleft_balance; - if ( GetBalance == 0 ) - { - if ( maxinputs > CC_MAXVINS ) - maxinputs = CC_MAXVINS; - if ( maxinputs > 0 ) - threshold = total/maxinputs; - else threshold = total; - } - else threshold = 0; - Paymentspk = GetUnspendable(cp,0); - for (iter=0; iter<2; iter++) - { - if ( GetBalance == 1 && iter == 1 ) - continue; // getbalance of global paymentsCC address. - if ( GetBalance == 2 && iter == 0 ) - continue; // get balance of txidpk address. - if ( iter == 0 ) - GetCCaddress(cp,coinaddr,Paymentspk); - else GetCCaddress1of2(cp,coinaddr,Paymentspk,txidpk); - SetCCunspents(unspentOutputs,coinaddr,true); - for (std::vector >::const_iterator it=unspentOutputs.begin(); it!=unspentOutputs.end(); it++) - { - txid = it->first.txhash; - vout = (int32_t)it->first.index; - //fprintf(stderr,"iter.%d %s/v%d %s\n",iter,txid.GetHex().c_str(),vout,coinaddr); - if ( myGetTransaction(txid,vintx,hashBlock) != 0 ) - { - if ( (nValue= IsPaymentsvout(cp,vintx,vout,coinaddr,ccopret)) > PAYMENTS_TXFEE && nValue >= threshold && myIsutxo_spentinmempool(ignoretxid,ignorevin,txid,vout) == 0 ) - { - int32_t offset = 0; - if ( ccopret.size() > 2 ) - { - if ( iter == 0 && (DecodePaymentsFundOpRet(ccopret,checktxid) != 'F' || checktxid != createtxid) ) - { - // global address but not for this plan. - fprintf(stderr,"bad opret %s vs %s\n",checktxid.GetHex().c_str(),createtxid.GetHex().c_str()); - continue; - } - // increase merge offset, if this is a merge tx, merging merged utxos. - if ( iter == 1 && GetBalance == 4 && DecodePaymentsMergeOpRet(ccopret,checktxid) == 'M' ) - offset = PAYMENTS_MERGEOFSET; - } - int32_t tmpblocksleft = 0; - if ( fLockedBlocks && !payments_lockedblocks(hashBlock, lockedblocks+offset, tmpblocksleft) ) - { - blocksleft_balance.push_back(std::make_pair(tmpblocksleft,nValue)); - continue; - } - if ( (GetBalance == 0 && total != 0 && maxinputs != 0) || GetBalance == 4 ) - mtx.vin.push_back(CTxIn(txid,vout,CScript())); - nValue = it->second.satoshis; - if ( GetBalance == 4 && nValue < COIN ) - blocksleft++; // count dust with unused variable. - if ( GetBalance == 2 || GetBalance == 1 ) - blocksleft++; // count all utxos with unused variable. - totalinputs += nValue; - n++; - //fprintf(stderr,"iter.%d %s/v%d %s %.8f\n",iter,txid.GetHex().c_str(),vout,coinaddr,(double)nValue/COIN); - if ( GetBalance == 0 && ((total > 0 && totalinputs >= total) || (maxinputs > 0 && n >= maxinputs)) ) - break; // create tx. We have ebnough inputs to make it. - } //else fprintf(stderr,"nValue %.8f vs threshold %.8f\n",(double)nValue/COIN,(double)threshold/COIN); - } - } - } - if ( GetBalance == 3 && totalinputs < minrelease ) // return elegible balance to be spent, and blocks left until min release can be released. - { - int64_t lockedblocks_balance = totalinputs; // inputs that can be spent already. - // sort utxos by blocks until able to be spent, smallest at top. - std::sort(blocksleft_balance.begin(), blocksleft_balance.end()); - // iterate the utxos blocks left vector, to get block height min release is able to be released. - for ( auto utxo : blocksleft_balance ) - { - lockedblocks_balance += utxo.second; - if ( lockedblocks_balance >= minrelease ) - { - blocksleft = utxo.first; - break; - } - } - } - return(totalinputs); -} - -UniValue payments_rawtxresult(UniValue &result,std::string rawtx,int32_t broadcastflag) -{ - CTransaction tx; - if ( rawtx.size() > 0 ) - { - result.push_back(Pair("hex",rawtx)); - if ( DecodeHexTx(tx,rawtx) != 0 ) - { - if ( broadcastflag != 0 && myAddtomempool(tx) != 0 ) - RelayTransaction(tx); - result.push_back(Pair("txid",tx.GetHash().ToString())); - result.push_back(Pair("result","success")); - } else result.push_back(Pair("error","decode hex")); - } else result.push_back(Pair("error","couldnt finalize payments CCtx")); - return(result); -} - -cJSON *payments_reparse(int32_t *nump,char *jsonstr) -{ - cJSON *params=0; char *newstr; int32_t i,j; - *nump = 0; - if ( jsonstr != 0 ) - { - if ( jsonstr[0] == '"' && jsonstr[strlen(jsonstr)-1] == '"' ) - { - jsonstr[strlen(jsonstr)-1] = 0; - jsonstr++; - } - newstr = (char *)malloc(strlen(jsonstr)+1); - for (i=j=0; jsonstr[i]!=0; i++) - { - if ( jsonstr[i] == '%' && jsonstr[i+1] == '2' && jsonstr[i+2] == '2' ) - { - newstr[j++] = '"'; - i += 2; - } - else if ( jsonstr[i] == '\'' ) - newstr[j++] = '"'; - else newstr[j++] = jsonstr[i]; - } - newstr[j] = 0; - params = cJSON_Parse(newstr); - if ( 0 && params != 0 ) - printf("new.(%s) -> %s\n",newstr,jprint(params,0)); - free(newstr); - *nump = cJSON_GetArraySize(params); - } - return(params); -} - -uint256 payments_juint256(cJSON *obj) -{ - uint256 tmp; bits256 t = jbits256(obj,0); - memcpy(&tmp,&t,sizeof(tmp)); - return(revuint256(tmp)); -} - -int32_t payments_parsehexdata(std::vector &hexdata,cJSON *item,int32_t len) -{ - char *hexstr; int32_t val; - if ( (hexstr= jstr(item,0)) != 0 && ((val= is_hexstr(hexstr,0)) == len*2 || (val > 0 && len == 0)) ) - { - val >>= 1; - hexdata.resize(val); - decode_hex(&hexdata[0],val,hexstr); - return(0); - } else return(-1); -} - -UniValue PaymentsRelease(struct CCcontract_info *cp,char *jsonstr) -{ - LOCK(cs_main); - CMutableTransaction tmpmtx,mtx = CreateNewContextualCMutableTransaction(Params().GetConsensus(),hush_nextheight()); UniValue result(UniValue::VOBJ); uint256 createtxid,hashBlock,tokenid; - CTransaction tx,txO; CPubKey mypk,txidpk,Paymentspk; int32_t i,n,m,numoprets=0,lockedblocks,minrelease; int64_t newamount,inputsum,amount,CCchange=0,totalallocations=0,checkallocations=0,allocation; CTxOut vout; CScript onlyopret,ccopret; char txidaddr[64],destaddr[64]; std::vector txidoprets; - int32_t top,bottom=0,blocksleft=0,minimum=10000; std::vector> excludeScriptPubKeys; int8_t funcid,fixedAmount=0,skipminimum=0; bool fFixedAmount = false; - mpz_t mpzTotalAllocations, mpzAllocation; mpz_init(mpzTotalAllocations); - cJSON *params = payments_reparse(&n,jsonstr); - mypk = pubkey2pk(Mypubkey()); - Paymentspk = GetUnspendable(cp,0); - if ( params != 0 && n >= 2 ) - { - createtxid = payments_juint256(jitem(params,0)); - amount = jdouble(jitem(params,1),0) * SATOSHIDEN + 0.0000000049; - if ( n == 3 ) - skipminimum = juint(jitem(params,2),0); - if ( myGetTransaction(createtxid,tx,hashBlock) != 0 && tx.vout.size() > 0 ) - { - if ( ((funcid= DecodePaymentsOpRet(tx.vout[tx.vout.size()-1].scriptPubKey,lockedblocks,minrelease,totalallocations,txidoprets)) == 'C' || (funcid= DecodePaymentsSnapsShotOpRet(tx.vout[tx.vout.size()-1].scriptPubKey,lockedblocks,minrelease,minimum,top,bottom,fixedAmount,excludeScriptPubKeys)) == 'S' || (funcid= DecodePaymentsTokensOpRet(tx.vout[tx.vout.size()-1].scriptPubKey,lockedblocks,minrelease,minimum,top,bottom,fixedAmount,excludeScriptPubKeys,tokenid)) == 'O') ) - { - if ( lockedblocks < 0 || minrelease < 0 || (totalallocations <= 0 && top <= 0 ) ) - { - result.push_back(Pair("result","error")); - result.push_back(Pair("error","negative parameter")); - if ( params != 0 ) - free_json(params); - return(result); - } - // set minimum size to 10k sat otherwise the tx will be invalid. - if ( minimum < 10000 ) - minimum = 10000; - if ( amount < minrelease*COIN ) - { - result.push_back(Pair("result","error")); - result.push_back(Pair("error","amount too smal")); - result.push_back(Pair("amount",ValueFromAmount(amount))); - result.push_back(Pair("minrelease",ValueFromAmount(minrelease*COIN))); - if ( params != 0 ) - free_json(params); - return(result); - } - txidpk = CCtxidaddr(txidaddr,createtxid); - ccopret = EncodePaymentsReleaseOpRet(createtxid, amount); - std::vector> vData = std::vector>(); - if ( makeCCopret(ccopret, vData) ) - mtx.vout.push_back(MakeCC1of2vout(EVAL_PAYMENTS,0,Paymentspk,txidpk,&vData)); - //fprintf(stderr, "funcid.%i\n", funcid); - if ( funcid == 'C' ) - { - // normal payments - m = txidoprets.size(); - for (i=0; i scriptPubKey,opret; - vout.nValue = 0; - if ( myGetTransaction(txidoprets[i],txO,hashBlock) != 0 && txO.vout.size() > 1 && DecodePaymentsTxidOpRet(txO.vout[txO.vout.size()-1].scriptPubKey,allocation,scriptPubKey,opret) == 'T' ) - { - vout.nValue = allocation; - vout.scriptPubKey.resize(scriptPubKey.size()); - memcpy(&vout.scriptPubKey[0],&scriptPubKey[0],scriptPubKey.size()); - checkallocations += allocation; - if ( opret.size() > 0 ) - { - onlyopret.resize(opret.size()); - memcpy(&onlyopret[0],&opret[0],opret.size()); - numoprets++; - } - } else break; - mtx.vout.push_back(vout); - } - result.push_back(Pair("numoprets",(int64_t)numoprets)); - if ( i != m ) - { - result.push_back(Pair("result","error")); - result.push_back(Pair("error","invalid txidoprets[i]")); - result.push_back(Pair("txi",(int64_t)i)); - if ( params != 0 ) - free_json(params); - return(result); - } - else if ( checkallocations != totalallocations ) - { - result.push_back(Pair("result","error")); - result.push_back(Pair("error","totalallocations mismatch")); - result.push_back(Pair("checkallocations",(int64_t)checkallocations)); - result.push_back(Pair("totalallocations",(int64_t)totalallocations)); - if ( params != 0 ) - free_json(params); - return(result); - } - else if ( numoprets > 1 ) - { - result.push_back(Pair("result","error")); - result.push_back(Pair("error","too many oprets")); - if ( params != 0 ) - free_json(params); - return(result); - } - // set totalallocations to a mpz_t bignum, for amounts calculation later. - mpz_set_lli(mpzTotalAllocations,totalallocations); - } - else if ( funcid == 'S' || funcid == 'O' ) - { - // normal snapshot - if ( vAddressSnapshot.size() == 0 ) - { - result.push_back(Pair("result","error")); - result.push_back(Pair("error","first snapshot has not happened yet")); - if ( params != 0 ) - free_json(params); - return(result); - } - if ( top > 3999 ) - { - result.push_back(Pair("result","error")); - result.push_back(Pair("error","cannot pay more than 3999 addresses")); - if ( params != 0 ) - free_json(params); - return(result); - } - if ( fixedAmount == 7 ) - { - // game setting, randomise bottom and top values - fFixedAmount = payments_game(top,bottom); - } - else if ( fixedAmount != 0 ) - { - fFixedAmount = true; - } - if ( (top-bottom) < 0 ) - { - result.push_back(Pair("result","error")); - result.push_back(Pair("error","invalid range top/bottom")); - if ( params != 0 ) - free_json(params); - return(result); - } - - std::vector allocations; - std::vector scriptPubKeys; - if ( funcid == 'S' ) - m = payments_getallocations(top, bottom, excludeScriptPubKeys, mpzTotalAllocations, scriptPubKeys, allocations); - else - { - // token snapshot - // payments_gettokenallocations(top, bottom, excludeScriptPubKeys, tokenid, mpzTotalAllocations, scriptPubKeys, allocations); - } - if ( (allocations.size() == 0 || scriptPubKeys.size() == 0 || allocations.size() != scriptPubKeys.size()) ) - { - result.push_back(Pair("result","error")); - result.push_back(Pair("error","mismatched allocations, scriptpubkeys")); - if ( params != 0 ) - free_json(params); - return(result); - } - i = 0; - for ( auto allocation : allocations ) - { - vout.nValue = allocation; - vout.scriptPubKey = scriptPubKeys[i]; - mtx.vout.push_back(vout); - i++; - } - } - newamount = amount; - int64_t totalamountsent = 0; - mpz_t mpzAmount; mpz_init(mpzAmount); mpz_set_lli(mpzAmount,amount); - for (i=0; i= newamount+2*PAYMENTS_TXFEE ) - { - std::string rawtx; - mtx.vout[0].nValue = inputsum - newamount - PAYMENTS_TXFEE; // only 1 txfee, so the minimum in this vout is a tx fee. - GetCCaddress1of2(cp,destaddr,Paymentspk,txidpk); - CCaddr1of2set(cp,Paymentspk,txidpk,cp->CCpriv,destaddr); - rawtx = FinalizeCCTx(0,cp,mtx,mypk,PAYMENTS_TXFEE,onlyopret); - if ( params != 0 ) - free_json(params); - result.push_back(Pair("amount",ValueFromAmount(amount))); - result.push_back(Pair("newamount",ValueFromAmount(newamount))); - return(payments_rawtxresult(result,rawtx,1)); - } - else - { - result.push_back(Pair("result","error")); - result.push_back(Pair("error","couldnt find enough locked funds")); - } - } - else - { - result.push_back(Pair("result","error")); - result.push_back(Pair("error","couldnt find paymentscreate txid")); - } - } - else - { - result.push_back(Pair("result","error")); - result.push_back(Pair("error","parameters error")); - } - if ( params != 0 ) - free_json(params); - return(result); -} - -UniValue PaymentsFund(struct CCcontract_info *cp,char *jsonstr) -{ - CMutableTransaction mtx = CreateNewContextualCMutableTransaction(Params().GetConsensus(), hush_nextheight()); UniValue result(UniValue::VOBJ); - CPubKey Paymentspk,mypk,txidpk; uint256 txid,hashBlock; int64_t amount,totalallocations; CScript opret; CTransaction tx; char txidaddr[64]; std::string rawtx; int32_t n,useopret = 0,broadcast=0,lockedblocks,minrelease; std::vector txidoprets; - int32_t top,bottom,minimum=10000; std::vector> excludeScriptPubKeys; // snapshot - uint256 tokenid; int8_t fixedAmount; - cJSON *params = payments_reparse(&n,jsonstr); - mypk = pubkey2pk(Mypubkey()); - Paymentspk = GetUnspendable(cp,0); - if ( params != 0 && n > 1 && n <= 4 ) - { - txid = payments_juint256(jitem(params,0)); - amount = jdouble(jitem(params,1),0) * SATOSHIDEN + 0.0000000049; - if ( n == 3 ) - useopret = jint(jitem(params,2),0) != 0; - if ( n == 4 ) - broadcast = jint(jitem(params,3),0) != 0; - if ( myGetTransaction(txid,tx,hashBlock) == 0 || tx.vout.size() == 1 || (DecodePaymentsOpRet(tx.vout[tx.vout.size()-1].scriptPubKey,lockedblocks,minrelease,totalallocations,txidoprets) == 0 && DecodePaymentsSnapsShotOpRet(tx.vout[tx.vout.size()-1].scriptPubKey,lockedblocks,minrelease,minimum,top,bottom,fixedAmount,excludeScriptPubKeys) == 0 && DecodePaymentsTokensOpRet(tx.vout[tx.vout.size()-1].scriptPubKey,lockedblocks,minrelease,minimum,top,bottom,fixedAmount,excludeScriptPubKeys,tokenid) == 0) ) - { - result.push_back(Pair("result","error")); - result.push_back(Pair("error","invalid createtxid")); - } - else if ( AddNormalinputs(mtx,mypk,amount+PAYMENTS_TXFEE,60) > 0 ) - { - if ( lockedblocks < 0 || minrelease < 0 || (totalallocations <= 0 && top <= 0 ) ) - { - result.push_back(Pair("result","error")); - result.push_back(Pair("error","negative parameter")); - if ( params != 0 ) - free_json(params); - return(result); - } - if ( useopret == 0 ) - { - txidpk = CCtxidaddr(txidaddr,txid); - mtx.vout.push_back(MakeCC1of2vout(EVAL_PAYMENTS,amount,Paymentspk,txidpk)); - } - else - { - opret = EncodePaymentsFundOpRet(txid); - std::vector> vData = std::vector>(); - if ( makeCCopret(opret, vData) ) - mtx.vout.push_back(MakeCC1vout(EVAL_PAYMENTS,amount,Paymentspk,&vData)); - } - rawtx = FinalizeCCTx(0,cp,mtx,mypk,PAYMENTS_TXFEE,CScript()); - if ( params != 0 ) - free_json(params); - return(payments_rawtxresult(result,rawtx,1)); - } - else - { - result.push_back(Pair("result","error")); - result.push_back(Pair("error","couldnt find enough funds")); - } - } - else - { - result.push_back(Pair("result","error")); - result.push_back(Pair("error","parameters error")); - } - if ( params != 0 ) - free_json(params); - return(result); -} - -UniValue PaymentsMerge(struct CCcontract_info *cp,char *jsonstr) -{ - CMutableTransaction mtx = CreateNewContextualCMutableTransaction(Params().GetConsensus(), hush_nextheight()); UniValue result(UniValue::VOBJ); - CPubKey Paymentspk,mypk,txidpk; uint256 createtxid,hashBlock; int64_t inputsum,totalallocations=0; CScript opret; CTransaction tx; char txidaddr[64],destaddr[64]; std::string rawtx; - int32_t n,lockedblocks,minrelease,top,bottom,minimum=10000,blocksleft; std::vector txidoprets; - std::vector> excludeScriptPubKeys; // snapshot - uint256 tokenid; int8_t fixedAmount; - cJSON *params = payments_reparse(&n,jsonstr); - mypk = pubkey2pk(Mypubkey()); - Paymentspk = GetUnspendable(cp,0); - if ( params != 0 && n == 1 ) - { - createtxid = payments_juint256(jitem(params,0)); - txidpk = CCtxidaddr(txidaddr,createtxid); - if ( myGetTransaction(createtxid,tx,hashBlock) == 0 || tx.vout.size() == 1 || (DecodePaymentsOpRet(tx.vout[tx.vout.size()-1].scriptPubKey,lockedblocks,minrelease,totalallocations,txidoprets) == 0 && DecodePaymentsSnapsShotOpRet(tx.vout[tx.vout.size()-1].scriptPubKey,lockedblocks,minrelease,minimum,top,bottom,fixedAmount,excludeScriptPubKeys) == 0 && DecodePaymentsTokensOpRet(tx.vout[tx.vout.size()-1].scriptPubKey,lockedblocks,minrelease,minimum,top,bottom,fixedAmount,excludeScriptPubKeys,tokenid) == 0) ) - { - result.push_back(Pair("result","error")); - result.push_back(Pair("error","invalid createtxid")); - } - else if ( (inputsum= AddPaymentsInputs(true,4,cp,mtx,txidpk,0,CC_MAXVINS,createtxid,lockedblocks,minrelease,blocksleft)) > 0 && mtx.vin.size() > 1 ) - { - int32_t dust = blocksleft; - if ( mtx.vin.size() == dust+1 ) - { - result.push_back(Pair("result","error")); - result.push_back(Pair("error","cannot merge only dust")); - } - else - { - // encode the checktxid into the end of the ccvout, along with 'M' to flag merge type tx. - opret = EncodePaymentsMergeOpRet(createtxid); - std::vector> vData = std::vector>(); - if ( makeCCopret(opret, vData) ) - mtx.vout.push_back(MakeCC1of2vout(EVAL_PAYMENTS,inputsum-PAYMENTS_TXFEE,Paymentspk,txidpk,&vData)); - GetCCaddress1of2(cp,destaddr,Paymentspk,txidpk); - CCaddr1of2set(cp,Paymentspk,txidpk,cp->CCpriv,destaddr); - rawtx = FinalizeCCTx(0,cp,mtx,mypk,PAYMENTS_TXFEE,CScript()); - if ( params != 0 ) - free_json(params); - return(payments_rawtxresult(result,rawtx,1)); - } - } - else - { - result.push_back(Pair("result","error")); - result.push_back(Pair("error","couldnt find enough funds")); - } - } - else - { - result.push_back(Pair("result","error")); - result.push_back(Pair("error","parameters error")); - } - if ( params != 0 ) - free_json(params); - return(result); -} - -UniValue PaymentsTxidopret(struct CCcontract_info *cp,char *jsonstr) -{ - CMutableTransaction mtx = CreateNewContextualCMutableTransaction(Params().GetConsensus(), hush_nextheight()); UniValue result(UniValue::VOBJ); CPubKey mypk; std::string rawtx; - std::vector scriptPubKey,opret; int32_t n,retval0,retval1=0; int64_t allocation; CScript test; txnouttype whichType; - cJSON *params = payments_reparse(&n,jsonstr); - mypk = pubkey2pk(Mypubkey()); - if ( params != 0 && n > 1 && n <= 3 ) - { - allocation = (int64_t)jint(jitem(params,0),0); - std::string address; - address.append(jstri(params,1)); - CTxDestination destination = DecodeDestination(address); - if ( IsValidDestination(destination) ) - { - // its an address - test = GetScriptForDestination(destination); - scriptPubKey = std::vector (test.begin(),test.end()); - } - else - { - // its a scriptpubkey - retval0 = payments_parsehexdata(scriptPubKey,jitem(params,1),0); - test = CScript(scriptPubKey.begin(),scriptPubKey.end()); - } - if (!::IsStandard(test, whichType)) - { - result.push_back(Pair("result","error")); - result.push_back(Pair("error","scriptPubkey is not valid payment.")); - } - else - { - if ( n == 3 ) - retval1 = payments_parsehexdata(opret,jitem(params,2),0); - if ( allocation > 0 && retval0 == 0 && retval1 == 0 && AddNormalinputs(mtx,mypk,PAYMENTS_TXFEE*2,10) > 0 ) - { - rawtx = FinalizeCCTx(0,cp,mtx,mypk,PAYMENTS_TXFEE,EncodePaymentsTxidOpRet(allocation,scriptPubKey,opret)); - if ( params != 0 ) - free_json(params); - return(payments_rawtxresult(result,rawtx,1)); - } - result.push_back(Pair("result","error")); - result.push_back(Pair("error","invalid params or cant find txfee")); - } - } - else - { - result.push_back(Pair("result","error")); - result.push_back(Pair("error","parameters error")); - result.push_back(Pair("n",(int64_t)n)); - fprintf(stderr,"(%s) %p\n",jsonstr,params); - } - if ( params != 0 ) - free_json(params); - return(result); -} - -UniValue PaymentsCreate(struct CCcontract_info *cp,char *jsonstr) -{ - CMutableTransaction mtx = CreateNewContextualCMutableTransaction(Params().GetConsensus(), hush_nextheight()); - UniValue result(UniValue::VOBJ); CTransaction tx; CPubKey Paymentspk,mypk; char markeraddr[64]; std::vector txidoprets; uint256 hashBlock; int32_t i,n,numoprets=0,lockedblocks,minrelease; std::string rawtx; int64_t totalallocations = 0; - cJSON *params = payments_reparse(&n,jsonstr); - if ( params != 0 && n >= 4 ) - { - lockedblocks = juint(jitem(params,0),0); - minrelease = juint(jitem(params,1),0); - if ( lockedblocks < 0 || minrelease < 0 ) - { - result.push_back(Pair("result","error")); - result.push_back(Pair("error","negative parameter")); - if ( params != 0 ) - free_json(params); - return(result); - } - for (i=0; i scriptPubKey,opret; int64_t allocation; - //fprintf(stderr, "txid.%s\n",txidoprets[i].GetHex().c_str()); - if ( myGetTransaction(txidoprets[i],tx,hashBlock) != 0 && tx.vout.size() > 1 && DecodePaymentsTxidOpRet(tx.vout[tx.vout.size()-1].scriptPubKey,allocation,scriptPubKey,opret) == 'T' ) - { - totalallocations += allocation; - if ( opret.size() > 0 ) - numoprets++; - } - else - { - result.push_back(Pair("result","error")); - result.push_back(Pair("error","invalid txidopret")); - result.push_back(Pair("txid",txidoprets[i].GetHex())); - result.push_back(Pair("txi",(int64_t)i)); - if ( params != 0 ) - free_json(params); - return(result); - } - } - if ( numoprets > 1 ) - { - result.push_back(Pair("result","error")); - result.push_back(Pair("error","too many opreturns")); - result.push_back(Pair("numoprets",(int64_t)numoprets)); - if ( params != 0 ) - free_json(params); - return(result); - } - mypk = pubkey2pk(Mypubkey()); - Paymentspk = GetUnspendable(cp,0); - if ( AddNormalinputs(mtx,mypk,2*PAYMENTS_TXFEE,60) > 0 ) - { - mtx.vout.push_back(MakeCC1of2vout(cp->evalcode,PAYMENTS_TXFEE,Paymentspk,Paymentspk)); - rawtx = FinalizeCCTx(0,cp,mtx,mypk,PAYMENTS_TXFEE,EncodePaymentsOpRet(lockedblocks,minrelease,totalallocations,txidoprets)); - if ( params != 0 ) - free_json(params); - return(payments_rawtxresult(result,rawtx,1)); - } - result.push_back(Pair("result","error")); - result.push_back(Pair("error","not enough normal funds")); - } - else - { - result.push_back(Pair("result","error")); - result.push_back(Pair("error","parameters error")); - } - if ( params != 0 ) - free_json(params); - return(result); -} - -UniValue PaymentsAirdrop(struct CCcontract_info *cp,char *jsonstr) -{ - CMutableTransaction mtx = CreateNewContextualCMutableTransaction(Params().GetConsensus(), hush_nextheight()); - UniValue result(UniValue::VOBJ); - uint256 hashBlock; CTransaction tx; CPubKey Paymentspk,mypk; char markeraddr[64]; std::string rawtx; - int32_t lockedblocks,minrelease,top,bottom,n,i,minimum=10000; std::vector> excludeScriptPubKeys; int8_t fixedAmount; - if ( HUSH_SNAPSHOT_INTERVAL == 0 ) - { - result.push_back(Pair("result","error")); - result.push_back(Pair("error","cannot use airdrop wihtout -ac_snapshot set.")); - return(result); - } - cJSON *params = payments_reparse(&n,jsonstr); - if ( params != 0 && n >= 5 ) - { - lockedblocks = juint(jitem(params,0),0); - minrelease = juint(jitem(params,1),0); - minimum = juint(jitem(params,2),0); - if ( minimum < 10000 ) minimum = 10000; - top = juint(jitem(params,3),0); - bottom = juint(jitem(params,4),0); - fixedAmount = juint(jitem(params,5),0); // fixed amount is a flag, set to 7 does game mode, 0 normal snapshot, anything else fixed allocations. - if ( lockedblocks < 0 || minrelease < 0 || top <= 0 || bottom < 0 || minimum < 0 || fixedAmount < 0 || top > 3999 ) - { - result.push_back(Pair("result","error")); - result.push_back(Pair("error","negative parameter, or top over 3999")); - if ( params != 0 ) - free_json(params); - return(result); - } - if ( top-bottom < 0 ) - { - result.push_back(Pair("result","error")); - result.push_back(Pair("error","invalid range, top/bottom")); - if ( params != 0 ) - free_json(params); - return(result); - } - if ( n > 6 ) - { - for (i=0; i vscriptPubKey; - CScript scriptPubKey = GetScriptForDestination(destination); - vscriptPubKey.assign(scriptPubKey.begin(), scriptPubKey.end()); - excludeScriptPubKeys.push_back(vscriptPubKey); - } - } - mypk = pubkey2pk(Mypubkey()); - Paymentspk = GetUnspendable(cp,0); - if ( AddNormalinputs(mtx,mypk,2*PAYMENTS_TXFEE,60) > 0 ) - { - mtx.vout.push_back(MakeCC1of2vout(cp->evalcode,PAYMENTS_TXFEE,Paymentspk,Paymentspk)); - CScript tempopret = EncodePaymentsSnapsShotOpRet(lockedblocks,minrelease,minimum,top,bottom,fixedAmount,excludeScriptPubKeys); - if ( tempopret.size() > 10000 ) // TODO: Check this! - { - result.push_back(Pair("result","error")); - result.push_back(Pair("error","op_return is too big, try with less exclude addresses.")); - if ( params != 0 ) - free_json(params); - return(result); - } - rawtx = FinalizeCCTx(0,cp,mtx,mypk,PAYMENTS_TXFEE,tempopret); - if ( params != 0 ) - free_json(params); - return(payments_rawtxresult(result,rawtx,1)); - } - result.push_back(Pair("result","error")); - result.push_back(Pair("error","not enough normal funds")); - } - else - { - result.push_back(Pair("result","error")); - result.push_back(Pair("error","parameters error")); - } - if ( params != 0 ) - free_json(params); - return(result); -} - -UniValue PaymentsAirdropTokens(struct CCcontract_info *cp,char *jsonstr) -{ - CMutableTransaction mtx = CreateNewContextualCMutableTransaction(Params().GetConsensus(), hush_nextheight()); - UniValue result(UniValue::VOBJ); - uint256 hashBlock, tokenid = zeroid; CTransaction tx; CPubKey Paymentspk,mypk; char markeraddr[64]; std::string rawtx; - int32_t lockedblocks,minrelease,top,bottom,n,i,minimum=10000; std::vector> excludeScriptPubKeys; int8_t fixedAmount; - cJSON *params = payments_reparse(&n,jsonstr); - // disable for now. Need token snapshot function. - if ( 0 ) //params != 0 && n >= 6 ) - { - tokenid = payments_juint256(jitem(params,0)); - lockedblocks = juint(jitem(params,1),0); - minrelease = juint(jitem(params,2),0); - minimum = juint(jitem(params,3),0); - if ( minimum < 10000 ) minimum = 10000; - top = juint(jitem(params,4),0); - bottom = juint(jitem(params,5),0); - fixedAmount = juint(jitem(params,6),0); // fixed amount is a flag, set to 7 does game mode, 0 normal snapshot, anything else fixed allocations. - if ( lockedblocks < 0 || minrelease < 0 || top <= 0 || bottom < 0 || minimum < 0 || fixedAmount < 0 || top > 3999 || tokenid == zeroid ) - { - result.push_back(Pair("result","error")); - result.push_back(Pair("error","negative parameter, or top over 3999")); - if ( params != 0 ) - free_json(params); - return(result); - } - // TODO: lookup tokenid and make sure it exists. - if ( n > 7 ) - { - for (i=0; i vscriptPubKey; - CScript scriptPubKey = GetScriptForDestination(destination); - vscriptPubKey.assign(scriptPubKey.begin(), scriptPubKey.end()); - excludeScriptPubKeys.push_back(vscriptPubKey); - } - } - mypk = pubkey2pk(Mypubkey()); - Paymentspk = GetUnspendable(cp,0); - if ( AddNormalinputs(mtx,mypk,2*PAYMENTS_TXFEE,60) > 0 ) - { - mtx.vout.push_back(MakeCC1of2vout(cp->evalcode,PAYMENTS_TXFEE,Paymentspk,Paymentspk)); - CScript tempopret = EncodePaymentsTokensOpRet(lockedblocks,minrelease,minimum,top,bottom,fixedAmount,excludeScriptPubKeys,tokenid); - if ( tempopret.size() > 10000 ) // TODO: Check this! - { - result.push_back(Pair("result","error")); - result.push_back(Pair("error","op_return is too big, try with less exclude pubkeys.")); - if ( params != 0 ) - free_json(params); - return(result); - } - rawtx = FinalizeCCTx(0,cp,mtx,mypk,PAYMENTS_TXFEE,tempopret); - if ( params != 0 ) - free_json(params); - return(payments_rawtxresult(result,rawtx,0)); - } - result.push_back(Pair("result","error")); - result.push_back(Pair("error","not enough normal funds")); - } - else - { - result.push_back(Pair("result","error")); - //result.push_back(Pair("error","parameters error")); - result.push_back(Pair("error","tokens airdrop not yet impmlemented")); - } - if ( params != 0 ) - free_json(params); - return(result); -} - -UniValue PaymentsInfo(struct CCcontract_info *cp,char *jsonstr) -{ - UniValue result(UniValue::VOBJ),a(UniValue::VARR); CTransaction tx,txO; CPubKey Paymentspk,txidpk; int32_t i,j,n,flag=0,numoprets=0,lockedblocks,minrelease,blocksleft=0; std::vector txidoprets; int64_t funds,fundsopret,elegiblefunds,totalallocations=0,allocation; char fundsaddr[64],fundsopretaddr[64],txidaddr[64],*outstr; uint256 createtxid,hashBlock; - int32_t top,bottom,minimum=10000; std::vector> excludeScriptPubKeys; // snapshot - uint256 tokenid; int8_t fixedAmount; CMutableTransaction mtx = CreateNewContextualCMutableTransaction(Params().GetConsensus(),hush_nextheight()); - cJSON *params = payments_reparse(&n,jsonstr); - if ( params != 0 && n == 1 ) - { - Paymentspk = GetUnspendable(cp,0); - createtxid = payments_juint256(jitem(params,0)); - if ( myGetTransaction(createtxid,tx,hashBlock) != 0 && tx.vout.size() > 0 ) - { - if ( DecodePaymentsOpRet(tx.vout[tx.vout.size()-1].scriptPubKey,lockedblocks,minrelease,totalallocations,txidoprets) != 0 ) - { - if ( lockedblocks < 0 || minrelease < 0 || totalallocations <= 0 || txidoprets.size() < 2 ) - { - result.push_back(Pair("result","error")); - result.push_back(Pair("error","negative parameter")); - if ( params != 0 ) - free_json(params); - return(result); - } - result.push_back(Pair("plan_type","payments")); - result.push_back(Pair("lockedblocks",(int64_t)lockedblocks)); - result.push_back(Pair("totalallocations",(int64_t)totalallocations)); - result.push_back(Pair("minrelease",(int64_t)minrelease)); - for (i=0; i scriptPubKey,opret; - obj.push_back(Pair("txid",txidoprets[i].GetHex())); - if ( myGetTransaction(txidoprets[i],txO,hashBlock) != 0 && txO.vout.size() > 1 && DecodePaymentsTxidOpRet(txO.vout[txO.vout.size()-1].scriptPubKey,allocation,scriptPubKey,opret) == 'T' ) - { - outstr = (char *)malloc(2*(scriptPubKey.size() + opret.size()) + 1); - for (j=0; j 1 ) - { - flag++; - result.push_back(Pair("result","error")); - result.push_back(Pair("error","too many opreturns")); - } else result.push_back(Pair("txidoprets",a)); - } - else if ( DecodePaymentsSnapsShotOpRet(tx.vout[tx.vout.size()-1].scriptPubKey,lockedblocks,minrelease,minimum,top,bottom,fixedAmount,excludeScriptPubKeys) != 0 ) - { - if ( lockedblocks < 0 || minrelease < 0 || top <= 0 || bottom < 0 || fixedAmount < 0 || top > 3999 || minimum < 10000 ) - { - result.push_back(Pair("result","error")); - result.push_back(Pair("error","negative parameter")); - if ( params != 0 ) - free_json(params); - return(result); - } - if ( fixedAmount == 7 && payments_game(top,bottom)) - result.push_back(Pair("plan_type","payments_game")); - else - result.push_back(Pair("plan_type","snapshot")); - result.push_back(Pair("lockedblocks",(int64_t)lockedblocks)); - result.push_back(Pair("minrelease",(int64_t)minrelease)); - result.push_back(Pair("minimum",(int64_t)minimum)); - result.push_back(Pair("bottom",(int64_t)bottom)); - result.push_back(Pair("top",(int64_t)top)); - result.push_back(Pair("fixedFlag",(int64_t)fixedAmount)); - for ( auto scriptPubKey : excludeScriptPubKeys ) - { - CTxDestination dest; - if ( ExtractDestination(CScript(scriptPubKey.begin(),scriptPubKey.end()), dest) ) - a.push_back(CBitcoinAddress(dest).ToString()); - } - result.push_back(Pair("excludeAddresses",a)); - } - else if ( DecodePaymentsTokensOpRet(tx.vout[tx.vout.size()-1].scriptPubKey,lockedblocks,minrelease,minimum,top,bottom,fixedAmount,excludeScriptPubKeys,tokenid) != 0 ) - { - if ( lockedblocks < 0 || minrelease < 0 || top <= 0 ) - { - result.push_back(Pair("result","error")); - result.push_back(Pair("error","negative parameter")); - if ( params != 0 ) - free_json(params); - return(result); - } - result.push_back(Pair("plan_type","token snapshot")); - result.push_back(Pair("lockedblocks",(int64_t)lockedblocks)); - result.push_back(Pair("minrelease",(int64_t)minrelease)); - result.push_back(Pair("top",(int64_t)top)); - result.push_back(Pair("tokenid",tokenid.ToString())); - // TODO: show pubkeys instead of scriptpubkeys - for ( auto scriptPubKey : excludeScriptPubKeys ) - a.push_back(HexStr(scriptPubKey.begin(),scriptPubKey.end())); - result.push_back(Pair("excludeScriptPubkeys",a)); - } - else - { - result.push_back(Pair("result","error")); - result.push_back(Pair("error","couldnt decode valid payments create txid opreturn")); - } - if ( flag == 0 ) - { - txidpk = CCtxidaddr(txidaddr,createtxid); - GetCCaddress1of2(cp,fundsaddr,Paymentspk,txidpk); - blocksleft = 0; - funds = AddPaymentsInputs(false,2,cp,mtx,txidpk,0,CC_MAXVINS,createtxid,lockedblocks,minrelease,blocksleft); - result.push_back(Pair(fundsaddr,ValueFromAmount(funds))); - result.push_back(Pair("utxos", (int64_t)blocksleft)); - blocksleft = 0; - GetCCaddress(cp,fundsopretaddr,Paymentspk); - fundsopret = AddPaymentsInputs(false,1,cp,mtx,txidpk,0,CC_MAXVINS,createtxid,lockedblocks,minrelease,blocksleft); - result.push_back(Pair(fundsopretaddr,ValueFromAmount(fundsopret))); - result.push_back(Pair("utxos", (int64_t)blocksleft)); - result.push_back(Pair("totalfunds",ValueFromAmount(funds+fundsopret))); - // Blocks until minrelease can be released. - elegiblefunds = AddPaymentsInputs(true,3,cp,mtx,txidpk,0,CC_MAXVINS,createtxid,lockedblocks,minrelease,blocksleft); - result.push_back(Pair("elegiblefunds",ValueFromAmount(elegiblefunds))); - result.push_back(Pair("min_release_height",chainActive.Height()+blocksleft)); - result.push_back(Pair("result","success")); - } - } - else - { - result.push_back(Pair("result","error")); - result.push_back(Pair("error","couldnt find valid payments create txid")); - } - } - else - { - result.push_back(Pair("result","error")); - result.push_back(Pair("error","parameters error")); - } - if ( params != 0 ) - free_json(params); - return(result); -} - -UniValue PaymentsList(struct CCcontract_info *cp,char *jsonstr) -{ - std::vector > addressIndex; uint256 txid,hashBlock,tokenid; - UniValue result(UniValue::VOBJ),a(UniValue::VARR); char markeraddr[64],str[65]; CPubKey Paymentspk; CTransaction tx; int32_t lockedblocks,minrelease; std::vector txidoprets; int64_t totalallocations=0; - int32_t top=0,bottom=0,minimum=10000; std::vector> excludeScriptPubKeys; int8_t fixedAmount = 0; - Paymentspk = GetUnspendable(cp,0); - GetCCaddress1of2(cp,markeraddr,Paymentspk,Paymentspk); - SetCCtxids(addressIndex,markeraddr,true); - for (std::vector >::const_iterator it=addressIndex.begin(); it!=addressIndex.end(); it++) - { - txid = it->first.txhash; - if ( it->first.index == 0 && myGetTransaction(txid,tx,hashBlock) != 0 ) - { - if ( tx.vout.size() > 0 && (DecodePaymentsOpRet(tx.vout[tx.vout.size()-1].scriptPubKey,lockedblocks,minrelease,totalallocations,txidoprets) == 'C' || DecodePaymentsSnapsShotOpRet(tx.vout[tx.vout.size()-1].scriptPubKey,lockedblocks,minrelease,minimum,top,bottom,fixedAmount,excludeScriptPubKeys) == 'S' || DecodePaymentsTokensOpRet(tx.vout[tx.vout.size()-1].scriptPubKey,lockedblocks,minrelease,minimum,top,bottom,fixedAmount,excludeScriptPubKeys,tokenid) == 'O') ) - { - if ( lockedblocks < 0 || minrelease < 0 || (totalallocations <= 0 && top <= 0 ) || bottom < 0 || fixedAmount < 0 || minimum < 10000 ) - { - result.push_back(Pair("result","error")); - result.push_back(Pair("error","negative parameter")); - return(result); - } - a.push_back(uint256_str(str,txid)); - } - } - } - result.push_back(Pair("result","success")); - result.push_back(Pair("createtxids",a)); - return(result); -} diff --git a/src/cc/rewards.cpp b/src/cc/rewards.cpp deleted file mode 100644 index 3dd6f07ec..000000000 --- a/src/cc/rewards.cpp +++ /dev/null @@ -1,756 +0,0 @@ -// Copyright (c) 2016-2023 The Hush developers -// Distributed under the GPLv3 software license, see the accompanying -// file COPYING or https://www.gnu.org/licenses/gpl-3.0.en.html -/****************************************************************************** - * Copyright © 2014-2019 The SuperNET Developers. * - * * - * See the AUTHORS, DEVELOPER-AGREEMENT and LICENSE files at * - * the top-level directory of this distribution for the individual copyright * - * holder information and the developer policies on copyright and licensing. * - * * - * Unless otherwise agreed in a custom licensing agreement, no part of the * - * SuperNET software, including this file may be copied, modified, propagated * - * or distributed except according to the terms contained in the LICENSE file * - * * - * Removal or modification of this copyright notice is prohibited. * - * * - ******************************************************************************/ - -#include "CCrewards.h" - -/* - The rewards CC contract is initially for OOT, which needs this functionality. However, many of the attributes can be parameterized to allow different rewards programs to run. Multiple rewards plans could even run on the same blockchain, though the user would need to choose which one to lock funds into. - - At the high level, the user would lock funds for some amount of time and at the end of it, would get all the locked funds back with an additional reward. So there needs to be a lock funds and unlock funds ability. Additionally, the rewards need to come from somewhere, so similar to the faucet, there would be a way to fund the reward. - - Additional requirements are for the user to be able to lock funds via SPV. This requirement in turns forces the creation of a way for anybody to be able to unlock the funds as that operation requires a native daemon running and cant be done over SPV. The idea is to allow anybody to run a script that would unlock all funds that are matured. As far as the user is concerned, he locks his funds via SPV and after some time it comes back with an extra reward. - - In reality, the funds are locked into a CC address that is unspendable, except for some special conditions and it needs to come back to the address that funded the lock. In order to implement this, several things are clear. - - 1) each locked CC utxo needs to be linked to a specific rewards plan - 2) each locked CC utxo needs to know the only address that it can be unlocked into - 3) SPV requirement means the lock transaction needs to be able to be created without any CC signing - - The opreturn will be used to store the name of the rewards plan and all funding and locked funds with the same plan will use the same pool of rewards. plan names will be limited to 8 chars and encoded into a uint64_t. - - The initial funding transaction will have all the parameters for the rewards plan encoded in the vouts. Additional fundings will just increase the available CC utxo for the rewards. - - Locks wont have any CC vins, but will send to the RewardsCCaddress, with the plan stringbits in the opreturn. vout1 will have the unlock address and no other destination is valid. - - Unlock does a CC spend to the vout1 address - - - createfunding - vins.*: normal inputs - vout.0: CC vout for funding - vout.1: normal marker vout for easy searching - vout.2: normal change - vout.n-1: opreturn 'F' sbits APR minseconds maxseconds mindeposit - - addfunding - vins.*: normal inputs - vout.0: CC vout for funding - vout.1: normal change - vout.n-1: opreturn 'A' sbits fundingtxid - - lock - vins.*: normal inputs - vout.0: CC vout for locked funds - vout.1: normal output to unlock address - vout.2: change - vout.n-1: opreturn 'L' sbits fundingtxid - - unlock - vin.0: locked funds CC vout.0 from lock - vin.1+: funding CC vout.0 from 'F' and 'A' and 'U' - vout.0: funding CC change - vout.1: normal output to unlock address - vout.n-1: opreturn 'U' sbits fundingtxid - - */ - -/// the following are compatible with windows -/// mpz_set_lli sets a long long singed int to a big num mpz_t for very large integer math -extern void mpz_set_lli( mpz_t rop, long long op ); -// mpz_get_si2 gets a mpz_t and returns a signed long long int -extern int64_t mpz_get_si2( mpz_t op ); -// mpz_get_ui2 gets a mpz_t and returns a unsigned long long int -extern uint64_t mpz_get_ui2( mpz_t op ); - -uint64_t RewardsCalc(int64_t amount, uint256 txid, int64_t APR, int64_t minseconds, int64_t maxseconds, uint32_t timestamp) -{ - int32_t numblocks; int64_t duration; uint64_t reward = 0; - //fprintf(stderr,"minseconds %llu maxseconds %llu\n",(long long)minseconds,(long long)maxseconds); - if ( (duration= CCduration(numblocks,txid)) < minseconds ) - { - fprintf(stderr,"duration %lli < minseconds %lli\n",(long long)duration,(long long)minseconds); - return(0); - //duration = (uint32_t)time(NULL) - (1532713903 - 3600 * 24); - } else if ( duration > maxseconds ) - duration = maxseconds; - /* if ( 0 ) // amount * APR * duration / COIN * 100 * 365*24*3600 - reward = (((amount * APR) / COIN) * duration) / (365*24*3600LL * 100); - else reward = (((amount * duration) / (365 * 24 * 3600LL)) * (APR / 1000000)) / 10000; - */ - if ( !hush_hardfork_active(timestamp) ) - reward = (((amount * duration) / (365 * 24 * 3600LL)) * (APR / 1000000)) / 10000; - else - { - // declare and init the mpz_t big num variables - mpz_t mpzAmount, mpzDuration, mpzReward, mpzAPR, mpzModifier; - mpz_init(mpzAmount); - mpz_init(mpzDuration); - mpz_init(mpzAPR); - mpz_init(mpzReward); - mpz_init(mpzModifier); - - // set the inputs to big num variables - mpz_set_lli(mpzAmount, amount); - mpz_set_lli(mpzDuration, duration); - mpz_set_lli(mpzAPR, APR); - mpz_set_lli(mpzModifier, COIN*100*365*24*3600LL); - - // (amount * APR * duration) - mpz_mul(mpzReward, mpzAmount, mpzDuration); - mpz_mul(mpzReward, mpzReward, mpzAPR); - - // total_of_above / (COIN * 100 * 365*24*3600LL) - mpz_tdiv_q(mpzReward, mpzReward, mpzModifier); - - // set result to variable we can use and return it. - reward = mpz_get_ui2(mpzReward); - } - if ( reward > amount ) - reward = amount; - fprintf(stderr, "amount.%lli duration.%lli APR.%lli reward.%llu\n", (long long)amount, (long long)duration, (long long)APR, (long long)reward); - //fprintf(stderr,"amount %.8f %.8f %llu -> duration.%llu reward %.8f vals %.8f %.8f\n",(double)amount/COIN,((double)amount * APR)/COIN,(long long)((amount * APR) / (COIN * 365*24*3600)),(long long)duration,(double)reward/COIN,(double)((amount * duration) / (365 * 24 * 3600LL))/COIN,(double)(((amount * duration) / (365 * 24 * 3600LL)) * (APR / 1000000))/COIN); - return(reward); -} - -CScript EncodeRewardsFundingOpRet(uint8_t funcid,uint64_t sbits,uint64_t APR,uint64_t minseconds,uint64_t maxseconds,uint64_t mindeposit) -{ - CScript opret; uint8_t evalcode = EVAL_REWARDS; - opret << OP_RETURN << E_MARSHAL(ss << evalcode << 'F' << sbits << APR << minseconds << maxseconds << mindeposit); - return(opret); -} - -uint8_t DecodeRewardsFundingOpRet(const CScript &scriptPubKey,uint64_t &sbits,uint64_t &APR,uint64_t &minseconds,uint64_t &maxseconds,uint64_t &mindeposit) -{ - std::vector vopret; uint8_t *script,e,f; - GetOpReturnData(scriptPubKey, vopret); - script = (uint8_t *)vopret.data(); - if ( vopret.size() > 2 && E_UNMARSHAL(vopret,ss >> e; ss >> f; ss >> sbits; ss >> APR; ss >> minseconds; ss >> maxseconds; ss >> mindeposit) != 0 ) - { - if ( e == EVAL_REWARDS && f == 'F' ) - return(f); - } - return(0); -} - -CScript EncodeRewardsOpRet(uint8_t funcid,uint64_t sbits,uint256 fundingtxid) -{ - CScript opret; uint8_t evalcode = EVAL_REWARDS; - opret << OP_RETURN << E_MARSHAL(ss << evalcode << funcid << sbits << fundingtxid); - return(opret); -} - -uint8_t DecodeRewardsOpRet(uint256 txid,const CScript &scriptPubKey,uint64_t &sbits,uint256 &fundingtxid) -{ - std::vector vopret; uint8_t *script,e,f,funcid; uint64_t APR,minseconds,maxseconds,mindeposit; - GetOpReturnData(scriptPubKey, vopret); - if ( vopret.size() > 2 ) - { - script = (uint8_t *)vopret.data(); - if ( script[0] == EVAL_REWARDS ) - { - if ( script[1] == 'F' ) - { - if ( E_UNMARSHAL(vopret,ss >> e; ss >> f; ss >> sbits; ss >> APR; ss >> minseconds; ss >> maxseconds; ss >> mindeposit) != 0 ) - { - fundingtxid = txid; - return('F'); - } else fprintf(stderr,"unmarshal error for F\n"); - } - else if ( E_UNMARSHAL(vopret,ss >> e; ss >> f; ss >> sbits; ss >> fundingtxid) != 0 ) - { - if ( e == EVAL_REWARDS && (f == 'L' || f == 'U' || f == 'A') ) - return(f); - else fprintf(stderr,"mismatched e.%02x f.(%c)\n",e,f); - } - } else fprintf(stderr,"script[0] %02x != EVAL_REWARDS\n",script[0]); - } else fprintf(stderr,"not enough opret.[%d]\n",(int32_t)vopret.size()); - return(0); -} - -int64_t IsRewardsvout(struct CCcontract_info *cp,const CTransaction& tx,int32_t v,uint64_t refsbits,uint256 reffundingtxid) -{ - char destaddr[64]; uint64_t sbits; uint256 fundingtxid,txid; uint8_t funcid; int32_t numvouts; - if ( tx.vout[v].scriptPubKey.IsPayToCryptoCondition() != 0 && (numvouts= (int32_t)tx.vout.size()) > 0 ) - { - txid = tx.GetHash(); - if ( (funcid= DecodeRewardsOpRet(txid,tx.vout[numvouts-1].scriptPubKey,sbits,fundingtxid)) != 0 && sbits == refsbits && (fundingtxid == reffundingtxid || txid == reffundingtxid) ) - { - - if ( Getscriptaddress(destaddr,tx.vout[v].scriptPubKey) > 0 && strcmp(destaddr,cp->unspendableCCaddr) == 0 ) - return(tx.vout[v].nValue); - } - } - return(0); -} - -bool RewardsExactAmounts(struct CCcontract_info *cp,Eval *eval,const CTransaction &tx,uint64_t txfee,uint64_t refsbits,uint256 reffundingtxid) -{ - static uint256 zerohash; - CTransaction vinTx; uint256 hashBlock; int32_t i,numvins,numvouts; int64_t inputs=0,outputs=0,assetoshis; - numvins = tx.vin.size(); - numvouts = tx.vout.size(); - for (i=0; iismyvin)(tx.vin[i].scriptSig) != 0 ) - { - if ( eval->GetTxUnconfirmed(tx.vin[i].prevout.hash,vinTx,hashBlock) == 0 ) - return eval->Invalid("always should find vin, but didnt"); - else - { - if ( hashBlock == zerohash ) - return eval->Invalid("cant rewards from mempool"); - if ( (assetoshis= IsRewardsvout(cp,vinTx,tx.vin[i].prevout.n,refsbits,reffundingtxid)) != 0 ) - inputs += assetoshis; - } - } - } - for (i=0; iInvalid("mismatched inputs != outputs + txfee"); - } - else return(true); -} - -bool RewardsValidate(struct CCcontract_info *cp,Eval* eval,const CTransaction &tx, uint32_t nIn) -{ - uint256 txid,fundingtxid,hashBlock,vinfundingtxid; uint64_t vinsbits,sbits,APR,minseconds,maxseconds,mindeposit,amount,reward,txfee=10000; int32_t numvins,numvouts,preventCCvins,preventCCvouts,i; uint8_t funcid; CScript scriptPubKey; CTransaction fundingTx,vinTx; - int64_t dummy; - numvins = tx.vin.size(); - numvouts = tx.vout.size(); - preventCCvins = preventCCvouts = -1; - if ( numvouts < 1 ) - return eval->Invalid("no vouts"); - else - { - txid = tx.GetHash(); - if ( (funcid= DecodeRewardsOpRet(txid,tx.vout[numvouts-1].scriptPubKey,sbits,fundingtxid)) != 0 ) - { - if ( eval->GetTxUnconfirmed(fundingtxid,fundingTx,hashBlock) == 0 ) - return eval->Invalid("cant find fundingtxid"); - else if ( fundingTx.vout.size() > 0 && DecodeRewardsFundingOpRet(fundingTx.vout[fundingTx.vout.size()-1].scriptPubKey,sbits,APR,minseconds,maxseconds,mindeposit) != 'F' ) - return eval->Invalid("fundingTx not valid"); - if ( APR > REWARDSCC_MAXAPR ) - return eval->Invalid("excessive APR"); - switch ( funcid ) - { - case 'F': - //vins.*: normal inputs - //vout.0: CC vout for funding - //vout.1: normal marker vout for easy searching - //vout.2: normal change - //vout.n-1: opreturn 'F' sbits APR minseconds maxseconds mindeposit - return eval->Invalid("unexpected RewardsValidate for createfunding"); - break; - case 'A': - //vins.*: normal inputs - //vout.0: CC vout for funding - //vout.1: normal change - //vout.n-1: opreturn 'A' sbits fundingtxid - return eval->Invalid("unexpected RewardsValidate for addfunding"); - break; - case 'L': - //vins.*: normal inputs - //vout.0: CC vout for locked funds - //vout.1: normal output to unlock address - //vout.2: change - //vout.n-1: opreturn 'L' sbits fundingtxid - return eval->Invalid("unexpected RewardsValidate for lock"); - break; - case 'U': - //vin.0: locked funds CC vout.0 from lock - //vin.1+: funding CC vout.0 from 'F' and 'A' and 'U' - //vout.0: funding CC change or recover normal payout - //vout.1: normal output to unlock address - //vout.n-1: opreturn 'U' sbits fundingtxid - if ( fundingtxid == tx.vin[0].prevout.hash ) - return eval->Invalid("cant unlock fundingtxid"); - else if ( eval->GetTxUnconfirmed(tx.vin[0].prevout.hash,vinTx,hashBlock) == 0 ) - return eval->Invalid("always should find vin.0, but didnt"); - else if ( DecodeRewardsOpRet(tx.vin[0].prevout.hash,vinTx.vout[vinTx.vout.size()-1].scriptPubKey,vinsbits,vinfundingtxid) != 'L' ) - return eval->Invalid("can only unlock locktxid"); - else if ( fundingtxid != vinfundingtxid ) - return eval->Invalid("mismatched vinfundingtxid"); - for (i=0; iismyvin)(tx.vin[i].scriptSig) == 0 ) - return eval->Invalid("unexpected normal vin for unlock"); - } - if ( !CheckTxFee(tx, txfee, chainActive.LastTip()->GetHeight(), chainActive.LastTip()->nTime, dummy) ) - return eval->Invalid("txfee is too high"); - amount = vinTx.vout[0].nValue; - reward = RewardsCalc((int64_t)amount,tx.vin[0].prevout.hash,(int64_t)APR,(int64_t)minseconds,(int64_t)maxseconds,GetLatestTimestamp(eval->GetCurrentHeight())); - if ( reward == 0 ) - return eval->Invalid("no eligible rewards"); - if ( numvins == 1 && tx.vout[0].scriptPubKey.IsPayToCryptoCondition() == 0 ) - { - if ( tx.vout[1].nValue != 10000 ) - return eval->Invalid("wrong marker vout value"); - else if ( tx.vout[1].scriptPubKey != tx.vout[0].scriptPubKey ) - return eval->Invalid("unlock recover tx vout.1 mismatched scriptPubKey"); - else if ( tx.vout[0].scriptPubKey != vinTx.vout[1].scriptPubKey ) - return eval->Invalid("unlock recover tx vout.0 mismatched scriptPubKey"); - else if ( tx.vout[0].nValue > vinTx.vout[0].nValue ) - return eval->Invalid("unlock recover tx vout.0 mismatched amounts"); - else if ( tx.vout[2].nValue > 0 ) - return eval->Invalid("unlock recover tx vout.1 nonz amount"); - else return(true); - } - if ( vinTx.vout[0].scriptPubKey.IsPayToCryptoCondition() == 0 ) - return eval->Invalid("unlock tx vout.0 is normal output"); - else if ( numvouts != 3 ) - return eval->Invalid("unlock tx wrong number of vouts"); - else if ( tx.vout[0].scriptPubKey.IsPayToCryptoCondition() == 0 ) - return eval->Invalid("unlock tx vout.0 is normal output"); - else if ( tx.vout[1].scriptPubKey.IsPayToCryptoCondition() != 0 ) - return eval->Invalid("unlock tx vout.1 is CC output"); - else if ( tx.vout[1].scriptPubKey != vinTx.vout[1].scriptPubKey ) - return eval->Invalid("unlock tx vout.1 mismatched scriptPubKey"); - if ( RewardsExactAmounts(cp,eval,tx,txfee+tx.vout[1].nValue,sbits,fundingtxid) == 0 ) - return false; - else if ( tx.vout[1].nValue > amount+reward ) - return eval->Invalid("unlock tx vout.1 isnt amount+reward"); - else if ( tx.vout[2].nValue > 0 ) - return eval->Invalid("unlock tx vout.2 isnt 0"); - preventCCvouts = 1; - break; - default: - fprintf(stderr,"illegal rewards funcid.(%c)\n",funcid); - return eval->Invalid("unexpected rewards funcid"); - break; - } - } else return eval->Invalid("unexpected rewards missing funcid"); - return(PreventCC(eval,tx,preventCCvins,numvins,preventCCvouts,numvouts)); - } - return(true); -} - -static uint64_t myIs_unlockedtx_inmempool(uint256 &txid,int32_t &vout,uint64_t refsbits,uint256 reffundingtxid,uint64_t needed) -{ - uint8_t funcid; uint64_t sbits,nValue; uint256 fundingtxid; char str[65]; - memset(&txid,0,sizeof(txid)); - vout = -1; - nValue = 0; - BOOST_FOREACH(const CTxMemPoolEntry &e,mempool.mapTx) - { - const CTransaction &tx = e.GetTx(); - if ( tx.vout.size() > 0 && tx.vout[0].nValue >= needed ) - { - const uint256 &hash = tx.GetHash(); - if ( tx.vout[0].scriptPubKey.IsPayToCryptoCondition() != 0 && myIsutxo_spentinmempool(ignoretxid,ignorevin,hash,0) == 0 ) - { - if ( (funcid= DecodeRewardsOpRet(hash,tx.vout[tx.vout.size()-1].scriptPubKey,sbits,fundingtxid)) == 'U' && sbits == refsbits && fundingtxid == reffundingtxid ) - { - txid = hash; - vout = 0; - nValue = tx.vout[0].nValue; - fprintf(stderr,"found 'U' %s %.8f in unspent in mempool\n",uint256_str(str,txid),(double)nValue/COIN); - return(nValue); - } - } - } - } - return(nValue); -} - -// 'L' vs 'F' and 'A' -int64_t AddRewardsInputs(CScript &scriptPubKey,uint64_t maxseconds,struct CCcontract_info *cp,CMutableTransaction &mtx,CPubKey pk,int64_t total,int32_t maxinputs,uint64_t refsbits,uint256 reffundingtxid) -{ - char coinaddr[64],str[65]; uint64_t threshold,sbits,nValue,totalinputs = 0; uint256 txid,hashBlock,fundingtxid; CTransaction tx; int32_t numblocks,j,vout,n = 0; uint8_t funcid; - std::vector > unspentOutputs; - GetCCaddress(cp,coinaddr,pk); - SetCCunspents(unspentOutputs,coinaddr,true); - if ( maxinputs > CC_MAXVINS ) - maxinputs = CC_MAXVINS; - if ( maxinputs > 0 ) - threshold = total/maxinputs; - else threshold = total; - for (std::vector >::const_iterator it=unspentOutputs.begin(); it!=unspentOutputs.end(); it++) - { - txid = it->first.txhash; - vout = (int32_t)it->first.index; - if ( it->second.satoshis < threshold ) - continue; - //fprintf(stderr,"(%s) %s/v%d %.8f\n",coinaddr,uint256_str(str,txid),vout,(double)it->second.satoshis/COIN); - for (j=0; j 0 && tx.vout[vout].scriptPubKey.IsPayToCryptoCondition() != 0 && myIsutxo_spentinmempool(ignoretxid,ignorevin,txid,vout) == 0 ) - { - if ( (funcid= DecodeRewardsOpRet(txid,tx.vout[tx.vout.size()-1].scriptPubKey,sbits,fundingtxid)) != 0 ) - { - if ( sbits != refsbits || fundingtxid != reffundingtxid ) - continue; - if ( maxseconds == 0 && funcid != 'F' && funcid != 'A' && funcid != 'U' ) - continue; - else if ( maxseconds != 0 && funcid != 'L' ) - { - if ( CCduration(numblocks,txid) < maxseconds ) - continue; - } - fprintf(stderr,"maxseconds.%d (%c) %.8f %.8f\n",(int32_t)maxseconds,funcid,(double)tx.vout[vout].nValue/COIN,(double)it->second.satoshis/COIN); - if ( total != 0 && maxinputs != 0 ) - { - if ( maxseconds != 0 ) - scriptPubKey = tx.vout[1].scriptPubKey; - mtx.vin.push_back(CTxIn(txid,vout,CScript())); - } - totalinputs += it->second.satoshis; - n++; - if ( (total > 0 && totalinputs >= total) || (maxinputs > 0 && n >= maxinputs) ) - break; - } else fprintf(stderr,"null funcid\n"); - } - } - if ( maxseconds == 0 && totalinputs < total && (maxinputs == 0 || n < maxinputs-1) ) - { - fprintf(stderr,"search mempool for unlocked and unspent CC rewards output for %.8f\n",(double)(total-totalinputs)/COIN); - if ( (nValue= myIs_unlockedtx_inmempool(txid,vout,refsbits,reffundingtxid,total-totalinputs)) > 0 ) - { - mtx.vin.push_back(CTxIn(txid,vout,CScript())); - fprintf(stderr,"added mempool vout for %.8f\n",(double)nValue/COIN); - totalinputs += nValue; - n++; - } - } - return(totalinputs); -} - -int64_t RewardsPlanFunds(uint64_t &lockedfunds,uint64_t refsbits,struct CCcontract_info *cp,CPubKey pk,uint256 reffundingtxid) -{ - char coinaddr[64]; uint64_t sbits; int64_t nValue,totalinputs = 0; uint256 txid,hashBlock,fundingtxid; CTransaction tx; int32_t vout; uint8_t funcid; - std::vector > unspentOutputs; - lockedfunds = 0; - GetCCaddress(cp,coinaddr,pk); - SetCCunspents(unspentOutputs,coinaddr,true); - for (std::vector >::const_iterator it=unspentOutputs.begin(); it!=unspentOutputs.end(); it++) - { - txid = it->first.txhash; - vout = (int32_t)it->first.index; - if ( myGetTransaction(txid,tx,hashBlock) != 0 && tx.vout[vout].scriptPubKey.IsPayToCryptoCondition() != 0 ) - { - if ( (funcid= DecodeRewardsOpRet(txid,tx.vout[tx.vout.size()-1].scriptPubKey,sbits,fundingtxid)) == 'F' || funcid == 'A' || funcid == 'U' || funcid == 'L' ) - { - if ( refsbits == sbits && (funcid == 'F' && reffundingtxid == txid) || reffundingtxid == fundingtxid ) - { - if ( (nValue= IsRewardsvout(cp,tx,vout,sbits,fundingtxid)) > 0 ) - { - if ( funcid == 'L' ) - lockedfunds += nValue; - else totalinputs += nValue; - } - else fprintf(stderr,"refsbits.%llx sbits.%llx nValue %.8f\n",(long long)refsbits,(long long)sbits,(double)nValue/COIN); - } //else fprintf(stderr,"else case\n"); - } else fprintf(stderr,"funcid.%d %c skipped %.8f\n",funcid,funcid,(double)tx.vout[vout].nValue/COIN); - } - } - return(totalinputs); -} - -bool RewardsPlanExists(struct CCcontract_info *cp,uint64_t refsbits,CPubKey rewardspk,uint64_t &APR,uint64_t &minseconds,uint64_t &maxseconds,uint64_t &mindeposit) -{ - char CCaddr[64]; uint64_t sbits; uint256 txid,hashBlock; CTransaction tx; - std::vector txids; - GetCCaddress(cp,CCaddr,rewardspk); - SetCCtxids(txids,CCaddr,true,cp->evalcode,zeroid,'F'); - for (std::vector::const_iterator it=txids.begin(); it!=txids.end(); it++) - { - //int height = it->first.blockHeight; - txid = *it; - if ( myGetTransaction(txid,tx,hashBlock) != 0 && tx.vout.size() > 0 && ConstrainVout(tx.vout[0],1,CCaddr,0) != 0 ) - { - //char str[65]; fprintf(stderr,"rewards plan %s\n",uint256_str(str,txid)); - if ( DecodeRewardsFundingOpRet(tx.vout[tx.vout.size()-1].scriptPubKey,sbits,APR,minseconds,maxseconds,mindeposit) == 'F' ) - { - if ( sbits == refsbits ) - return(true); - } - } - } - return(false); -} - -UniValue RewardsInfo(uint256 rewardsid) -{ - UniValue result(UniValue::VOBJ); uint256 hashBlock; CTransaction vintx; uint64_t lockedfunds,APR,minseconds,maxseconds,mindeposit,sbits,funding; CPubKey rewardspk; struct CCcontract_info *cp,C; char str[67],numstr[65]; - if ( myGetTransaction(rewardsid,vintx,hashBlock) == 0 ) - { - fprintf(stderr,"cant find fundingtxid\n"); - result.push_back(Pair("result","error")); - result.push_back(Pair("error","cant find fundingtxid")); - return(result); - } - if ( vintx.vout.size() > 0 && DecodeRewardsFundingOpRet(vintx.vout[vintx.vout.size()-1].scriptPubKey,sbits,APR,minseconds,maxseconds,mindeposit) == 0 ) - { - fprintf(stderr,"fundingtxid isnt rewards creation txid\n"); - result.push_back(Pair("result","error")); - result.push_back(Pair("error","fundingtxid isnt rewards creation txid")); - return(result); - } - result.push_back(Pair("result","success")); - result.push_back(Pair("fundingtxid",uint256_str(str,rewardsid))); - unstringbits(str,sbits); - result.push_back(Pair("name",str)); - result.push_back(Pair("sbits",sbits)); - sprintf(numstr,"%.8f",(double)APR/COIN); - result.push_back(Pair("APR",numstr)); - result.push_back(Pair("minseconds",minseconds)); - result.push_back(Pair("maxseconds",maxseconds)); - sprintf(numstr,"%.8f",(double)mindeposit/COIN); - result.push_back(Pair("mindeposit",numstr)); - cp = CCinit(&C,EVAL_REWARDS); - rewardspk = GetUnspendable(cp,0); - funding = RewardsPlanFunds(lockedfunds,sbits,cp,rewardspk,rewardsid); - sprintf(numstr,"%.8f",(double)funding/COIN); - result.push_back(Pair("funding",numstr)); - sprintf(numstr,"%.8f",(double)lockedfunds/COIN); - result.push_back(Pair("locked",numstr)); - return(result); -} - -UniValue RewardsList() -{ - UniValue result(UniValue::VARR); std::vector txids; struct CCcontract_info *cp,C; uint256 txid,hashBlock; CTransaction vintx; uint64_t sbits,APR,minseconds,maxseconds,mindeposit; char str[65]; - cp = CCinit(&C,EVAL_REWARDS); - SetCCtxids(txids,cp->normaladdr,false,cp->evalcode,zeroid,'F'); - for (std::vector::const_iterator it=txids.begin(); it!=txids.end(); it++) - { - txid = *it; - if ( myGetTransaction(txid,vintx,hashBlock) != 0 ) - { - if ( vintx.vout.size() > 0 && DecodeRewardsFundingOpRet(vintx.vout[vintx.vout.size()-1].scriptPubKey,sbits,APR,minseconds,maxseconds,mindeposit) != 0 ) - { - result.push_back(uint256_str(str,txid)); - } - } - } - return(result); -} - -std::string RewardsCreateFunding(uint64_t txfee,char *planstr,int64_t funds,int64_t APR,int64_t minseconds,int64_t maxseconds,int64_t mindeposit) -{ - CMutableTransaction mtx = CreateNewContextualCMutableTransaction(Params().GetConsensus(), hush_nextheight()); - CPubKey mypk,rewardspk; CScript opret; uint64_t sbits,a,b,c,d; struct CCcontract_info *cp,C; - if ( funds < COIN || mindeposit < 0 || minseconds < 0 || maxseconds < 0 ) - { - fprintf(stderr,"negative parameter error\n"); - return(""); - } - if ( APR > REWARDSCC_MAXAPR ) - { - fprintf(stderr,"25%% APR is maximum\n"); - return(""); - } - cp = CCinit(&C,EVAL_REWARDS); - if ( txfee == 0 ) - txfee = 10000; - mypk = pubkey2pk(Mypubkey()); - rewardspk = GetUnspendable(cp,0); - sbits = stringbits(planstr); - if ( RewardsPlanExists(cp,sbits,rewardspk,a,b,c,d) != 0 ) - { - fprintf(stderr,"Rewards plan (%s) already exists\n",planstr); - return(""); - } - if ( AddNormalinputs(mtx,mypk,funds+2*txfee,64) > 0 ) - { - mtx.vout.push_back(MakeCC1vout(cp->evalcode,funds,rewardspk)); - mtx.vout.push_back(CTxOut(txfee,CScript() << ParseHex(HexStr(rewardspk)) << OP_CHECKSIG)); - return(FinalizeCCTx(0,cp,mtx,mypk,txfee,EncodeRewardsFundingOpRet('F',sbits,APR,minseconds,maxseconds,mindeposit))); - } - fprintf(stderr,"cant find enough inputs\n"); - return(""); -} - -std::string RewardsAddfunding(uint64_t txfee,char *planstr,uint256 fundingtxid,int64_t amount) -{ - CMutableTransaction mtx = CreateNewContextualCMutableTransaction(Params().GetConsensus(), hush_nextheight()); - CPubKey mypk,rewardspk; CScript opret; uint64_t sbits,a,b,c,d; struct CCcontract_info *cp,C; - if ( amount < 0 ) - { - fprintf(stderr,"negative parameter error\n"); - return(""); - } - cp = CCinit(&C,EVAL_REWARDS); - if ( txfee == 0 ) - txfee = 10000; - mypk = pubkey2pk(Mypubkey()); - rewardspk = GetUnspendable(cp,0); - sbits = stringbits(planstr); - if ( RewardsPlanExists(cp,sbits,rewardspk,a,b,c,d) == 0 ) - { - CCerror = strprintf("Rewards plan %s doesnt exist\n",planstr); - fprintf(stderr,"%s\n",CCerror.c_str()); - return(""); - } - sbits = stringbits(planstr); - if ( AddNormalinputs(mtx,mypk,amount+txfee,64) > 0 ) - { - mtx.vout.push_back(MakeCC1vout(cp->evalcode,amount,rewardspk)); - return(FinalizeCCTx(0,cp,mtx,mypk,txfee,EncodeRewardsOpRet('A',sbits,fundingtxid))); - } else { - CCerror = "cant find enough inputs"; - fprintf(stderr,"%s\n", CCerror.c_str()); - } - CCerror = "cant find fundingtxid"; - fprintf(stderr,"%s\n", CCerror.c_str()); - return(""); -} - -std::string RewardsLock(uint64_t txfee,char *planstr,uint256 fundingtxid,int64_t deposit) -{ - CMutableTransaction mtx = CreateNewContextualCMutableTransaction(Params().GetConsensus(), hush_nextheight()); - CPubKey mypk,rewardspk; CScript opret; uint64_t lockedfunds,sbits,funding,APR,minseconds,maxseconds,mindeposit; struct CCcontract_info *cp,C; - if ( deposit < txfee ) - { - CCerror = "deposit amount less than txfee"; - fprintf(stderr,"%s\n",CCerror.c_str()); - return(""); - } - cp = CCinit(&C,EVAL_REWARDS); - if ( txfee == 0 ) - txfee = 10000; - mypk = pubkey2pk(Mypubkey()); - rewardspk = GetUnspendable(cp,0); - sbits = stringbits(planstr); - if ( RewardsPlanExists(cp,sbits,rewardspk,APR,minseconds,maxseconds,mindeposit) == 0 ) - { - CCerror = strprintf("Rewards plan %s doesnt exist\n",planstr); - fprintf(stderr,"%s\n",CCerror.c_str()); - return(""); - } - if ( deposit < mindeposit ) - { - CCerror = strprintf("Rewards plan %s deposit %.8f < mindeposit %.8f\n",planstr,(double)deposit/COIN,(double)mindeposit/COIN); - fprintf(stderr,"%s\n",CCerror.c_str()); - return(""); - } - if ( (funding= RewardsPlanFunds(lockedfunds,sbits,cp,rewardspk,fundingtxid)) >= deposit ) // arbitrary cmpval - { - if ( AddNormalinputs(mtx,mypk,deposit+2*txfee,64) > 0 ) - { - mtx.vout.push_back(MakeCC1vout(cp->evalcode,deposit,rewardspk)); - mtx.vout.push_back(CTxOut(txfee,CScript() << ParseHex(HexStr(mypk)) << OP_CHECKSIG)); - return(FinalizeCCTx(0,cp,mtx,mypk,txfee,EncodeRewardsOpRet('L',sbits,fundingtxid))); - } else { - CCerror = strprintf("cant find enough inputs %.8f not enough for %.8f, make sure you imported privkey for the -pubkey address\n",(double)funding/COIN,(double)deposit/COIN); - fprintf(stderr,"%s\n",CCerror.c_str()); - } - } - fprintf(stderr,"cant find rewards inputs funding %.8f locked %.8f vs deposit %.8f\n",(double)funding/COIN,(double)lockedfunds/COIN,(double)deposit/COIN); - return(""); -} - -std::string RewardsUnlock(uint64_t txfee,char *planstr,uint256 fundingtxid,uint256 locktxid) -{ - CMutableTransaction firstmtx,mtx = CreateNewContextualCMutableTransaction(Params().GetConsensus(), hush_nextheight()); - CTransaction tx; char coinaddr[64]; CPubKey mypk,rewardspk; CScript scriptPubKey,ignore; uint256 hashBlock; uint64_t sbits,APR,minseconds,maxseconds,mindeposit; int64_t funding,reward=0,amount=0,inputs,CCchange=0; struct CCcontract_info *cp,C; - cp = CCinit(&C,EVAL_REWARDS); - if ( txfee == 0 ) - txfee = 10000; - rewardspk = GetUnspendable(cp,0); - mypk = pubkey2pk(Mypubkey()); - sbits = stringbits(planstr); - if ( locktxid == fundingtxid ) - { - fprintf(stderr,"Rewards plan cant unlock fundingtxid\n"); - CCerror = "Rewards plan cant unlock fundingtxid"; - return(""); - } - if ( RewardsPlanExists(cp,sbits,rewardspk,APR,minseconds,maxseconds,mindeposit) == 0 ) - { - fprintf(stderr,"Rewards plan %s doesnt exist\n",planstr); - CCerror = "Rewards plan does not exist"; - return(""); - } - fprintf(stderr,"APR %.8f minseconds.%llu maxseconds.%llu mindeposit %.8f\n",(double)APR/COIN,(long long)minseconds,(long long)maxseconds,(double)mindeposit/COIN); - if ( locktxid == zeroid ) - amount = AddRewardsInputs(scriptPubKey,maxseconds,cp,mtx,rewardspk,(1LL << 30),1,sbits,fundingtxid); - else - { - GetCCaddress(cp,coinaddr,rewardspk); - if ( (amount= CCutxovalue(coinaddr,locktxid,0,1)) == 0 ) - { - fprintf(stderr,"%s locktxid/v0 is spent\n",coinaddr); - CCerror = "locktxid/v0 is spent"; - return(""); - } - if ( myGetTransaction(locktxid,tx,hashBlock) != 0 && tx.vout.size() > 0 && tx.vout[1].scriptPubKey.IsPayToCryptoCondition() == 0 ) - { - scriptPubKey = tx.vout[1].scriptPubKey; - mtx.vin.push_back(CTxIn(locktxid,0,CScript())); - } - else - { - fprintf(stderr,"%s no normal vout.1 in locktxid\n",coinaddr); - CCerror = "no normal vout.1 in locktxid"; - return(""); - } - } - if ( amount > txfee ) - { - reward = RewardsCalc((int64_t)amount,mtx.vin[0].prevout.hash,(int64_t)APR,(int64_t)minseconds,(int64_t)maxseconds,hush_chainactive_timestamp()); - if ( scriptPubKey.size() > 0 ) - { - if ( reward > txfee ) - { - firstmtx = mtx; - if ( (inputs= AddRewardsInputs(ignore,0,cp,mtx,rewardspk,reward+txfee,30,sbits,fundingtxid)) >= reward+txfee ) - { - if ( inputs >= (reward + 2*txfee) ) - CCchange = (inputs - (reward + txfee)); - fprintf(stderr,"inputs %.8f CCchange %.8f amount %.8f reward %.8f\n",(double)inputs/COIN,(double)CCchange/COIN,(double)amount/COIN,(double)reward/COIN); - mtx.vout.push_back(MakeCC1vout(cp->evalcode,CCchange,rewardspk)); - mtx.vout.push_back(CTxOut(amount+reward,scriptPubKey)); - return(FinalizeCCTx(-1LL,cp,mtx,mypk,txfee,EncodeRewardsOpRet('U',sbits,fundingtxid))); - } - else - { - firstmtx.vout.push_back(CTxOut(amount-txfee*2,scriptPubKey)); - fprintf(stderr,"not enough rewards funds to payout %.8f, recover mode tx\n",(double)(reward+txfee)/COIN); - return(FinalizeCCTx(-1LL,cp,firstmtx,mypk,txfee,EncodeRewardsOpRet('U',sbits,fundingtxid))); - } - } - else - { - CCerror = strprintf("reward %.8f is <= the transaction fee", reward); - fprintf(stderr,"%s\n", CCerror.c_str()); - } - } - else - { - CCerror = "invalid scriptPubKey"; - fprintf(stderr,"%s\n", CCerror.c_str()); - } - } - else - { - CCerror = "amount must be more than txfee"; - fprintf(stderr,"%s\n", CCerror.c_str()); - } - fprintf(stderr,"amount %.8f -> reward %.8f\n",(double)amount/COIN,(double)reward/COIN); - return(""); -} diff --git a/src/rpc/server.cpp b/src/rpc/server.cpp index 1fd035660..bde315159 100644 --- a/src/rpc/server.cpp +++ b/src/rpc/server.cpp @@ -410,15 +410,6 @@ static const CRPCCommand vRPCCommands[] = { "nSPV", "nspv_logout", &nspv_logout, true }, { "nSPV", "nspv_listccmoduleunspent", &nspv_listccmoduleunspent, true }, - // rewards - { "rewards", "rewardslist", &rewardslist, true }, - { "rewards", "rewardsinfo", &rewardsinfo, true }, - { "rewards", "rewardscreatefunding", &rewardscreatefunding, true }, - { "rewards", "rewardsaddfunding", &rewardsaddfunding, true }, - { "rewards", "rewardslock", &rewardslock, true }, - { "rewards", "rewardsunlock", &rewardsunlock, true }, - { "rewards", "rewardsaddress", &rewardsaddress, true }, - // faucet { "faucet", "faucetinfo", &faucetinfo, true }, { "faucet", "faucetfund", &faucetfund, true }, @@ -448,18 +439,6 @@ static const CRPCCommand vRPCCommands[] = { "oracles", "oraclessample", &oraclessample, true }, { "oracles", "oraclessamples", &oraclessamples, true }, - // Payments - { "payments", "paymentsaddress", &paymentsaddress, true }, - { "payments", "paymentstxidopret", &payments_txidopret, true }, - { "payments", "paymentscreate", &payments_create, true }, - { "payments", "paymentsairdrop", &payments_airdrop, true }, - { "payments", "paymentsairdroptokens", &payments_airdroptokens, true }, - { "payments", "paymentslist", &payments_list, true }, - { "payments", "paymentsinfo", &payments_info, true }, - { "payments", "paymentsfund", &payments_fund, true }, - { "payments", "paymentsmerge", &payments_merge, true }, - { "payments", "paymentsrelease", &payments_release, true }, - { "CClib", "cclibaddress", &cclibaddress, true }, { "CClib", "cclibinfo", &cclibinfo, true }, { "CClib", "cclib", &cclib, true }, diff --git a/src/rpc/server.h b/src/rpc/server.h index d805fab63..fc83515c1 100644 --- a/src/rpc/server.h +++ b/src/rpc/server.h @@ -270,16 +270,6 @@ extern UniValue oraclessubscribe(const UniValue& params, bool fHelp, const CPubK extern UniValue oraclesdata(const UniValue& params, bool fHelp, const CPubKey& mypk); extern UniValue oraclessample(const UniValue& params, bool fHelp, const CPubKey& mypk); extern UniValue oraclessamples(const UniValue& params, bool fHelp, const CPubKey& mypk); -extern UniValue paymentsaddress(const UniValue& params, bool fHelp, const CPubKey& mypk); -extern UniValue payments_release(const UniValue& params, bool fHelp, const CPubKey& mypk); -extern UniValue payments_fund(const UniValue& params, bool fHelp, const CPubKey& mypk); -extern UniValue payments_merge(const UniValue& params, bool fHelp, const CPubKey& mypk); -extern UniValue payments_txidopret(const UniValue& params, bool fHelp, const CPubKey& mypk); -extern UniValue payments_create(const UniValue& params, bool fHelp, const CPubKey& mypk); -extern UniValue payments_airdrop(const UniValue& params, bool fHelp, const CPubKey& mypk); -extern UniValue payments_airdroptokens(const UniValue& params, bool fHelp, const CPubKey& mypk); -extern UniValue payments_info(const UniValue& params, bool fHelp, const CPubKey& mypk); -extern UniValue payments_list(const UniValue& params, bool fHelp, const CPubKey& mypk); extern UniValue cclibaddress(const UniValue& params, bool fHelp, const CPubKey& mypk); extern UniValue cclibinfo(const UniValue& params, bool fHelp, const CPubKey& mypk); @@ -296,13 +286,6 @@ extern UniValue faucetfund(const UniValue& params, bool fHelp, const CPubKey& my extern UniValue faucetget(const UniValue& params, bool fHelp, const CPubKey& mypk); extern UniValue faucetaddress(const UniValue& params, bool fHelp, const CPubKey& mypk); extern UniValue faucetinfo(const UniValue& params, bool fHelp, const CPubKey& mypk); -extern UniValue rewardsinfo(const UniValue& params, bool fHelp, const CPubKey& mypk); -extern UniValue rewardslist(const UniValue& params, bool fHelp, const CPubKey& mypk); -extern UniValue rewardsaddress(const UniValue& params, bool fHelp, const CPubKey& mypk); -extern UniValue rewardscreatefunding(const UniValue& params, bool fHelp, const CPubKey& mypk); -extern UniValue rewardsaddfunding(const UniValue& params, bool fHelp, const CPubKey& mypk); -extern UniValue rewardslock(const UniValue& params, bool fHelp, const CPubKey& mypk); -extern UniValue rewardsunlock(const UniValue& params, bool fHelp, const CPubKey& mypk); extern UniValue FSMaddress(const UniValue& params, bool fHelp, const CPubKey& mypk); extern UniValue FSMcreate(const UniValue& params, bool fHelp, const CPubKey& mypk); extern UniValue FSMlist(const UniValue& params, bool fHelp, const CPubKey& mypk); diff --git a/src/wallet/rpcwallet.cpp b/src/wallet/rpcwallet.cpp index d725fa7b7..9f0c6beb2 100644 --- a/src/wallet/rpcwallet.cpp +++ b/src/wallet/rpcwallet.cpp @@ -6091,13 +6091,11 @@ int32_t hush_notaryvin(CMutableTransaction &txNew,uint8_t *notarypub33, void *pT #include "../cc/CCfaucet.h" #include "../cc/CCassets.h" -#include "../cc/CCrewards.h" #include "../cc/CCfsm.h" #include "../cc/CCauction.h" #include "../cc/CCOracles.h" #include "../cc/CCPrices.h" #include "../cc/CCHeir.h" -#include "../cc/CCPayments.h" int32_t ensure_CCrequirements(uint8_t evalcode) { CCerror = ""; @@ -6326,123 +6324,6 @@ UniValue cclib(const UniValue& params, bool fHelp, const CPubKey& mypk) return(CClib(cp,method,jsonstr)); } -UniValue payments_release(const UniValue& params, bool fHelp, const CPubKey& mypk) -{ - struct CCcontract_info *cp,C; - if ( fHelp || params.size() != 1 ) - throw runtime_error("paymentsrelease \"[%22createtxid%22,amount,(skipminimum)]\"\n"); - if ( ensure_CCrequirements(EVAL_PAYMENTS) < 0 ) - throw runtime_error(CC_REQUIREMENTS_MSG); - const CKeyStore& keystore = *pwalletMain; - LOCK2(cs_main, pwalletMain->cs_wallet); - cp = CCinit(&C,EVAL_PAYMENTS); - return(PaymentsRelease(cp,(char *)params[0].get_str().c_str())); -} - -UniValue payments_fund(const UniValue& params, bool fHelp, const CPubKey& mypk) -{ - struct CCcontract_info *cp,C; - if ( fHelp || params.size() != 1 ) - throw runtime_error("paymentsfund \"[%22createtxid%22,amount(,useopret)]\"\n"); - if ( ensure_CCrequirements(EVAL_PAYMENTS) < 0 ) - throw runtime_error(CC_REQUIREMENTS_MSG); - const CKeyStore& keystore = *pwalletMain; - LOCK2(cs_main, pwalletMain->cs_wallet); - cp = CCinit(&C,EVAL_PAYMENTS); - return(PaymentsFund(cp,(char *)params[0].get_str().c_str())); -} - -UniValue payments_merge(const UniValue& params, bool fHelp, const CPubKey& mypk) -{ - struct CCcontract_info *cp,C; - if ( fHelp || params.size() != 1 ) - throw runtime_error("paymentsmerge \"[%22createtxid%22]\"\n"); - if ( ensure_CCrequirements(EVAL_PAYMENTS) < 0 ) - throw runtime_error(CC_REQUIREMENTS_MSG); - const CKeyStore& keystore = *pwalletMain; - LOCK2(cs_main, pwalletMain->cs_wallet); - cp = CCinit(&C,EVAL_PAYMENTS); - return(PaymentsMerge(cp,(char *)params[0].get_str().c_str())); -} - -UniValue payments_txidopret(const UniValue& params, bool fHelp, const CPubKey& mypk) -{ - struct CCcontract_info *cp,C; - if ( fHelp || params.size() != 1 ) - throw runtime_error("paymentstxidopret \"[allocation,%22scriptPubKey%22(,%22destopret%22)]\"\n"); - if ( ensure_CCrequirements(EVAL_PAYMENTS) < 0 ) - throw runtime_error(CC_REQUIREMENTS_MSG); - const CKeyStore& keystore = *pwalletMain; - LOCK2(cs_main, pwalletMain->cs_wallet); - cp = CCinit(&C,EVAL_PAYMENTS); - return(PaymentsTxidopret(cp,(char *)params[0].get_str().c_str())); -} - -UniValue payments_create(const UniValue& params, bool fHelp, const CPubKey& mypk) -{ - struct CCcontract_info *cp,C; - if ( fHelp || params.size() != 1 ) - throw runtime_error("paymentscreate \"[lockedblocks,minamount,%22paytxid0%22,...,%22paytxidN%22]\"\n"); - if ( ensure_CCrequirements(EVAL_PAYMENTS) < 0 ) - throw runtime_error(CC_REQUIREMENTS_MSG); - const CKeyStore& keystore = *pwalletMain; - LOCK2(cs_main, pwalletMain->cs_wallet); - cp = CCinit(&C,EVAL_PAYMENTS); - return(PaymentsCreate(cp,(char *)params[0].get_str().c_str())); -} - -UniValue payments_airdrop(const UniValue& params, bool fHelp, const CPubKey& mypk) -{ - struct CCcontract_info *cp,C; - if ( fHelp || params.size() != 1 ) - throw runtime_error("paymentsairdrop \"[lockedblocks,minamount,mintoaddress,top,bottom,fixedFlag,%22excludeAddress%22,...,%22excludeAddressN%22]\"\n"); - if ( ensure_CCrequirements(EVAL_PAYMENTS) < 0 ) - throw runtime_error(CC_REQUIREMENTS_MSG); - const CKeyStore& keystore = *pwalletMain; - LOCK2(cs_main, pwalletMain->cs_wallet); - cp = CCinit(&C,EVAL_PAYMENTS); - return(PaymentsAirdrop(cp,(char *)params[0].get_str().c_str())); -} - -UniValue payments_airdroptokens(const UniValue& params, bool fHelp, const CPubKey& mypk) -{ - struct CCcontract_info *cp,C; - if ( fHelp || params.size() != 1 ) - throw runtime_error("payments_airdroptokens \"[%22tokenid%22,lockedblocks,minamount,mintoaddress,top,bottom,fixedFlag,%22excludePubKey%22,...,%22excludePubKeyN%22]\"\n"); - if ( ensure_CCrequirements(EVAL_PAYMENTS) < 0 ) - throw runtime_error(CC_REQUIREMENTS_MSG); - const CKeyStore& keystore = *pwalletMain; - LOCK2(cs_main, pwalletMain->cs_wallet); - cp = CCinit(&C,EVAL_PAYMENTS); - return(PaymentsAirdropTokens(cp,(char *)params[0].get_str().c_str())); -} - -UniValue payments_info(const UniValue& params, bool fHelp, const CPubKey& mypk) -{ - struct CCcontract_info *cp,C; - if ( fHelp || params.size() != 1 ) - throw runtime_error("paymentsinfo \"[%22createtxid%22]\"\n"); - if ( ensure_CCrequirements(EVAL_PAYMENTS) < 0 ) - throw runtime_error(CC_REQUIREMENTS_MSG); - const CKeyStore& keystore = *pwalletMain; - LOCK2(cs_main, pwalletMain->cs_wallet); - cp = CCinit(&C,EVAL_PAYMENTS); - return(PaymentsInfo(cp,(char *)params[0].get_str().c_str())); -} - -UniValue payments_list(const UniValue& params, bool fHelp, const CPubKey& mypk) -{ - struct CCcontract_info *cp,C; - if ( fHelp || params.size() != 0 ) - throw runtime_error("paymentslist\n"); - if ( ensure_CCrequirements(EVAL_PAYMENTS) < 0 ) - throw runtime_error(CC_REQUIREMENTS_MSG); - const CKeyStore& keystore = *pwalletMain; - LOCK2(cs_main, pwalletMain->cs_wallet); - cp = CCinit(&C,EVAL_PAYMENTS); - return(PaymentsList(cp,(char *)"")); -} - UniValue oraclesaddress(const UniValue& params, bool fHelp, const CPubKey& mypk) { struct CCcontract_info *cp,C; std::vector pubkey; @@ -6456,19 +6337,6 @@ UniValue oraclesaddress(const UniValue& params, bool fHelp, const CPubKey& mypk) return(CCaddress(cp,(char *)"Oracles",pubkey)); } -UniValue paymentsaddress(const UniValue& params, bool fHelp, const CPubKey& mypk) -{ - struct CCcontract_info *cp,C; std::vector pubkey; - cp = CCinit(&C,EVAL_PAYMENTS); - if ( fHelp || params.size() > 1 ) - throw runtime_error("paymentsaddress [pubkey]\n"); - if ( ensure_CCrequirements(cp->evalcode) < 0 ) - throw runtime_error(CC_REQUIREMENTS_MSG); - if ( params.size() == 1 ) - pubkey = ParseHex(params[0].get_str().c_str()); - return(CCaddress(cp,(char *)"Payments",pubkey)); -} - UniValue heiraddress(const UniValue& params, bool fHelp, const CPubKey& mypk) { struct CCcontract_info *cp,C; std::vector pubkey; @@ -6522,19 +6390,6 @@ UniValue faucetaddress(const UniValue& params, bool fHelp, const CPubKey& mypk) return(CCaddress(cp,(char *)"Faucet",pubkey)); } -UniValue rewardsaddress(const UniValue& params, bool fHelp, const CPubKey& mypk) -{ - struct CCcontract_info *cp,C; std::vector pubkey; - cp = CCinit(&C,EVAL_REWARDS); - if ( fHelp || params.size() > 1 ) - throw runtime_error("rewardsaddress [pubkey]\n"); - if ( ensure_CCrequirements(cp->evalcode) < 0 ) - throw runtime_error(CC_REQUIREMENTS_MSG); - if ( params.size() == 1 ) - pubkey = ParseHex(params[0].get_str().c_str()); - return(CCaddress(cp,(char *)"Rewards",pubkey)); -} - UniValue assetsaddress(const UniValue& params, bool fHelp, const CPubKey& mypk) { struct CCcontract_info *cp, C; std::vector pubkey; @@ -6561,195 +6416,6 @@ UniValue tokenaddress(const UniValue& params, bool fHelp, const CPubKey& mypk) return(CCaddress(cp,(char *)"Tokens", pubkey)); } -UniValue rewardscreatefunding(const UniValue& params, bool fHelp, const CPubKey& mypk) -{ - UniValue result(UniValue::VOBJ); char *name; int64_t funds,APR,minseconds,maxseconds,mindeposit; std::string hex; - if ( fHelp || params.size() > 6 || params.size() < 2 ) - throw runtime_error("rewardscreatefunding name amount APR mindays maxdays mindeposit\n"); - if ( ensure_CCrequirements(EVAL_REWARDS) < 0 ) - throw runtime_error(CC_REQUIREMENTS_MSG); - const CKeyStore& keystore = *pwalletMain; - LOCK2(cs_main, pwalletMain->cs_wallet); - // default to OOT params - APR = 5 * COIN; - minseconds = maxseconds = 60 * 3600 * 24; - mindeposit = 100 * COIN; - name = (char *)params[0].get_str().c_str(); - funds = atof(params[1].get_str().c_str()) * COIN + 0.00000000499999; - - if (!VALID_PLAN_NAME(name)) { - ERR_RESULT(strprintf("Plan name can be at most %d ASCII characters",PLAN_NAME_MAX)); - return(result); - } - - if ( funds <= 0 ) { - ERR_RESULT("funds must be positive"); - return result; - } - if ( params.size() > 2 ) - { - APR = atof(params[2].get_str().c_str()) * COIN; - if ( APR > REWARDSCC_MAXAPR ) - { - ERR_RESULT("25% APR is maximum"); - return result; - } - if ( params.size() > 3 ) - { - minseconds = atol(params[3].get_str().c_str()) * 3600 * 24; - if ( minseconds < 0 ) { - ERR_RESULT("mindays must be non-negative"); - return result; - } - if ( params.size() > 4 ) - { - maxseconds = atol(params[4].get_str().c_str()) * 3600 * 24; - if ( maxseconds <= 0 ) { - ERR_RESULT("maxdays must be positive"); - return result; - } - if ( maxseconds < minseconds ) { - ERR_RESULT("maxdays must be greater than mindays"); - return result; - } - if ( params.size() > 5 ) - mindeposit = atof(params[5].get_str().c_str()) * COIN + 0.00000000499999; - if ( mindeposit <= 0 ) { - ERR_RESULT("mindeposit must be positive"); - return result; - } - } - } - } - hex = RewardsCreateFunding(0,name,funds,APR,minseconds,maxseconds,mindeposit); - if ( hex.size() > 0 ) - { - result.push_back(Pair("result", "success")); - result.push_back(Pair("hex", hex)); - } else ERR_RESULT("couldnt create rewards funding transaction"); - return(result); -} - -UniValue rewardslock(const UniValue& params, bool fHelp, const CPubKey& mypk) -{ - UniValue result(UniValue::VOBJ); char *name; uint256 fundingtxid; int64_t amount; std::string hex; - if ( fHelp || params.size() != 3 ) - throw runtime_error("rewardslock name fundingtxid amount\n"); - if ( ensure_CCrequirements(EVAL_REWARDS) < 0 ) - throw runtime_error(CC_REQUIREMENTS_MSG); - const CKeyStore& keystore = *pwalletMain; - LOCK2(cs_main, pwalletMain->cs_wallet); - name = (char *)params[0].get_str().c_str(); - fundingtxid = Parseuint256((char *)params[1].get_str().c_str()); - amount = atof(params[2].get_str().c_str()) * COIN + 0.00000000499999; - hex = RewardsLock(0,name,fundingtxid,amount); - - if (!VALID_PLAN_NAME(name)) { - ERR_RESULT(strprintf("Plan name can be at most %d ASCII characters",PLAN_NAME_MAX)); - return(result); - } - if ( CCerror != "" ){ - ERR_RESULT(CCerror); - } else if ( amount > 0 ) { - if ( hex.size() > 0 ) - { - result.push_back(Pair("result", "success")); - result.push_back(Pair("hex", hex)); - } else ERR_RESULT( "couldnt create rewards lock transaction"); - } else ERR_RESULT("amount must be positive"); - return(result); -} - -UniValue rewardsaddfunding(const UniValue& params, bool fHelp, const CPubKey& mypk) -{ - UniValue result(UniValue::VOBJ); char *name; uint256 fundingtxid; int64_t amount; std::string hex; - if ( fHelp || params.size() != 3 ) - throw runtime_error("rewardsaddfunding name fundingtxid amount\n"); - if ( ensure_CCrequirements(EVAL_REWARDS) < 0 ) - throw runtime_error(CC_REQUIREMENTS_MSG); - const CKeyStore& keystore = *pwalletMain; - LOCK2(cs_main, pwalletMain->cs_wallet); - name = (char *)params[0].get_str().c_str(); - fundingtxid = Parseuint256((char *)params[1].get_str().c_str()); - amount = atof(params[2].get_str().c_str()) * COIN + 0.00000000499999; - hex = RewardsAddfunding(0,name,fundingtxid,amount); - - if (!VALID_PLAN_NAME(name)) { - ERR_RESULT(strprintf("Plan name can be at most %d ASCII characters",PLAN_NAME_MAX)); - return(result); - } - if (CCerror != "") { - ERR_RESULT(CCerror); - } else if (amount > 0) { - if ( hex.size() > 0 ) - { - result.push_back(Pair("result", "success")); - result.push_back(Pair("hex", hex)); - } else { - result.push_back(Pair("result", "error")); - result.push_back(Pair("error", "couldnt create rewards addfunding transaction")); - } - } else { - ERR_RESULT("funding amount must be positive"); - } - return(result); -} - -UniValue rewardsunlock(const UniValue& params, bool fHelp, const CPubKey& mypk) -{ - UniValue result(UniValue::VOBJ); std::string hex; char *name; uint256 fundingtxid,txid; - if ( fHelp || params.size() > 3 || params.size() < 2 ) - throw runtime_error("rewardsunlock name fundingtxid [txid]\n"); - if ( ensure_CCrequirements(EVAL_REWARDS) < 0 ) - throw runtime_error(CC_REQUIREMENTS_MSG); - const CKeyStore& keystore = *pwalletMain; - LOCK2(cs_main, pwalletMain->cs_wallet); - name = (char *)params[0].get_str().c_str(); - fundingtxid = Parseuint256((char *)params[1].get_str().c_str()); - - if (!VALID_PLAN_NAME(name)) { - ERR_RESULT(strprintf("Plan name can be at most %d ASCII characters",PLAN_NAME_MAX)); - return(result); - } - if ( params.size() > 2 ) - txid = Parseuint256((char *)params[2].get_str().c_str()); - else memset(&txid,0,sizeof(txid)); - hex = RewardsUnlock(0,name,fundingtxid,txid); - if (CCerror != "") { - ERR_RESULT(CCerror); - } else if ( hex.size() > 0 ) { - result.push_back(Pair("result", "success")); - result.push_back(Pair("hex", hex)); - } else ERR_RESULT("couldnt create rewards unlock transaction"); - return(result); -} - -UniValue rewardslist(const UniValue& params, bool fHelp, const CPubKey& mypk) -{ - if ( fHelp || params.size() > 0 ) - throw runtime_error("rewardslist\n"); - if ( ensure_CCrequirements(EVAL_REWARDS) < 0 ) - throw runtime_error(CC_REQUIREMENTS_MSG); - const CKeyStore& keystore = *pwalletMain; - LOCK2(cs_main, pwalletMain->cs_wallet); - return(RewardsList()); -} - -UniValue rewardsinfo(const UniValue& params, bool fHelp, const CPubKey& mypk) -{ - uint256 fundingtxid; - if ( fHelp || params.size() != 1 ) - throw runtime_error("rewardsinfo fundingtxid\n"); - if ( ensure_CCrequirements(EVAL_REWARDS) < 0 ) - throw runtime_error(CC_REQUIREMENTS_MSG); - const CKeyStore& keystore = *pwalletMain; - LOCK2(cs_main, pwalletMain->cs_wallet); - fundingtxid = Parseuint256((char *)params[0].get_str().c_str()); - return(RewardsInfo(fundingtxid)); -} - - - UniValue oracleslist(const UniValue& params, bool fHelp, const CPubKey& mypk) { if ( fHelp || params.size() > 0 ) From 3a3c67e0fccfb71dad570863f2c8f71454f8177f Mon Sep 17 00:00:00 2001 From: Duke Date: Sat, 13 Jan 2024 00:06:09 -0500 Subject: [PATCH 028/108] Delete many things we do not want or need --- src/Makefile.am | 5 - src/cc/CCcustom.cpp | 9 +- src/cc/CCtokens.cpp | 1059 ----------------- src/cc/assets.cpp | 442 +------ src/cc/cclib.cpp | 43 +- src/cc/eval.cpp | 3 +- src/cc/gamescc.cpp | 1813 ----------------------------- src/cc/heir.cpp | 4 +- src/cc/heir_validate.h | 3 + src/cc/import.cpp | 764 ------------ src/cc/importgateway.cpp | 1288 -------------------- src/cc/makeprices | 8 - src/cc/maketetris | 7 - src/coins.cpp | 14 +- src/crosschain.cpp | 132 --- src/crosschain.h | 2 - src/importcoin.cpp | 425 ------- src/main.cpp | 26 +- src/miner.cpp | 14 +- src/primitives/transaction.h | 3 +- src/rpc/crosschain.cpp | 1185 ------------------- src/rpc/rawtransaction.cpp | 9 +- src/rpc/server.cpp | 30 - src/rpc/server.h | 17 - src/test-hush/test_coinimport.cpp | 260 ----- src/wallet/rpcwallet.cpp | 505 -------- 26 files changed, 52 insertions(+), 8018 deletions(-) delete mode 100644 src/cc/CCtokens.cpp delete mode 100644 src/cc/gamescc.cpp delete mode 100644 src/cc/import.cpp delete mode 100644 src/cc/importgateway.cpp delete mode 100755 src/cc/makeprices delete mode 100755 src/cc/maketetris delete mode 100644 src/importcoin.cpp delete mode 100644 src/test-hush/test_coinimport.cpp diff --git a/src/Makefile.am b/src/Makefile.am index d08f0d49e..2e890ebd7 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -272,13 +272,10 @@ libbitcoin_server_a_SOURCES = \ asyncrpcqueue.cpp \ bloom.cpp \ cc/eval.cpp \ - cc/import.cpp \ - cc/importgateway.cpp \ cc/CCassetsCore.cpp \ cc/CCcustom.cpp \ cc/CCtx.cpp \ cc/CCutils.cpp \ - cc/CCtokens.cpp \ cc/assets.cpp \ cc/faucet.cpp \ cc/fsm.cpp \ @@ -339,7 +336,6 @@ libbitcoin_wallet_a_SOURCES = \ zcash/Note.cpp \ transaction_builder.cpp \ wallet/rpcdump.cpp \ - cc/CCtokens.cpp \ cc/CCassetsCore.cpp \ cc/CCassetstx.cpp \ cc/CCtx.cpp \ @@ -406,7 +402,6 @@ libbitcoin_common_a_SOURCES = \ core_read.cpp \ core_write.cpp \ hash.cpp \ - importcoin.cpp \ key.cpp \ key_io.cpp \ keystore.cpp \ diff --git a/src/cc/CCcustom.cpp b/src/cc/CCcustom.cpp index fb3ff024a..28e15b148 100644 --- a/src/cc/CCcustom.cpp +++ b/src/cc/CCcustom.cpp @@ -27,7 +27,6 @@ #include "CCPrices.h" #include "CCPegs.h" #include "CCtokens.h" -#include "CCImportGateway.h" /* CCcustom has most of the functions that need to be extended to create a new CC contract. @@ -409,16 +408,16 @@ struct CCcontract_info *CCinit(struct CCcontract_info *cp, uint8_t evalcode) strcpy(cp->normaladdr, TokensNormaladdr); strcpy(cp->CChexstr, TokensCChexstr); memcpy(cp->CCpriv, TokensCCpriv, 32); - cp->validate = TokensValidate; - cp->ismyvin = IsTokensInput; + //cp->validate = TokensValidate; + //cp->ismyvin = IsTokensInput; break; case EVAL_IMPORTGATEWAY: strcpy(cp->unspendableCCaddr, ImportGatewayCCaddr); strcpy(cp->normaladdr, ImportGatewayNormaladdr); strcpy(cp->CChexstr, ImportGatewayCChexstr); memcpy(cp->CCpriv, ImportGatewayCCpriv, 32); - cp->validate = ImportGatewayValidate; - cp->ismyvin = IsImportGatewayInput; + //cp->validate = ImportGatewayValidate; + //cp->ismyvin = IsImportGatewayInput; break; default: if ( CClib_initcp(cp,evalcode) < 0 ) diff --git a/src/cc/CCtokens.cpp b/src/cc/CCtokens.cpp deleted file mode 100644 index 236b4c3ed..000000000 --- a/src/cc/CCtokens.cpp +++ /dev/null @@ -1,1059 +0,0 @@ -// Copyright (c) 2016-2023 The Hush developers -// Distributed under the GPLv3 software license, see the accompanying -// file COPYING or https://www.gnu.org/licenses/gpl-3.0.en.html -/****************************************************************************** - * Copyright © 2014-2019 The SuperNET Developers. * - * * - * See the AUTHORS, DEVELOPER-AGREEMENT and LICENSE files at * - * the top-level directory of this distribution for the individual copyright * - * holder information and the developer policies on copyright and licensing. * - * * - * Unless otherwise agreed in a custom licensing agreement, no part of the * - * SuperNET software, including this file may be copied, modified, propagated * - * or distributed except according to the terms contained in the LICENSE file * - * * - * Removal or modification of this copyright notice is prohibited. * - * * - ******************************************************************************/ - -#include "CCtokens.h" -#include "importcoin.h" - -/* TODO: correct this: ------------------------------ - The SetTokenFillamounts() and ValidateTokenRemainder() work in tandem to calculate the vouts for a fill and to validate the vouts, respectively. - - This pair of functions are critical to make sure the trading is correct and is the trickiest part of the tokens contract. - - //vin.0: normal input - //vin.1: unspendable.(vout.0 from buyoffer) buyTx.vout[0] - //vin.2+: valid CC output satisfies buyoffer (*tx.vin[2])->nValue - //vout.0: remaining amount of bid to unspendable - //vout.1: vin.1 value to signer of vin.2 - //vout.2: vin.2 tokenoshis to original pubkey - //vout.3: CC output for tokenoshis change (if any) - //vout.4: normal output for change (if any) - //vout.n-1: opreturn [EVAL_ASSETS] ['B'] [tokenid] [remaining token required] [origpubkey] - ValidateTokenRemainder(remaining_price,tx.vout[0].nValue,nValue,tx.vout[1].nValue,tx.vout[2].nValue,totalunits); - - Yes, this is quite confusing... - - In ValidateTokenRemainder the naming convention is nValue is the coin/token with the offer on the books and "units" is what it is being paid in. The high level check is to make sure we didnt lose any coins or tokens, the harder to validate is the actual price paid as the "orderbook" is in terms of the combined nValue for the combined totalunits. - - We assume that the effective unit cost in the orderbook is valid and that that amount was paid and also that any remainder will be close enough in effective unit cost to not matter. At the edge cases, this will probably be not true and maybe some orders wont be practically fillable when reduced to fractional state. However, the original pubkey that created the offer can always reclaim it. - ------------------------------ -*/ - - - -// tx validation -bool TokensValidate(struct CCcontract_info *cp, Eval* eval, const CTransaction &tx, uint32_t nIn) -{ - static uint256 zero; - CTxDestination address; CTransaction vinTx, createTx; uint256 hashBlock, tokenid, tokenid2; - int32_t i, starti, numvins, numvouts, preventCCvins, preventCCvouts; - int64_t remaining_price, nValue, tokenoshis, outputs, inputs, tmpprice, totalunits, ignore; - std::vector> oprets; - vscript_t /*vopretExtra,*/ tmporigpubkey, ignorepubkey; - uint8_t funcid, evalCodeInOpret; - char destaddr[64], origaddr[64], CCaddr[64]; - std::vector voutTokenPubkeys, vinTokenPubkeys; - - if (strcmp(SMART_CHAIN_SYMBOL, "ROGUE") == 0 && chainActive.Height() <= 12500) - return true; - - numvins = tx.vin.size(); - numvouts = tx.vout.size(); - outputs = inputs = 0; - preventCCvins = preventCCvouts = -1; - - // check boundaries: - if (numvouts < 1) - return eval->Invalid("no vouts"); - - if ((funcid = DecodeTokenOpRet(tx.vout[numvouts - 1].scriptPubKey, evalCodeInOpret, tokenid, voutTokenPubkeys, oprets)) == 0) - return eval->Invalid("TokenValidate: invalid opreturn payload"); - - LOGSTREAM((char *)"cctokens", CCLOG_INFO, stream << "TokensValidate funcId=" << (char)(funcid?funcid:' ') << " evalcode=" << std::hex << (int)cp->evalcode << std::endl); - - if (eval->GetTxUnconfirmed(tokenid, createTx, hashBlock) == 0) - return eval->Invalid("cant find token create txid"); - //else if (IsCCInput(tx.vin[0].scriptSig) != 0) - // return eval->Invalid("illegal token vin0"); // <-- this validation was removed because some token tx might not have normal vins - else if (funcid != 'c') - { - if (tokenid == zeroid) - return eval->Invalid("illegal tokenid"); - else if (!TokensExactAmounts(true, cp, inputs, outputs, eval, tx, tokenid)) { - if (!eval->Valid()) - return false; //TokenExactAmounts must call eval->Invalid()! - else - return eval->Invalid("tokens cc inputs != cc outputs"); - } - } - - // validate spending from token cc addr: allowed only for burned non-fungible tokens: - if (ExtractTokensCCVinPubkeys(tx, vinTokenPubkeys) && std::find(vinTokenPubkeys.begin(), vinTokenPubkeys.end(), GetUnspendable(cp, NULL)) != vinTokenPubkeys.end()) { - // validate spending from token unspendable cc addr: - int64_t burnedAmount = HasBurnedTokensvouts(cp, eval, tx, tokenid); - if (burnedAmount > 0) { - vscript_t vopretNonfungible; - GetNonfungibleData(tokenid, vopretNonfungible); - if( vopretNonfungible.empty() ) - return eval->Invalid("spending cc marker not supported for fungible tokens"); - } - } - - switch (funcid) - { - case 'c': // token create should not be validated as it has no CC inputs, so return 'invalid' - // token tx structure for 'c': - //vin.0: normal input - //vout.0: issuance tokenoshis to CC - //vout.1: normal output for change (if any) - //vout.n-1: opreturn EVAL_TOKENS 'c' - return eval->Invalid("incorrect token funcid"); - - case 't': // transfer - // token tx structure for 't' - //vin.0: normal input - //vin.1 .. vin.n-1: valid CC outputs - //vout.0 to n-2: tokenoshis output to CC - //vout.n-2: normal output for change (if any) - //vout.n-1: opreturn EVAL_TOKENS 't' tokenid - if (inputs == 0) - return eval->Invalid("no token inputs for transfer"); - - LOGSTREAM((char *)"cctokens", CCLOG_INFO, stream << "token transfer preliminarily validated inputs=" << inputs << "->outputs=" << outputs << " preventCCvins=" << preventCCvins<< " preventCCvouts=" << preventCCvouts << std::endl); - break; // breaking to other contract validation... - - default: - LOGSTREAM((char *)"cctokens", CCLOG_INFO, stream << "illegal tokens funcid=" << (char)(funcid?funcid:' ') << std::endl); - return eval->Invalid("unexpected token funcid"); - } - - return true; -} - -// helper funcs: - -// extract cc token vins' pubkeys: -bool ExtractTokensCCVinPubkeys(const CTransaction &tx, std::vector &vinPubkeys) { - - bool found = false; - CPubKey pubkey; - struct CCcontract_info *cpTokens, tokensC; - - cpTokens = CCinit(&tokensC, EVAL_TOKENS); - vinPubkeys.clear(); - - for (int32_t i = 0; i < tx.vin.size(); i++) - { - // check for cc token vins: - if( (*cpTokens->ismyvin)(tx.vin[i].scriptSig) ) - { - - auto findEval = [](CC *cond, struct CCVisitor _) { - bool r = false; - - if (cc_typeId(cond) == CC_Secp256k1) { - *(CPubKey*)_.context = buf2pk(cond->publicKey); - //std::cerr << "findEval found pubkey=" << HexStr(*(CPubKey*)_.context) << std::endl; - r = true; - } - // false for a match, true for continue - return r ? 0 : 1; - }; - - CC *cond = GetCryptoCondition(tx.vin[i].scriptSig); - - if (cond) { - CCVisitor visitor = { findEval, (uint8_t*)"", 0, &pubkey }; - bool out = !cc_visit(cond, visitor); - cc_free(cond); - - if (pubkey.IsValid()) { - vinPubkeys.push_back(pubkey); - found = true; - } - } - } - } - return found; -} - -// this is just for log messages indentation fur debugging recursive calls: -thread_local uint32_t tokenValIndentSize = 0; - -// validates opret for token tx: -uint8_t ValidateTokenOpret(CTransaction tx, uint256 tokenid) { - - uint256 tokenidOpret = zeroid; - uint8_t funcid; - uint8_t dummyEvalCode; - std::vector voutPubkeysDummy; - std::vector> opretsDummy; - - // this is just for log messages indentation fur debugging recursive calls: - std::string indentStr = std::string().append(tokenValIndentSize, '.'); - - if (tx.vout.size() == 0) - return (uint8_t)0; - - if ((funcid = DecodeTokenOpRet(tx.vout.back().scriptPubKey, dummyEvalCode, tokenidOpret, voutPubkeysDummy, opretsDummy)) == 0) - { - LOGSTREAM((char *)"cctokens", CCLOG_INFO, stream << indentStr << "ValidateTokenOpret() DecodeTokenOpret could not parse opret for txid=" << tx.GetHash().GetHex() << std::endl); - return (uint8_t)0; - } - else if (funcid == 'c') - { - if (tokenid != zeroid && tokenid == tx.GetHash()) { - LOGSTREAM((char *)"cctokens", CCLOG_DEBUG1, stream << indentStr << "ValidateTokenOpret() this is tokenbase 'c' tx, txid=" << tx.GetHash().GetHex() << " returning true" << std::endl); - return funcid; - } - else { - LOGSTREAM((char *)"cctokens", CCLOG_DEBUG1, stream << indentStr << "ValidateTokenOpret() not my tokenbase txid=" << tx.GetHash().GetHex() << std::endl); - } - } - else if (funcid == 'i') - { - if (tokenid != zeroid && tokenid == tx.GetHash()) { - LOGSTREAM((char *)"cctokens", CCLOG_DEBUG1, stream << indentStr << "ValidateTokenOpret() this is import 'i' tx, txid=" << tx.GetHash().GetHex() << " returning true" << std::endl); - return funcid; - } - else { - LOGSTREAM((char *)"cctokens", CCLOG_DEBUG1, stream << indentStr << "ValidateTokenOpret() not my import txid=" << tx.GetHash().GetHex() << std::endl); - } - } - else if (funcid == 't') - { - //std::cerr << indentStr << "ValidateTokenOpret() tokenid=" << tokenid.GetHex() << " tokenIdOpret=" << tokenidOpret.GetHex() << " txid=" << tx.GetHash().GetHex() << std::endl; - if (tokenid != zeroid && tokenid == tokenidOpret) { - LOGSTREAM((char *)"cctokens", CCLOG_DEBUG1, stream << indentStr << "ValidateTokenOpret() this is a transfer 't' tx, txid=" << tx.GetHash().GetHex() << " returning true" << std::endl); - return funcid; - } - else { - LOGSTREAM((char *)"cctokens", CCLOG_DEBUG1, stream << indentStr << "ValidateTokenOpret() not my tokenid=" << tokenidOpret.GetHex() << std::endl); - } - } - else { - LOGSTREAM((char *)"cctokens", CCLOG_DEBUG1, stream << indentStr << "ValidateTokenOpret() not supported funcid=" << (char)funcid << " tokenIdOpret=" << tokenidOpret.GetHex() << " txid=" << tx.GetHash().GetHex() << std::endl); - } - return (uint8_t)0; -} - -// remove token->unspendablePk (it is only for marker usage) -void FilterOutTokensUnspendablePk(const std::vector &sourcePubkeys, std::vector &destPubkeys) { - struct CCcontract_info *cpTokens, tokensC; - cpTokens = CCinit(&tokensC, EVAL_TOKENS); - CPubKey tokensUnspendablePk = GetUnspendable(cpTokens, NULL); - destPubkeys.clear(); - - for (auto pk : sourcePubkeys) - if (pk != tokensUnspendablePk) - destPubkeys.push_back(pk); - -} - -void FilterOutNonCCOprets(const std::vector> &oprets, vscript_t &vopret) { - - vopret.clear(); - - if (oprets.size() > 2) - LOGSTREAM("cctokens", CCLOG_INFO, stream << "FilterOutNonCCOprets() warning!! oprets.size > 2 currently not supported" << oprets.size() << std::endl); - - for (auto o : oprets) { - if (o.first < OPRETID_FIRSTNONCCDATA) { // skip burn, import, etc opret data - vopret = o.second; // return first contract opret (more than 1 is not supported yet) - break; - } - } -} - -// Checks if the vout is a really Tokens CC vout -// also checks tokenid in opret or txid if this is 'c' tx -// goDeeper is true: the func also validates amounts of the passed transaction: -// it should be either sum(cc vins) == sum(cc vouts) or the transaction is the 'tokenbase' ('c') tx -// checkPubkeys is true: validates if the vout is token vout1 or token vout1of2. Should always be true! -int64_t IsTokensvout(bool goDeeper, bool checkPubkeys /*<--not used, always true*/, struct CCcontract_info *cp, Eval* eval, const CTransaction& tx, int32_t v, uint256 reftokenid) -{ - - // this is just for log messages indentation fur debugging recursive calls: - std::string indentStr = std::string().append(tokenValIndentSize, '.'); - - LOGSTREAM((char *)"cctokens", CCLOG_DEBUG2, stream << indentStr << "IsTokensvout() entered for txid=" << tx.GetHash().GetHex() << " v=" << v << " for tokenid=" << reftokenid.GetHex() << std::endl); - - int32_t n = tx.vout.size(); - // just check boundaries: - if (n == 0 || v < 0 || v >= n-1) { - LOGSTREAM((char *)"cctokens", CCLOG_INFO, stream << indentStr << "isTokensvout() incorrect params: (n == 0 or v < 0 or v >= n-1)" << " v=" << v << " n=" << n << " returning 0" << std::endl); - return(0); - } - - if (tx.vout[v].scriptPubKey.IsPayToCryptoCondition()) - { - if (goDeeper) { - //validate all tx - int64_t myCCVinsAmount = 0, myCCVoutsAmount = 0; - - tokenValIndentSize++; - // false --> because we already at the 1-st level ancestor tx and do not need to dereference ancestors of next levels - bool isEqual = TokensExactAmounts(false, cp, myCCVinsAmount, myCCVoutsAmount, eval, tx, reftokenid); - tokenValIndentSize--; - - if (!isEqual) { - // if ccInputs != ccOutputs and it is not the tokenbase tx - // this means it is possibly a fake tx (dimxy): - if (reftokenid != tx.GetHash()) { // checking that this is the true tokenbase tx, by verifying that funcid=c, is done further in this function (dimxy) - LOGSTREAM((char *)"cctokens", CCLOG_INFO, stream << indentStr << "IsTokensvout() warning: for the verified tx detected a bad vintx=" << tx.GetHash().GetHex() << ": cc inputs != cc outputs and not the 'tokenbase' tx, skipping the verified tx" << std::endl); - return 0; - } - } - } - - // token opret most important checks (tokenid == reftokenid, tokenid is non-zero, tx is 'tokenbase'): - const uint8_t funcId = ValidateTokenOpret(tx, reftokenid); - //std::cerr << indentStr << "IsTokensvout() ValidateTokenOpret returned=" << (char)(funcId?funcId:' ') << " for txid=" << tx.GetHash().GetHex() << " for tokenid=" << reftokenid.GetHex() << std::endl; - if (funcId != 0) { - LOGSTREAM((char *)"cctokens", CCLOG_DEBUG2, stream << indentStr << "IsTokensvout() ValidateTokenOpret returned not-null funcId=" << (char)(funcId ? funcId : ' ') << " for txid=" << tx.GetHash().GetHex() << " for tokenid=" << reftokenid.GetHex() << std::endl); - - uint8_t dummyEvalCode; - uint256 tokenIdOpret; - std::vector voutPubkeys, voutPubkeysInOpret; - vscript_t vopretExtra, vopretNonfungible; - std::vector> oprets; - - uint8_t evalCodeNonfungible = 0; - uint8_t evalCode1 = EVAL_TOKENS; // if both payloads are empty maybe it is a transfer to non-payload-one-eval-token vout like GatewaysClaim - uint8_t evalCode2 = 0; // will be checked if zero or not - - // test vouts for possible token use-cases: - std::vector> testVouts; - - DecodeTokenOpRet(tx.vout.back().scriptPubKey, dummyEvalCode, tokenIdOpret, voutPubkeysInOpret, oprets); - LOGSTREAM((char *)"cctokens", CCLOG_DEBUG2, stream << "IsTokensvout() oprets.size()=" << oprets.size() << std::endl); - - // get assets/channels/gateways token data: - FilterOutNonCCOprets(oprets, vopretExtra); // NOTE: only 1 additional evalcode in token opret is currently supported - LOGSTREAM((char *)"cctokens", CCLOG_DEBUG2, stream << "IsTokensvout() vopretExtra=" << HexStr(vopretExtra) << std::endl); - - // get non-fungible data - GetNonfungibleData(reftokenid, vopretNonfungible); - FilterOutTokensUnspendablePk(voutPubkeysInOpret, voutPubkeys); // cannot send tokens to token unspendable cc addr (only marker is allowed there) - - // NOTE: evalcode order in vouts is important: - // non-fungible-eval -> EVAL_TOKENS -> assets-eval - - if (vopretNonfungible.size() > 0) - evalCodeNonfungible = evalCode1 = vopretNonfungible.begin()[0]; - if (vopretExtra.size() > 0) - evalCode2 = vopretExtra.begin()[0]; - - if (evalCode1 == EVAL_TOKENS && evalCode2 != 0) { - evalCode1 = evalCode2; // for using MakeTokensCC1vout(evalcode,...) instead of MakeCC1vout(EVAL_TOKENS, evalcode...) - evalCode2 = 0; - } - - if( /*checkPubkeys &&*/ funcId != 'c' ) { // for 'c' there is no pubkeys - // verify that the vout is token by constructing vouts with the pubkeys in the opret: - - // maybe this is dual-eval 1 pubkey or 1of2 pubkey vout? - if (voutPubkeys.size() >= 1 && voutPubkeys.size() <= 2) { - // check dual/three-eval 1 pubkey vout with the first pubkey - testVouts.push_back( std::make_pair(MakeTokensCC1vout(evalCode1, evalCode2, tx.vout[v].nValue, voutPubkeys[0]), std::string("three-eval cc1 pk[0]")) ); - if (evalCode2 != 0) - // also check in backward evalcode order - testVouts.push_back( std::make_pair(MakeTokensCC1vout(evalCode2, evalCode1, tx.vout[v].nValue, voutPubkeys[0]), std::string("three-eval cc1 pk[0] backward-eval")) ); - - if(voutPubkeys.size() == 2) { - // check dual/three eval 1of2 pubkeys vout - testVouts.push_back( std::make_pair(MakeTokensCC1of2vout(evalCode1, evalCode2, tx.vout[v].nValue, voutPubkeys[0], voutPubkeys[1]), std::string("three-eval cc1of2")) ); - // check dual/three eval 1 pubkey vout with the second pubkey - testVouts.push_back(std::make_pair(MakeTokensCC1vout(evalCode1, evalCode2, tx.vout[v].nValue, voutPubkeys[1]), std::string("three-eval cc1 pk[1]"))); - if (evalCode2 != 0) { - // also check in backward evalcode order: - // check dual/three eval 1of2 pubkeys vout - testVouts.push_back(std::make_pair(MakeTokensCC1of2vout(evalCode2, evalCode1, tx.vout[v].nValue, voutPubkeys[0], voutPubkeys[1]), std::string("three-eval cc1of2 backward-eval"))); - // check dual/three eval 1 pubkey vout with the second pubkey - testVouts.push_back(std::make_pair(MakeTokensCC1vout(evalCode2, evalCode1, tx.vout[v].nValue, voutPubkeys[1]), std::string("three-eval cc1 pk[1] backward-eval"))); - } - } - - // maybe this is like gatewayclaim to single-eval token? - if( evalCodeNonfungible == 0 ) // do not allow to convert non-fungible to fungible token - testVouts.push_back(std::make_pair(MakeCC1vout(EVAL_TOKENS, tx.vout[v].nValue, voutPubkeys[0]), std::string("single-eval cc1 pk[0]"))); - - // maybe this is like FillSell for non-fungible token? - if( evalCode1 != 0 ) - testVouts.push_back(std::make_pair(MakeTokensCC1vout(evalCode1, tx.vout[v].nValue, voutPubkeys[0]), std::string("dual-eval-token cc1 pk[0]"))); - if( evalCode2 != 0 ) - testVouts.push_back(std::make_pair(MakeTokensCC1vout(evalCode2, tx.vout[v].nValue, voutPubkeys[0]), std::string("dual-eval2-token cc1 pk[0]"))); - - // the same for pk[1]: - if (voutPubkeys.size() == 2) { - if (evalCodeNonfungible == 0) // do not allow to convert non-fungible to fungible token - testVouts.push_back(std::make_pair(MakeCC1vout(EVAL_TOKENS, tx.vout[v].nValue, voutPubkeys[1]), std::string("single-eval cc1 pk[1]"))); - if (evalCode1 != 0) - testVouts.push_back(std::make_pair(MakeTokensCC1vout(evalCode1, tx.vout[v].nValue, voutPubkeys[1]), std::string("dual-eval-token cc1 pk[1]"))); - if (evalCode2 != 0) - testVouts.push_back(std::make_pair(MakeTokensCC1vout(evalCode2, tx.vout[v].nValue, voutPubkeys[1]), std::string("dual-eval2-token cc1 pk[1]"))); - } - } - - //special check for tx when spending from 1of2 CC address and one of pubkeys is global CC pubkey - struct CCcontract_info *cpEvalCode1,CEvalCode1; - cpEvalCode1 = CCinit(&CEvalCode1,evalCode1); - CPubKey pk=GetUnspendable(cpEvalCode1,0); - testVouts.push_back( std::make_pair(MakeTokensCC1of2vout(evalCode1, tx.vout[v].nValue, voutPubkeys[0], pk), std::string("dual-eval1 pegscc cc1of2 pk[0] globalccpk")) ); - if (voutPubkeys.size() == 2) testVouts.push_back( std::make_pair(MakeTokensCC1of2vout(evalCode1, tx.vout[v].nValue, voutPubkeys[1], pk), std::string("dual-eval1 pegscc cc1of2 pk[1] globalccpk")) ); - if (evalCode2!=0) - { - struct CCcontract_info *cpEvalCode2,CEvalCode2; - cpEvalCode2 = CCinit(&CEvalCode2,evalCode2); - CPubKey pk=GetUnspendable(cpEvalCode2,0); - testVouts.push_back( std::make_pair(MakeTokensCC1of2vout(evalCode2, tx.vout[v].nValue, voutPubkeys[0], pk), std::string("dual-eval2 pegscc cc1of2 pk[0] globalccpk")) ); - if (voutPubkeys.size() == 2) testVouts.push_back( std::make_pair(MakeTokensCC1of2vout(evalCode2, tx.vout[v].nValue, voutPubkeys[1], pk), std::string("dual-eval2 pegscc cc1of2 pk[1] globalccpk")) ); - } - - // maybe it is single-eval or dual/three-eval token change? - std::vector vinPubkeys, vinPubkeysUnfiltered; - ExtractTokensCCVinPubkeys(tx, vinPubkeysUnfiltered); - FilterOutTokensUnspendablePk(vinPubkeysUnfiltered, vinPubkeys); // cannot send tokens to token unspendable cc addr (only marker is allowed there) - - for(std::vector::iterator it = vinPubkeys.begin(); it != vinPubkeys.end(); it++) { - if (evalCodeNonfungible == 0) // do not allow to convert non-fungible to fungible token - testVouts.push_back(std::make_pair(MakeCC1vout(EVAL_TOKENS, tx.vout[v].nValue, *it), std::string("single-eval cc1 self vin pk"))); - testVouts.push_back(std::make_pair(MakeTokensCC1vout(evalCode1, evalCode2, tx.vout[v].nValue, *it), std::string("three-eval cc1 self vin pk"))); - - if (evalCode2 != 0) - // also check in backward evalcode order: - testVouts.push_back(std::make_pair(MakeTokensCC1vout(evalCode2, evalCode1, tx.vout[v].nValue, *it), std::string("three-eval cc1 self vin pk backward-eval"))); - } - - // try all test vouts: - for (auto t : testVouts) { - if (t.first == tx.vout[v]) { // test vout matches - LOGSTREAM((char *)"cctokens", CCLOG_DEBUG1, stream << indentStr << "IsTokensvout() valid amount=" << tx.vout[v].nValue << " msg=" << t.second << " evalCode=" << (int)evalCode1 << " evalCode2=" << (int)evalCode2 << " txid=" << tx.GetHash().GetHex() << " tokenid=" << reftokenid.GetHex() << std::endl); - return tx.vout[v].nValue; - } - } - - } - else { // funcid == 'c' - - if (!tx.IsCoinImport()) { - - vscript_t vorigPubkey; - std::string dummyName, dummyDescription; - std::vector> oprets; - - if (DecodeTokenCreateOpRet(tx.vout.back().scriptPubKey, vorigPubkey, dummyName, dummyDescription, oprets) == 0) { - LOGSTREAM((char *)"cctokens", CCLOG_INFO, stream << indentStr << "IsTokensvout() could not decode create opret" << " for txid=" << tx.GetHash().GetHex() << " for tokenid=" << reftokenid.GetHex() << std::endl); - return 0; - } - - CPubKey origPubkey = pubkey2pk(vorigPubkey); - - - // TODO: add voutPubkeys for 'c' tx - - /* this would not work for imported tokens: - // for 'c' recognize the tokens only to token originator pubkey (but not to unspendable <-- closed sec violation) - // maybe this is like gatewayclaim to single-eval token? - if (evalCodeNonfungible == 0) // do not allow to convert non-fungible to fungible token - testVouts.push_back(std::make_pair(MakeCC1vout(EVAL_TOKENS, tx.vout[v].nValue, origPubkey), std::string("single-eval cc1 orig-pk"))); - // maybe this is like FillSell for non-fungible token? - if (evalCode1 != 0) - testVouts.push_back(std::make_pair(MakeTokensCC1vout(evalCode1, tx.vout[v].nValue, origPubkey), std::string("dual-eval-token cc1 orig-pk"))); */ - - // note: this would not work if there are several pubkeys in the tokencreator's wallet (AddNormalinputs does not use pubkey param): - // for tokenbase tx check that normal inputs sent from origpubkey > cc outputs - int64_t ccOutputs = 0; - for (auto vout : tx.vout) - if (vout.scriptPubKey.IsPayToCryptoCondition() //TODO: add voutPubkey validation - && !IsTokenMarkerVout(vout)) // should not be marker here - ccOutputs += vout.nValue; - - int64_t normalInputs = TotalPubkeyNormalInputs(tx, origPubkey); // check if normal inputs are really signed by originator pubkey (someone not cheating with originator pubkey) - LOGSTREAM("cctokens", CCLOG_DEBUG2, stream << indentStr << "IsTokensvout() normalInputs=" << normalInputs << " ccOutputs=" << ccOutputs << " for tokenbase=" << reftokenid.GetHex() << std::endl); - - if (normalInputs >= ccOutputs) { - LOGSTREAM("cctokens", CCLOG_DEBUG2, stream << indentStr << "IsTokensvout() assured normalInputs >= ccOutputs" << " for tokenbase=" << reftokenid.GetHex() << std::endl); - if (!IsTokenMarkerVout(tx.vout[v])) // exclude marker - return tx.vout[v].nValue; - else - return 0; // vout is good, but do not take marker into account - } - else { - LOGSTREAM("cctokens", CCLOG_INFO, stream << indentStr << "IsTokensvout() skipping vout not fulfilled normalInputs >= ccOutput" << " for tokenbase=" << reftokenid.GetHex() << " normalInputs=" << normalInputs << " ccOutputs=" << ccOutputs << std::endl); - } - } - else { - // imported tokens are checked in the eval::ImportCoin() validation code - if (!IsTokenMarkerVout(tx.vout[v])) // exclude marker - return tx.vout[v].nValue; - else - return 0; // vout is good, but do not take marker into account - } - } - LOGSTREAM("cctokens", CCLOG_DEBUG1, stream << indentStr << "IsTokensvout() no valid vouts evalCode=" << (int)evalCode1 << " evalCode2=" << (int)evalCode2 << " for txid=" << tx.GetHash().GetHex() << " for tokenid=" << reftokenid.GetHex() << std::endl); - } - //std::cerr << indentStr; fprintf(stderr,"IsTokensvout() CC vout v.%d of n=%d amount=%.8f txid=%s\n",v,n,(double)0/COIN, tx.GetHash().GetHex().c_str()); - } - //std::cerr << indentStr; fprintf(stderr,"IsTokensvout() normal output v.%d %.8f\n",v,(double)tx.vout[v].nValue/COIN); - return(0); -} - -bool IsTokenMarkerVout(CTxOut vout) { - struct CCcontract_info *cpTokens, CCtokens_info; - cpTokens = CCinit(&CCtokens_info, EVAL_TOKENS); - return vout == MakeCC1vout(EVAL_TOKENS, vout.nValue, GetUnspendable(cpTokens, NULL)); -} - -// compares cc inputs vs cc outputs (to prevent feeding vouts from normal inputs) -bool TokensExactAmounts(bool goDeeper, struct CCcontract_info *cp, int64_t &inputs, int64_t &outputs, Eval* eval, const CTransaction &tx, uint256 reftokenid) -{ - CTransaction vinTx; - uint256 hashBlock; - int64_t tokenoshis; - - struct CCcontract_info *cpTokens, tokensC; - cpTokens = CCinit(&tokensC, EVAL_TOKENS); - - int32_t numvins = tx.vin.size(); - int32_t numvouts = tx.vout.size(); - inputs = outputs = 0; - - // this is just for log messages indentation for debugging recursive calls: - std::string indentStr = std::string().append(tokenValIndentSize, '.'); - - LOGSTREAM((char *)"cctokens", CCLOG_DEBUG2, stream << indentStr << "TokensExactAmounts() entered for txid=" << tx.GetHash().GetHex() << " for tokenid=" << reftokenid.GetHex() << std::endl); - - for (int32_t i = 0; iismyvin)(tx.vin[i].scriptSig) /*|| IsVinAllowed(tx.vin[i].scriptSig) != 0*/) - { - //std::cerr << indentStr << "TokensExactAmounts() eval is true=" << (eval != NULL) << " ismyvin=ok for_i=" << i << std::endl; - // we are not inside the validation code -- dimxy - if ((eval && eval->GetTxUnconfirmed(tx.vin[i].prevout.hash, vinTx, hashBlock) == 0) || (!eval && !myGetTransaction(tx.vin[i].prevout.hash, vinTx, hashBlock))) - { - LOGSTREAM((char *)"cctokens", CCLOG_INFO, stream << indentStr << "TokensExactAmounts() cannot read vintx for i." << i << " numvins." << numvins << std::endl); - return (!eval) ? false : eval->Invalid("always should find vin tx, but didnt"); - } - else { - LOGSTREAM((char *)"cctokens", CCLOG_DEBUG2, stream << indentStr << "TokenExactAmounts() checking vintx.vout for tx.vin[" << i << "] nValue=" << vinTx.vout[tx.vin[i].prevout.n].nValue << std::endl); - - // validate vouts of vintx - tokenValIndentSize++; - tokenoshis = IsTokensvout(goDeeper, true, cpTokens, eval, vinTx, tx.vin[i].prevout.n, reftokenid); - tokenValIndentSize--; - if (tokenoshis != 0) - { - LOGSTREAM((char *)"cctokens", CCLOG_DEBUG1, stream << indentStr << "TokensExactAmounts() adding vintx.vout for tx.vin[" << i << "] tokenoshis=" << tokenoshis << std::endl); - inputs += tokenoshis; - } - } - } - } - - for (int32_t i = 0; i < numvouts-1; i ++) // 'numvouts-1' <-- do not check opret - { - LOGSTREAM((char *)"cctokens", CCLOG_DEBUG2, stream << indentStr << "TokenExactAmounts() recursively checking tx.vout[" << i << "] nValue=" << tx.vout[i].nValue << std::endl); - - // Note: we pass in here IsTokenvout(false,...) because we don't need to call TokenExactAmounts() recursively from IsTokensvout here - // indeed, if we pass 'true' we'll be checking this tx vout again - tokenValIndentSize++; - tokenoshis = IsTokensvout(false /*<--do not recursion here*/, true /*<--exclude non-tokens vouts*/, cpTokens, eval, tx, i, reftokenid); - tokenValIndentSize--; - - if (tokenoshis != 0) - { - LOGSTREAM((char *)"cctokens", CCLOG_DEBUG1, stream << indentStr << "TokensExactAmounts() adding tx.vout[" << i << "] tokenoshis=" << tokenoshis << std::endl); - outputs += tokenoshis; - } - } - - //std::cerr << indentStr << "TokensExactAmounts() inputs=" << inputs << " outputs=" << outputs << " for txid=" << tx.GetHash().GetHex() << std::endl; - - if (inputs != outputs) { - if (tx.GetHash() != reftokenid) - LOGSTREAM((char *)"cctokens", CCLOG_DEBUG1, stream << indentStr << "TokenExactAmounts() found unequal token cc inputs=" << inputs << " vs cc outputs=" << outputs << " for txid=" << tx.GetHash().GetHex() << " and this is not the create tx" << std::endl); - //fprintf(stderr,"inputs %llu vs outputs %llu\n",(long long)inputs,(long long)outputs); - return false; // do not call eval->Invalid() here! - } - else - return true; -} - - -// get non-fungible data from 'tokenbase' tx (the data might be empty) -void GetNonfungibleData(uint256 tokenid, vscript_t &vopretNonfungible) -{ - CTransaction tokenbasetx; - uint256 hashBlock; - - if (!myGetTransaction(tokenid, tokenbasetx, hashBlock)) { - LOGSTREAM((char *)"cctokens", CCLOG_INFO, stream << "GetNonfungibleData() cound not load token creation tx=" << tokenid.GetHex() << std::endl); - return; - } - - vopretNonfungible.clear(); - // check if it is non-fungible tx and get its second evalcode from non-fungible payload - if (tokenbasetx.vout.size() > 0) { - std::vector origpubkey; - std::string name, description; - std::vector> oprets; - - if (DecodeTokenCreateOpRet(tokenbasetx.vout.back().scriptPubKey, origpubkey, name, description, oprets) == 'c') { - GetOpretBlob(oprets, OPRETID_NONFUNGIBLEDATA, vopretNonfungible); - } - } -} - - -// overload, adds inputs from token cc addr -int64_t AddTokenCCInputs(struct CCcontract_info *cp, CMutableTransaction &mtx, CPubKey pk, uint256 tokenid, int64_t total, int32_t maxinputs) { - vscript_t vopretNonfungibleDummy; - return AddTokenCCInputs(cp, mtx, pk, tokenid, total, maxinputs, vopretNonfungibleDummy); -} - -// adds inputs from token cc addr and returns non-fungible opret payload if present -// also sets evalcode in cp, if needed -int64_t AddTokenCCInputs(struct CCcontract_info *cp, CMutableTransaction &mtx, CPubKey pk, uint256 tokenid, int64_t total, int32_t maxinputs, vscript_t &vopretNonfungible) -{ - char tokenaddr[64], destaddr[64]; - int64_t threshold, nValue, price, totalinputs = 0; - int32_t n = 0; - std::vector > unspentOutputs; - - GetNonfungibleData(tokenid, vopretNonfungible); - if (vopretNonfungible.size() > 0) - cp->additionalTokensEvalcode2 = vopretNonfungible.begin()[0]; - - GetTokensCCaddress(cp, tokenaddr, pk); - SetCCunspents(unspentOutputs, tokenaddr,true); - - - if (unspentOutputs.empty()) { - LOGSTREAM((char *)"cctokens", CCLOG_INFO, stream << "AddTokenCCInputs() no utxos for token dual/three eval addr=" << tokenaddr << " evalcode=" << (int)cp->evalcode << " additionalTokensEvalcode2=" << (int)cp->additionalTokensEvalcode2 << std::endl); - } - - threshold = total / (maxinputs != 0 ? maxinputs : CC_MAXVINS); - - for (std::vector >::const_iterator it = unspentOutputs.begin(); it != unspentOutputs.end(); it++) - { - CTransaction vintx; - uint256 hashBlock; - uint256 vintxid = it->first.txhash; - int32_t vout = (int32_t)it->first.index; - - if (it->second.satoshis < threshold) // this should work also for non-fungible tokens (there should be only 1 satoshi for non-fungible token issue) - continue; - - int32_t ivin; - for (ivin = 0; ivin < mtx.vin.size(); ivin ++) - if (vintxid == mtx.vin[ivin].prevout.hash && vout == mtx.vin[ivin].prevout.n) - break; - if (ivin != mtx.vin.size()) // that is, the tx.vout is already added to mtx.vin (in some previous calls) - continue; - - if (myGetTransaction(vintxid, vintx, hashBlock) != 0) - { - Getscriptaddress(destaddr, vintx.vout[vout].scriptPubKey); - if (strcmp(destaddr, tokenaddr) != 0 && - strcmp(destaddr, cp->unspendableCCaddr) != 0 && // TODO: check why this. Should not we add token inputs from unspendable cc addr if mypubkey is used? - strcmp(destaddr, cp->unspendableaddr2) != 0) // or the logic is to allow to spend all available tokens (what about unspendableaddr3)? - continue; - - LOGSTREAM((char *)"cctokens", CCLOG_DEBUG1, stream << "AddTokenCCInputs() check vintx vout destaddress=" << destaddr << " amount=" << vintx.vout[vout].nValue << std::endl); - - if ((nValue = IsTokensvout(true, true/*<--add only valid token uxtos */, cp, NULL, vintx, vout, tokenid)) > 0 && myIsutxo_spentinmempool(ignoretxid,ignorevin,vintxid, vout) == 0) - { - //for non-fungible tokens check payload: - if (!vopretNonfungible.empty()) { - vscript_t vopret; - - // check if it is non-fungible token: - GetNonfungibleData(tokenid, vopret); - if (vopret != vopretNonfungible) { - LOGSTREAM((char *)"cctokens", CCLOG_INFO, stream << "AddTokenCCInputs() found incorrect non-fungible opret payload for vintxid=" << vintxid.GetHex() << std::endl); - continue; - } - // non-fungible evalCode2 cc contract should also check if there exists only one non-fungible vout with amount = 1 - } - - - if (total != 0 && maxinputs != 0) // if it is not just to calc amount... - mtx.vin.push_back(CTxIn(vintxid, vout, CScript())); - - nValue = it->second.satoshis; - totalinputs += nValue; - LOGSTREAM((char *)"cctokens", CCLOG_DEBUG1, stream << "AddTokenCCInputs() adding input nValue=" << nValue << std::endl); - n++; - - if ((total > 0 && totalinputs >= total) || (maxinputs > 0 && n >= maxinputs)) - break; - } - } - } - - //std::cerr << "AddTokenCCInputs() found totalinputs=" << totalinputs << std::endl; - return(totalinputs); -} - -// checks if any token vouts are sent to 'dead' pubkey -int64_t HasBurnedTokensvouts(struct CCcontract_info *cp, Eval* eval, const CTransaction& tx, uint256 reftokenid) -{ - uint8_t dummyEvalCode; - uint256 tokenIdOpret; - std::vector voutPubkeys, voutPubkeysDummy; - std::vector> oprets; - vscript_t vopretExtra, vopretNonfungible; - - uint8_t evalCode = EVAL_TOKENS; // if both payloads are empty maybe it is a transfer to non-payload-one-eval-token vout like GatewaysClaim - uint8_t evalCode2 = 0; // will be checked if zero or not - - // test vouts for possible token use-cases: - std::vector> testVouts; - - int32_t n = tx.vout.size(); - // just check boundaries: - if (n == 0) { - LOGSTREAM((char *)"cctokens", CCLOG_INFO, stream << "HasBurnedTokensvouts() incorrect params: tx.vout.size() == 0, txid=" << tx.GetHash().GetHex() << std::endl); - return(0); - } - - - if (DecodeTokenOpRet(tx.vout.back().scriptPubKey, dummyEvalCode, tokenIdOpret, voutPubkeysDummy, oprets) == 0) { - LOGSTREAM((char *)"cctokens", CCLOG_INFO, stream << "HasBurnedTokensvouts() cannot parse opret DecodeTokenOpRet returned 0, txid=" << tx.GetHash().GetHex() << std::endl); - return 0; - } - - // get assets/channels/gateways token data: - FilterOutNonCCOprets(oprets, vopretExtra); // NOTE: only 1 additional evalcode in token opret is currently supported - - LOGSTREAM((char *)"cctokens", CCLOG_DEBUG2, stream << "HasBurnedTokensvouts() vopretExtra=" << HexStr(vopretExtra) << std::endl); - - GetNonfungibleData(reftokenid, vopretNonfungible); - - if (vopretNonfungible.size() > 0) - evalCode = vopretNonfungible.begin()[0]; - if (vopretExtra.size() > 0) - evalCode2 = vopretExtra.begin()[0]; - - if (evalCode == EVAL_TOKENS && evalCode2 != 0) { - evalCode = evalCode2; - evalCode2 = 0; - } - - voutPubkeys.push_back(pubkey2pk(ParseHex(CC_BURNPUBKEY))); - - int64_t burnedAmount = 0; - - for (int i = 0; i < tx.vout.size(); i++) { - - if (tx.vout[i].scriptPubKey.IsPayToCryptoCondition()) - { - // make all possible token vouts for dead pk: - for (std::vector::iterator it = voutPubkeys.begin(); it != voutPubkeys.end(); it++) { - testVouts.push_back(std::make_pair(MakeCC1vout(EVAL_TOKENS, tx.vout[i].nValue, *it), std::string("single-eval cc1 burn pk"))); - testVouts.push_back(std::make_pair(MakeTokensCC1vout(evalCode, evalCode2, tx.vout[i].nValue, *it), std::string("three-eval cc1 burn pk"))); - - if (evalCode2 != 0) - // also check in backward evalcode order: - testVouts.push_back(std::make_pair(MakeTokensCC1vout(evalCode2, evalCode, tx.vout[i].nValue, *it), std::string("three-eval cc1 burn pk backward-eval"))); - } - - // try all test vouts: - for (auto t : testVouts) { - if (t.first == tx.vout[i]) { - LOGSTREAM((char *)"cctokens", CCLOG_DEBUG1, stream << "HasBurnedTokensvouts() burned amount=" << tx.vout[i].nValue << " msg=" << t.second << " evalCode=" << (int)evalCode << " evalCode2=" << (int)evalCode2 << " txid=" << tx.GetHash().GetHex() << " tokenid=" << reftokenid.GetHex() << std::endl); - burnedAmount += tx.vout[i].nValue; - } - } - LOGSTREAM((char *)"cctokens", CCLOG_DEBUG2, stream << "HasBurnedTokensvouts() total burned=" << burnedAmount << " evalCode=" << (int)evalCode << " evalCode2=" << (int)evalCode2 << " for txid=" << tx.GetHash().GetHex() << " for tokenid=" << reftokenid.GetHex() << std::endl); - } - } - - return burnedAmount; -} - -CPubKey GetTokenOriginatorPubKey(CScript scriptPubKey) { - - uint8_t funcId, evalCode; - uint256 tokenid; - std::vector voutTokenPubkeys; - std::vector> oprets; - - if ((funcId = DecodeTokenOpRet(scriptPubKey, evalCode, tokenid, voutTokenPubkeys, oprets)) != 0) { - CTransaction tokenbasetx; - uint256 hashBlock; - - if (myGetTransaction(tokenid, tokenbasetx, hashBlock) && tokenbasetx.vout.size() > 0) { - vscript_t vorigpubkey; - std::string name, desc; - if (DecodeTokenCreateOpRet(tokenbasetx.vout.back().scriptPubKey, vorigpubkey, name, desc) != 0) - return pubkey2pk(vorigpubkey); - } - } - return CPubKey(); //return invalid pubkey -} - -// returns token creation signed raw tx -std::string CreateToken(int64_t txfee, int64_t tokensupply, std::string name, std::string description, vscript_t nonfungibleData) -{ - CMutableTransaction mtx = CreateNewContextualCMutableTransaction(Params().GetConsensus(), hush_nextheight()); - CPubKey mypk; struct CCcontract_info *cp, C; - if (tokensupply < 0) { - CCerror = "negative tokensupply"; - LOGSTREAM((char *)"cctokens", CCLOG_INFO, stream << "CreateToken() =" << CCerror << "=" << tokensupply << std::endl); - return std::string(""); - } - if (!nonfungibleData.empty() && tokensupply != 1) { - CCerror = "for non-fungible tokens tokensupply should be equal to 1"; - LOGSTREAM((char *)"cctokens", CCLOG_INFO, stream << "CreateToken() " << CCerror << std::endl); - return std::string(""); - } - - - cp = CCinit(&C, EVAL_TOKENS); - if (name.size() > 32 || description.size() > 4096) // this is also checked on rpc level - { - LOGSTREAM((char *)"cctokens", CCLOG_DEBUG1, stream << "name len=" << name.size() << " or description len=" << description.size() << " is too big" << std::endl); - CCerror = "name should be <= 32, description should be <= 4096"; - return(""); - } - if (txfee == 0) - txfee = 10000; - mypk = pubkey2pk(Mypubkey()); - - if (AddNormalinputs2(mtx, tokensupply + 2 * txfee, 64) > 0) // add normal inputs only from mypk - { - int64_t mypkInputs = TotalPubkeyNormalInputs(mtx, mypk); - if (mypkInputs < tokensupply) { // check that tokens amount are really issued with mypk (because in the wallet there maybe other privkeys) - CCerror = "some inputs signed not with -pubkey=pk"; - return std::string(""); - } - - uint8_t destEvalCode = EVAL_TOKENS; - if( nonfungibleData.size() > 0 ) - destEvalCode = nonfungibleData.begin()[0]; - - // NOTE: we should prevent spending fake-tokens from this marker in IsTokenvout(): - mtx.vout.push_back(MakeCC1vout(EVAL_TOKENS, txfee, GetUnspendable(cp, NULL))); // new marker to token cc addr, burnable and validated, vout pos now changed to 0 (from 1) - mtx.vout.push_back(MakeTokensCC1vout(destEvalCode, tokensupply, mypk)); - //mtx.vout.push_back(CTxOut(txfee, CScript() << ParseHex(cp->CChexstr) << OP_CHECKSIG)); // old marker (non-burnable because spending could not be validated) - //mtx.vout.push_back(MakeCC1vout(EVAL_TOKENS, txfee, GetUnspendable(cp, NULL))); // ...moved to vout=0 for matching with rogue-game token - - return(FinalizeCCTx(0, cp, mtx, mypk, txfee, EncodeTokenCreateOpRet('c', Mypubkey(), name, description, nonfungibleData))); - } - - CCerror = "cant find normal inputs"; - LOGSTREAM((char *)"cctokens", CCLOG_INFO, stream << "CreateToken() " << CCerror << std::endl); - return std::string(""); -} - -// transfer tokens to another pubkey -// param additionalEvalCode allows transfer of dual-eval non-fungible tokens -std::string TokenTransfer(int64_t txfee, uint256 tokenid, vscript_t destpubkey, int64_t total) -{ - CMutableTransaction mtx = CreateNewContextualCMutableTransaction(Params().GetConsensus(), hush_nextheight()); - CPubKey mypk; uint64_t mask; int64_t CCchange = 0, inputs = 0; struct CCcontract_info *cp, C; - vscript_t vopretNonfungible, vopretEmpty; - - if (total < 0) { - CCerror = strprintf("negative total"); - LOGSTREAM((char *)"cctokens", CCLOG_INFO, stream << CCerror << "=" << total << std::endl); - return(""); - } - - cp = CCinit(&C, EVAL_TOKENS); - - if (txfee == 0) - txfee = 10000; - mypk = pubkey2pk(Mypubkey()); - /*if ( cp->tokens1of2addr[0] == 0 ) - { - GetTokensCCaddress(cp, cp->tokens1of2addr, mypk); - fprintf(stderr,"set tokens1of2addr <- %s\n",cp->tokens1of2addr); - }*/ - if (AddNormalinputs(mtx, mypk, txfee, 3) > 0) - { - mask = ~((1LL << mtx.vin.size()) - 1); // seems, mask is not used anymore - - if ((inputs = AddTokenCCInputs(cp, mtx, mypk, tokenid, total, 60, vopretNonfungible)) > 0) // NOTE: AddTokenCCInputs might set cp->additionalEvalCode which is used in FinalizeCCtx! - { - if (inputs < total) { //added dimxy - CCerror = strprintf("insufficient token inputs"); - LOGSTREAM((char *)"cctokens", CCLOG_INFO, stream << "TokenTransfer() " << CCerror << std::endl); - return std::string(""); - } - - uint8_t destEvalCode = EVAL_TOKENS; - if (vopretNonfungible.size() > 0) - destEvalCode = vopretNonfungible.begin()[0]; - - if (inputs > total) - CCchange = (inputs - total); - mtx.vout.push_back(MakeTokensCC1vout(destEvalCode, total, pubkey2pk(destpubkey))); // if destEvalCode == EVAL_TOKENS then it is actually MakeCC1vout(EVAL_TOKENS,...) - if (CCchange != 0) - mtx.vout.push_back(MakeTokensCC1vout(destEvalCode, CCchange, mypk)); - - std::vector voutTokenPubkeys; - voutTokenPubkeys.push_back(pubkey2pk(destpubkey)); // dest pubkey for validating vout - - return FinalizeCCTx(mask, cp, mtx, mypk, txfee, EncodeTokenOpRet(tokenid, voutTokenPubkeys, std::make_pair((uint8_t)0, vopretEmpty))); - } - else { - CCerror = strprintf("no token inputs"); - LOGSTREAM((char *)"cctokens", CCLOG_INFO, stream << "TokenTransfer() " << CCerror << " for amount=" << total << std::endl); - } - //} else fprintf(stderr,"numoutputs.%d != numamounts.%d\n",n,(int32_t)amounts.size()); - } - else { - CCerror = strprintf("insufficient normal inputs for tx fee"); - LOGSTREAM((char *)"cctokens", CCLOG_INFO, stream << "TokenTransfer() " << CCerror << std::endl); - } - return(""); -} - - -int64_t GetTokenBalance(CPubKey pk, uint256 tokenid) -{ - uint256 hashBlock; - CMutableTransaction mtx = CreateNewContextualCMutableTransaction(Params().GetConsensus(), hush_nextheight()); - CTransaction tokentx; - - // CCerror = strprintf("obsolete, cannot return correct value without eval"); - // return 0; - - if (myGetTransaction(tokenid, tokentx, hashBlock) == 0) - { - LOGSTREAM((char *)"cctokens", CCLOG_INFO, stream << "cant find tokenid" << std::endl); - CCerror = strprintf("cant find tokenid"); - return 0; - } - - struct CCcontract_info *cp, C; - cp = CCinit(&C, EVAL_TOKENS); - return(AddTokenCCInputs(cp, mtx, pk, tokenid, 0, 0)); -} - -UniValue TokenInfo(uint256 tokenid) -{ - UniValue result(UniValue::VOBJ); - uint256 hashBlock; - CTransaction tokenbaseTx; - std::vector origpubkey; - std::vector> oprets; - vscript_t vopretNonfungible; - std::string name, description; - struct CCcontract_info *cpTokens, tokensCCinfo; - - cpTokens = CCinit(&tokensCCinfo, EVAL_TOKENS); - - if( !myGetTransaction(tokenid, tokenbaseTx, hashBlock) ) - { - fprintf(stderr, "TokenInfo() cant find tokenid\n"); - result.push_back(Pair("result", "error")); - result.push_back(Pair("error", "cant find tokenid")); - return(result); - } - if ( HUSH_NSPV_FULLNODE && hashBlock.IsNull()) { - result.push_back(Pair("result", "error")); - result.push_back(Pair("error", "the transaction is still in mempool")); - return(result); - } - - if (tokenbaseTx.vout.size() > 0 && DecodeTokenCreateOpRet(tokenbaseTx.vout[tokenbaseTx.vout.size() - 1].scriptPubKey, origpubkey, name, description, oprets) != 'c') - { - LOGSTREAM((char *)"cctokens", CCLOG_INFO, stream << "TokenInfo() passed tokenid isnt token creation txid" << std::endl); - result.push_back(Pair("result", "error")); - result.push_back(Pair("error", "tokenid isnt token creation txid")); - return result; - } - result.push_back(Pair("result", "success")); - result.push_back(Pair("tokenid", tokenid.GetHex())); - result.push_back(Pair("owner", HexStr(origpubkey))); - result.push_back(Pair("name", name)); - - int64_t supply = 0, output; - for (int v = 0; v < tokenbaseTx.vout.size() - 1; v++) - if ((output = IsTokensvout(false, true, cpTokens, NULL, tokenbaseTx, v, tokenid)) > 0) - supply += output; - result.push_back(Pair("supply", supply)); - result.push_back(Pair("description", description)); - - GetOpretBlob(oprets, OPRETID_NONFUNGIBLEDATA, vopretNonfungible); - if( !vopretNonfungible.empty() ) - result.push_back(Pair("data", HexStr(vopretNonfungible))); - - if (tokenbaseTx.IsCoinImport()) { // if imported token - ImportProof proof; - CTransaction burnTx; - std::vector payouts; - CTxDestination importaddress; - - std::string sourceSymbol = "can't decode"; - std::string sourceTokenId = "can't decode"; - - if (UnmarshalImportTx(tokenbaseTx, proof, burnTx, payouts)) - { - // extract op_return to get burn source chain. - std::vector burnOpret; - std::string targetSymbol; - uint32_t targetCCid; - uint256 payoutsHash; - std::vector rawproof; - if (UnmarshalBurnTx(burnTx, targetSymbol, &targetCCid, payoutsHash, rawproof)) { - if (rawproof.size() > 0) { - CTransaction tokenbasetx; - E_UNMARSHAL(rawproof, ss >> sourceSymbol; - if (!ss.eof()) - ss >> tokenbasetx); - - if (!tokenbasetx.IsNull()) - sourceTokenId = tokenbasetx.GetHash().GetHex(); - } - } - } - result.push_back(Pair("IsImported", "yes")); - result.push_back(Pair("sourceChain", sourceSymbol)); - result.push_back(Pair("sourceTokenId", sourceTokenId)); - } - - return result; -} - -UniValue TokenList() -{ - UniValue result(UniValue::VARR); - std::vector txids; - std::vector > addressIndexCCMarker; - - struct CCcontract_info *cp, C; uint256 txid, hashBlock; - CTransaction vintx; std::vector origpubkey; - std::string name, description; - - cp = CCinit(&C, EVAL_TOKENS); - - auto addTokenId = [&](uint256 txid) { - if (myGetTransaction(txid, vintx, hashBlock) != 0) { - if (vintx.vout.size() > 0 && DecodeTokenCreateOpRet(vintx.vout[vintx.vout.size() - 1].scriptPubKey, origpubkey, name, description) != 0) { - result.push_back(txid.GetHex()); - } - } - }; - - SetCCtxids(txids, cp->normaladdr,false,cp->evalcode,zeroid,'c'); // find by old normal addr marker - for (std::vector::const_iterator it = txids.begin(); it != txids.end(); it++) { - addTokenId(*it); - } - - SetCCunspents(addressIndexCCMarker, cp->unspendableCCaddr,true); // find by burnable validated cc addr marker - for (std::vector >::const_iterator it = addressIndexCCMarker.begin(); it != addressIndexCCMarker.end(); it++) { - addTokenId(it->first.txhash); - } - - return(result); -} diff --git a/src/cc/assets.cpp b/src/cc/assets.cpp index d2ec4f21b..32e3482d3 100644 --- a/src/cc/assets.cpp +++ b/src/cc/assets.cpp @@ -19,448 +19,8 @@ #include "CCassets.h" #include "CCtokens.h" -/* - Assets can be created or transferred. - - native coins are also locked in the EVAL_ASSETS address, so we need a strict rule on when utxo in the special address are native coins and when they are assets. The specific rule that must not be violated is that vout0 for 'b'/'B' funcid are native coins. All other utxo locked in the special address are assets. - - To create an asset use CC EVAL_ASSETS to create a transaction where vout[0] funds the assets. Externally each satoshi can be interpreted to represent 1 asset, or 100 million satoshis for one asset with 8 decimals, and the other decimals in between. The interpretation of the number of decimals is left to the higher level usages. - - Once created, the assetid is the txid of the create transaction and using the assetid/0 it can spend the assets to however many outputs it creates. The restriction is that the last output must be an opreturn with the assetid. The sum of all but the first output needs to add up to the total assetoshis input. The first output is ignored and used for change from txfee. - - What this means is that vout 0 of the creation txid and vouts 1 ... n-2 for transfer vouts are assetoshi outputs. - - There is a special type of transfer to an unspendable address, that locks the asset and creates an offer for all. The details specified in the opreturn. In order to be compatible with the signing restrictions, the "unspendable" address is actually an address whose privkey is known to all. Funds sent to this address can only be spent if the swap parameters are fulfilled, or if the original pubkey cancels the offer by spending it. - - Types of transactions: - create name:description -> txid for assetid - transfer -> [{address:amount}, ... ] // like withdraw api - selloffer -> cancel or fillsell -> mempool txid or rejected, might not confirm - buyoffer -> cancelbuy or fillbuy -> mempool txid or rejected, might not confirm - exchange -> cancel or fillexchange -> mempool txid or rejected, might not confirm - - assetsaddress // all assets end up in a special address for each pubkey - assetbalance - assetutxos - assetsbalances - asks - bids - swaps - - valid CC output: create or transfer or buyoffer or selloffer or exchange or cancel or fill - - - buyoffer: - vins.*: normal inputs (bid + change) - vout.0: amount of bid to unspendable - vout.1: CC output for marker - vout.2: normal output for change (if any) - vout.n-1: opreturn [EVAL_ASSETS] ['b'] [assetid] [amount of asset required] [origpubkey] - - cancelbuy: - vin.0: normal input - vin.1: unspendable.(vout.0 from buyoffer) buyTx.vout[0] - vin.2: CC marker from buyoffer for txfee - vout.0: vin.1 value to original pubkey buyTx.vout[0].nValue -> [origpubkey] - vout.1: vin.2 back to users pubkey - vout.2: normal output for change (if any) - vout.n-1: opreturn [EVAL_ASSETS] ['o'] [assetid] 0 0 [origpubkey] - - fillbuy: - vin.0: normal input - vin.1: unspendable.(vout.0 from buyoffer) buyTx.vout[0] - vin.2+: valid CC output satisfies buyoffer (*tx.vin[2])->nValue - vout.0: remaining amount of bid to unspendable - vout.1: vin.1 value to signer of vin.2 - vout.2: vin.2 assetoshis to original pubkey - vout.3: CC output for assetoshis change (if any) - vout.4: normal output for change (if any) - vout.n-1: opreturn [EVAL_ASSETS] ['B'] [assetid] [remaining asset required] [origpubkey] - - selloffer: - vin.0: normal input - vin.1+: valid CC output for sale - vout.0: vin.1 assetoshis output to CC to unspendable - vout.1: CC output for marker - vout.2: CC output for change (if any) - vout.3: normal output for change (if any) - vout.n-1: opreturn [EVAL_ASSETS] ['s'] [assetid] [amount of native coin required] [origpubkey] - - exchange: - vin.0: normal input - vin.1+: valid CC output - vout.0: vin.1 assetoshis output to CC to unspendable - vout.1: CC output for change (if any) - vout.2: normal output for change (if any) - vout.n-1: opreturn [EVAL_ASSETS] ['e'] [assetid] [assetid2] [amount of asset2 required] [origpubkey] - - cancel: - vin.0: normal input - vin.1: unspendable.(vout.0 from exchange or selloffer) sellTx/exchangeTx.vout[0] inputTx - vin.2: CC marker from selloffer for txfee - vout.0: vin.1 assetoshis to original pubkey CC sellTx/exchangeTx.vout[0].nValue -> [origpubkey] - vout.1: vin.2 back to users pubkey - vout.2: normal output for change (if any) - vout.n-1: opreturn [EVAL_ASSETS] ['x'] [assetid] - - fillsell: - vin.0: normal input - vin.1: unspendable.(vout.0 assetoshis from selloffer) sellTx.vout[0] - vin.2+: normal output that satisfies selloffer (*tx.vin[2])->nValue - vout.0: remaining assetoshis -> unspendable - vout.1: vin.1 assetoshis to signer of vin.2 sellTx.vout[0].nValue -> any - vout.2: vin.2 value to original pubkey [origpubkey] - vout.3: CC asset for change (if any) - vout.4: CC asset2 for change (if any) 'E' only - vout.5: normal output for change (if any) - vout.n-1: opreturn [EVAL_ASSETS] ['S'] [assetid] [amount of coin still required] [origpubkey] - - fillexchange: - vin.0: normal input - vin.1: unspendable.(vout.0 assetoshis from exchange) exchangeTx.vout[0] - vin.2+: valid CC assetid2 output that satisfies exchange (*tx.vin[2])->nValue - vout.0: remaining assetoshis -> unspendable - vout.1: vin.1 assetoshis to signer of vin.2 exchangeTx.vout[0].nValue -> any - vout.2: vin.2 assetoshis2 to original pubkey [origpubkey] - vout.3: normal output for change (if any) - vout.n-1: opreturn [EVAL_ASSETS] ['E'] [assetid vin0+1] [assetid vin2] [remaining asset2 required] [origpubkey] -*/ - - - - // tx validation bool AssetsValidate(struct CCcontract_info *cpAssets,Eval* eval,const CTransaction &tx, uint32_t nIn) { - static uint256 zero; - CTxDestination address; - CTransaction vinTx, createTx; - uint256 hashBlock, assetid, assetid2; - int32_t i,starti, numvins, numvouts, preventCCvins, preventCCvouts; - int64_t remaining_price, nValue, assetoshis, outputsDummy,inputs,tmpprice,totalunits,ignore; - std::vector origpubkey, tmporigpubkey, ignorepubkey, vopretNonfungible, vopretNonfungibleDummy; - uint8_t funcid, evalCodeInOpret; - char destaddr[64], origNormalAddr[64], origTokensCCaddr[64], origCCaddrDummy[64]; - char tokensDualEvalUnspendableCCaddr[64], origAssetsCCaddr[64]; - - //return true; - - numvins = tx.vin.size(); - numvouts = tx.vout.size(); - outputsDummy = inputs = 0; - preventCCvins = preventCCvouts = -1; - - if (numvouts == 0) - return eval->Invalid("AssetValidate: no vouts"); - - if((funcid = DecodeAssetTokenOpRet(tx.vout[numvouts-1].scriptPubKey, evalCodeInOpret, assetid, assetid2, remaining_price, origpubkey)) == 0 ) - return eval->Invalid("AssetValidate: invalid opreturn payload"); - - // non-fungible tokens support: - GetNonfungibleData(assetid, vopretNonfungible); - if (vopretNonfungible.size() > 0) - cpAssets->additionalTokensEvalcode2 = vopretNonfungible.begin()[0]; - - // find dual-eval tokens unspendable addr: - GetTokensCCaddress(cpAssets, tokensDualEvalUnspendableCCaddr, GetUnspendable(cpAssets, NULL)); - // this is for marker validation: - GetCCaddress(cpAssets, origAssetsCCaddr, origpubkey); - - // we need this for validating single-eval tokens' vins/vous: - struct CCcontract_info *cpTokens, tokensC; - cpTokens = CCinit(&tokensC, EVAL_TOKENS); - - // find single-eval token user cc addr: - //GetCCaddress(cpTokens, signleEvalTokensCCaddr, pubkey2pk(origpubkey)); - - //fprintf(stderr,"AssetValidate (%c)\n",funcid); - - if( funcid != 'o' && funcid != 'x' && eval->GetTxUnconfirmed(assetid, createTx, hashBlock) == 0 ) - return eval->Invalid("cant find asset create txid"); - else if( funcid != 'o' && funcid != 'x' && assetid2 != zero && eval->GetTxUnconfirmed(assetid2, createTx, hashBlock) == 0 ) - return eval->Invalid("cant find asset2 create txid"); - else if( IsCCInput(tx.vin[0].scriptSig) != 0 ) // vin0 should be normal vin - return eval->Invalid("illegal asset vin0"); - else if( numvouts < 2 ) - return eval->Invalid("too few vouts"); // it was if(numvouts < 1) but it refers at least to vout[1] below - else if( funcid != 'c' ) - { - /* if( funcid == 't' ) - starti = 0; - else - starti = 1; */ - - if( assetid == zero ) - return eval->Invalid("illegal assetid"); - - else if (!AssetCalcAmounts(cpAssets, inputs, outputsDummy/*outputsDummy is calculated incorrectly but not used*/, eval, tx, assetid)) { // Only set inputs and outputs. NOTE: we do not need to check cc inputs == cc outputs - return false; // returns false if some problems with reading vintxes - } - } - - switch( funcid ) - { - case 'c': // create wont be called to be verified as it has no CC inputs - //vin.0: normal input - //vout.0: issuance assetoshis to CC - //vout.1: normal output for change (if any) - //vout.n-1: opreturn [EVAL_ASSETS] ['c'] [{"":""}] - //if (evalCodeInOpret == EVAL_ASSETS) - // return eval->Invalid("unexpected AssetValidate for createasset"); - // return - return eval->Invalid("invalid asset funcid \'c\'"); - break; - case 't': // transfer - //vin.0: normal input - //vin.1 .. vin.n-1: valid CC outputs - //vout.0 to n-2: assetoshis output to CC - //vout.n-2: normal output for change (if any) - //vout.n-1: opreturn [EVAL_ASSETS] ['t'] [assetid] - //if (inputs == 0) - // return eval->Invalid("no asset inputs for transfer"); - //fprintf(stderr,"transfer preliminarily validated %.8f -> %.8f (%d %d)\n",(double)inputs/COIN,(double)outputs/COIN,preventCCvins,preventCCvouts); - return eval->Invalid("invalid asset funcid \'t\'"); - break; - - case 'b': // buyoffer - //vins.*: normal inputs (bid + change) - //vout.0: amount of bid to unspendable - //vout.1: CC output for marker - //vout.2: normal output for change (if any) - // vout.n-1: opreturn [EVAL_ASSETS] ['b'] [assetid] [amount of asset required] [origpubkey] - - // as we don't use tokenconvert we should not be here: - return eval->Invalid("invalid asset funcid (b)"); - - if( remaining_price == 0 ) - return eval->Invalid("illegal null amount for buyoffer"); - else if( ConstrainVout(tx.vout[0], 1, cpAssets->unspendableCCaddr,0) == 0 ) // coins to assets unspendable cc addr - return eval->Invalid("invalid vout for buyoffer"); - preventCCvins = 1; - preventCCvouts = 1; - fprintf(stderr,"buy offer validated to destaddr.(%s)\n",cpAssets->unspendableCCaddr); - break; - - case 'o': // cancelbuy - //vin.0: normal input - //vin.1: unspendable.(vout.0 from buyoffer) buyTx.vout[0] - //vin.2: CC marker from buyoffer for txfee - //vout.0: vin.1 value to original pubkey buyTx.vout[0].nValue -> [origpubkey] - //vout.1: vin.2 back to users pubkey - //vout.2: normal output for change (if any) - //vout.n-1: opreturn [EVAL_ASSETS] ['o'] - if( (nValue= AssetValidateBuyvin(cpAssets, eval, tmpprice, tmporigpubkey, origCCaddrDummy, origNormalAddr, tx, assetid)) == 0 ) - return(false); - else if( ConstrainVout(tx.vout[0],0, origNormalAddr, nValue) == 0 ) - return eval->Invalid("invalid refund for cancelbuy"); - preventCCvins = 3; - preventCCvouts = 0; - //fprintf(stderr,"cancelbuy validated to origaddr.(%s)\n",origNormalAddr); - break; - - case 'B': // fillbuy: - //vin.0: normal input - //vin.1: unspendable.(vout.0 from buyoffer) buyTx.vout[0] - //vin.2+: valid CC output satisfies buyoffer (*tx.vin[2])->nValue - //vout.0: remaining amount of bid to unspendable - //vout.1: vin.1 value to signer of vin.2 - //vout.2: vin.2 assetoshis to original pubkey - //vout.3: CC output for assetoshis change (if any) - //vout.4: normal output for change (if any) - //vout.n-1: opreturn [EVAL_ASSETS] ['B'] [assetid] [remaining asset required] [origpubkey] - preventCCvouts = 4; - - if( (nValue = AssetValidateBuyvin(cpAssets, eval, totalunits, tmporigpubkey, origTokensCCaddr, origNormalAddr, tx, assetid)) == 0 ) - return(false); - else if( numvouts < 4 ) - return eval->Invalid("not enough vouts for fillbuy"); - else if( tmporigpubkey != origpubkey ) - return eval->Invalid("mismatched origpubkeys for fillbuy"); - else - { - if( nValue != tx.vout[0].nValue + tx.vout[1].nValue ) - return eval->Invalid("locked value doesnt match vout0+1 fillbuy"); - else if( tx.vout[4].scriptPubKey.IsPayToCryptoCondition() != 0 ) // if cc change present - { - if( ConstrainVout(tx.vout[2], 1, origTokensCCaddr, 0) == 0 ) // tokens to originator cc addr (tokens+nonfungible evals) - return eval->Invalid("vout2 doesnt go to origpubkey fillbuy"); - else if ( inputs != tx.vout[2].nValue + tx.vout[4].nValue ) - return eval->Invalid("asset inputs doesnt match vout2+3 fillbuy"); - preventCCvouts ++; - } - else if( ConstrainVout(tx.vout[2], 1, origTokensCCaddr, inputs) == 0 ) // tokens to originator cc addr (tokens+nonfungible evals) - return eval->Invalid("vout2 doesnt match inputs fillbuy"); - else if( ConstrainVout(tx.vout[1], 0, NULL, 0) == 0 ) - return eval->Invalid("vout1 is CC for fillbuy"); - else if( ConstrainVout(tx.vout[3], 1, origAssetsCCaddr, 10000) == 0 ) // marker to asset cc addr - return eval->Invalid("invalid marker for original pubkey"); - else if( ValidateBidRemainder(remaining_price, tx.vout[0].nValue, nValue, tx.vout[1].nValue, tx.vout[2].nValue, totalunits) == false ) - return eval->Invalid("mismatched remainder for fillbuy"); - else if( remaining_price != 0 ) - { - if( ConstrainVout(tx.vout[0], 1, cpAssets->unspendableCCaddr, 0) == 0 ) // coins to asset unspendable cc addr - return eval->Invalid("mismatched vout0 AssetsCCaddr for fillbuy"); - } - } - //fprintf(stderr,"fillbuy validated\n"); - break; - //case 'e': // selloffer - // break; // disable swaps - case 's': // selloffer - //vin.0: normal input - //vin.1+: valid CC output for sale - //vout.0: vin.1 assetoshis output to CC to unspendable - //vout.1: CC output for marker - //vout.2: CC output for change (if any) - //vout.3: normal output for change (if any) - //'s'.vout.n-1: opreturn [EVAL_ASSETS] ['s'] [assetid] [amount of native coin required] [origpubkey] - //'e'.vout.n-1: opreturn [EVAL_ASSETS] ['e'] [assetid] [assetid2] [amount of asset2 required] [origpubkey] - - // as we don't use tokenconvert we should not be here: - return eval->Invalid("invalid asset funcid (s)"); - - preventCCvouts = 2; - if( remaining_price == 0 ) - return eval->Invalid("illegal null remaining_price for selloffer"); - if ( tx.vout[1].scriptPubKey.IsPayToCryptoCondition() == 0 ) - return eval->Invalid("invalid normal vout1 for sellvin"); - if( tx.vout[2].scriptPubKey.IsPayToCryptoCondition() != 0 ) // if cc change presents - { - preventCCvouts++; - if( ConstrainVout(tx.vout[0], 1, (char *)cpTokens->unspendableCCaddr, 0) == 0 ) // tokens to tokens unspendable cc addr. TODO: this in incorrect, should be assets if we got here! - return eval->Invalid("mismatched vout0 TokensCCaddr for selloffer"); - else if( tx.vout[0].nValue + tx.vout[2].nValue != inputs ) - return eval->Invalid("mismatched vout0+vout2 total for selloffer"); - } - // no cc change: - else if( ConstrainVout(tx.vout[0], 1, (char *)cpTokens->unspendableCCaddr, inputs) == 0 ) // tokens to tokens unspendable cc addr TODO: this in incorrect, should be assets if got here! - return eval->Invalid("mismatched vout0 TokensCCaddr for selloffer"); - //fprintf(stderr,"remaining.%d for sell\n",(int32_t)remaining_price); - break; - - case 'x': // cancel sell - //vin.0: normal input - //vin.1: unspendable.(vout.0 from exchange or selloffer) sellTx/exchangeTx.vout[0] inputTx - //vin.2: CC marker from selloffer for txfee - //vout.0: vin.1 assetoshis to original pubkey CC sellTx/exchangeTx.vout[0].nValue -> [origpubkey] - //vout.1: vin.2 back to users pubkey - //vout.2: normal output for change (if any) - //vout.n-1: opreturn [EVAL_ASSETS] ['x'] [assetid] - - if( (assetoshis = AssetValidateSellvin(cpAssets, eval, tmpprice, tmporigpubkey, origTokensCCaddr, origNormalAddr, tx, assetid)) == 0 ) // NOTE: - return(false); - else if( ConstrainVout(tx.vout[0], 1, origTokensCCaddr, assetoshis) == 0 ) // tokens returning to originator cc addr - return eval->Invalid("invalid vout for cancel"); - preventCCvins = 3; - preventCCvouts = 1; - break; - - case 'S': // fillsell - //vin.0: normal input - //vin.1: unspendable.(vout.0 assetoshis from selloffer) sellTx.vout[0] - //'S'.vin.2+: normal output that satisfies selloffer (*tx.vin[2])->nValue - //vout.0: remaining assetoshis -> unspendable - //vout.1: vin.1 assetoshis to signer of vin.2 sellTx.vout[0].nValue -> any - //'S'.vout.2: vin.2 value to original pubkey [origpubkey] - //vout.3: normal output for change (if any) - //'S'.vout.n-1: opreturn [EVAL_ASSETS] ['S'] [assetid] [amount of coin still required] [origpubkey] - - if( (assetoshis = AssetValidateSellvin(cpAssets, eval, totalunits, tmporigpubkey, origTokensCCaddr, origNormalAddr, tx, assetid)) == 0 ) - return(false); - else if( numvouts < 4 ) - return eval->Invalid("not enough vouts for fillask"); - else if( tmporigpubkey != origpubkey ) - return eval->Invalid("mismatched origpubkeys for fillask"); - else - { - if( assetoshis != tx.vout[0].nValue + tx.vout[1].nValue ) - return eval->Invalid("locked value doesnt match vout0+1 fillask"); - if( ValidateAskRemainder(remaining_price, tx.vout[0].nValue, assetoshis, tx.vout[1].nValue, tx.vout[2].nValue, totalunits) == false ) - return eval->Invalid("mismatched remainder for fillask"); - else if( ConstrainVout(tx.vout[1], 1, NULL, 0) == 0 ) // do not check token buyer's cc addr - return eval->Invalid("normal vout1 for fillask"); - else if( ConstrainVout(tx.vout[2], 0, origNormalAddr, 0) == 0 ) // coins to originator normal addr - return eval->Invalid("normal vout1 for fillask"); - else if( ConstrainVout(tx.vout[3], 1, origAssetsCCaddr, 10000) == 0 ) // marker to originator asset cc addr - return eval->Invalid("invalid marker for original pubkey"); - else if( remaining_price != 0 ) - { - if ( ConstrainVout(tx.vout[0], 1, tokensDualEvalUnspendableCCaddr, 0) == 0 ) - return eval->Invalid("mismatched vout0 assets dual unspendable CCaddr for fill sell"); - } - } - //fprintf(stderr,"fill validated\n"); - break; - case 'E': // fillexchange - ////////// not implemented yet //////////// - return eval->Invalid("unexpected assets fillexchange funcid"); - break; // disable asset swaps - //vin.0: normal input - //vin.1: unspendable.(vout.0 assetoshis from selloffer) sellTx.vout[0] - //vin.2+: valid CC assetid2 output that satisfies exchange (*tx.vin[2])->nValue - //vout.0: remaining assetoshis -> unspendable - //vout.1: vin.1 assetoshis to signer of vin.2 sellTx.vout[0].nValue -> any - //vout.2: vin.2+ assetoshis2 to original pubkey [origpubkey] - //vout.3: CC output for asset2 change (if any) - //vout.3/4: normal output for change (if any) - //vout.n-1: opreturn [EVAL_ASSETS] ['E'] [assetid vin0+1] [assetid vin2] [remaining asset2 required] [origpubkey] - - //if ( AssetExactAmounts(false, cp,inputs,outputs,eval,tx,assetid2) == false ) - // eval->Invalid("asset2 inputs != outputs"); - - ////////// not implemented yet //////////// - if( (assetoshis= AssetValidateSellvin(cpTokens, eval, totalunits, tmporigpubkey, origTokensCCaddr, origNormalAddr, tx, assetid)) == 0 ) - return(false); - else if( numvouts < 3 ) - return eval->Invalid("not enough vouts for fillex"); - else if( tmporigpubkey != origpubkey ) - return eval->Invalid("mismatched origpubkeys for fillex"); - else - { - if( assetoshis != tx.vout[0].nValue + tx.vout[1].nValue ) - return eval->Invalid("locked value doesnt match vout0+1 fillex"); - else if( tx.vout[3].scriptPubKey.IsPayToCryptoCondition() != 0 ) - ////////// not implemented yet //////////// - { - if( ConstrainVout(tx.vout[2], 1, origTokensCCaddr, 0) == 0 ) - return eval->Invalid("vout2 doesnt go to origpubkey fillex"); - else if( inputs != tx.vout[2].nValue + tx.vout[3].nValue ) - { - fprintf(stderr,"inputs %.8f != %.8f + %.8f\n",(double)inputs/COIN,(double)tx.vout[2].nValue/COIN,(double)tx.vout[3].nValue/COIN); - return eval->Invalid("asset inputs doesnt match vout2+3 fillex"); - } - } - ////////// not implemented yet //////////// - else if( ConstrainVout(tx.vout[2], 1, origTokensCCaddr, inputs) == 0 ) - return eval->Invalid("vout2 doesnt match inputs fillex"); - else if( ConstrainVout(tx.vout[1], 0, 0, 0) == 0 ) - return eval->Invalid("vout1 is CC for fillex"); - fprintf(stderr,"assets vout0 %llu, vin1 %llu, vout2 %llu -> orig, vout1 %llu, total %llu\n",(long long)tx.vout[0].nValue,(long long)assetoshis,(long long)tx.vout[2].nValue,(long long)tx.vout[1].nValue,(long long)totalunits); - if( ValidateSwapRemainder(remaining_price, tx.vout[0].nValue, assetoshis,tx.vout[1].nValue, tx.vout[2].nValue, totalunits) == false ) - return eval->Invalid("mismatched remainder for fillex"); - else if( ConstrainVout(tx.vout[1], 1, 0, 0) == 0 ) - ////////// not implemented yet //////////// - return eval->Invalid("normal vout1 for fillex"); - else if( remaining_price != 0 ) - { - if( ConstrainVout(tx.vout[0], 1, (char *)cpAssets->unspendableCCaddr, 0) == 0 ) // TODO: unsure about this, but this is not impl yet anyway - return eval->Invalid("mismatched vout0 AssetsCCaddr for fillex"); - } - } - ////////// not implemented yet //////////// - //fprintf(stderr,"fill validated\n"); - break; - - default: - fprintf(stderr,"illegal assets funcid.(%c)\n",funcid); - return eval->Invalid("unexpected assets funcid"); - //break; - } - - // what does this do? - bool bPrevent = PreventCC(eval, tx, preventCCvins, numvins, preventCCvouts, numvouts); // seems we do not need this call as we already checked vouts well - //std::cerr << "AssetsValidate() PreventCC returned=" << bPrevent << std::endl; - return (bPrevent); + return false; } - - diff --git a/src/cc/cclib.cpp b/src/cc/cclib.cpp index b807f8113..e35ec8c9d 100644 --- a/src/cc/cclib.cpp +++ b/src/cc/cclib.cpp @@ -26,7 +26,6 @@ #include "main.h" #include "chain.h" #include "core_io.h" -#include "crosschain.h" #define FAUCET2SIZE COIN #define EVAL_FAUCET2 EVAL_FIRSTUSER #ifdef BUILD_ROGUE @@ -642,50 +641,10 @@ int32_t cclib_parsehash(uint8_t *hash32,cJSON *item,int32_t len) } else return(-1); } -#ifdef BUILD_ROGUE -#include "rogue_rpc.cpp" -#include "rogue/cursesd.c" -#include "rogue/vers.c" -#include "rogue/extern.c" -#include "rogue/armor.c" -#include "rogue/chase.c" -#include "rogue/command.c" -#include "rogue/daemon.c" -#include "rogue/daemons.c" -#include "rogue/fight.c" -#include "rogue/init.c" -#include "rogue/io.c" -#include "rogue/list.c" -#include "rogue/mach_dep.c" -#include "rogue/rogue.c" -#include "rogue/xcrypt.c" -#include "rogue/mdport.c" -#include "rogue/misc.c" -#include "rogue/monsters.c" -#include "rogue/move.c" -#include "rogue/new_level.c" -#include "rogue/options.c" -#include "rogue/pack.c" -#include "rogue/passages.c" -#include "rogue/potions.c" -#include "rogue/rings.c" -#include "rogue/rip.c" -#include "rogue/rooms.c" -#include "rogue/save.c" -#include "rogue/scrolls.c" -#include "rogue/state.c" -#include "rogue/sticks.c" -#include "rogue/things.c" -#include "rogue/weapons.c" -#include "rogue/wizard.c" -#elif BUILD_CUSTOMCC +#if BUILD_CUSTOMCC #include "customcc.cpp" -#elif BUILD_GAMESCC -#include "rogue/cursesd.c" -#include "gamescc.cpp" - #else #include "musig.cpp" #include "dilithium.c" diff --git a/src/cc/eval.cpp b/src/cc/eval.cpp index e490781b2..c4b3cde79 100644 --- a/src/cc/eval.cpp +++ b/src/cc/eval.cpp @@ -103,6 +103,7 @@ bool Eval::Dispatch(const CC *cond, const CTransaction &txTo, unsigned int nIn) switch ( ecode ) { + /* case EVAL_IMPORTPAYOUT: return ImportPayout(vparams, txTo, nIn); break; @@ -110,7 +111,7 @@ bool Eval::Dispatch(const CC *cond, const CTransaction &txTo, unsigned int nIn) case EVAL_IMPORTCOIN: return ImportCoin(vparams, txTo, nIn); break; - + */ default: return(ProcessCC(cp,this, vparams, txTo, nIn)); break; diff --git a/src/cc/gamescc.cpp b/src/cc/gamescc.cpp deleted file mode 100644 index ad1364c11..000000000 --- a/src/cc/gamescc.cpp +++ /dev/null @@ -1,1813 +0,0 @@ -// Copyright (c) 2016-2023 The Hush developers -// Distributed under the GPLv3 software license, see the accompanying -// file COPYING or https://www.gnu.org/licenses/gpl-3.0.en.html -/****************************************************************************** - * Copyright © 2014-2019 The SuperNET Developers. * - * * - * See the AUTHORS, DEVELOPER-AGREEMENT and LICENSE files at * - * the top-level directory of this distribution for the individual copyright * - * holder information and the developer policies on copyright and licensing. * - * * - * Unless otherwise agreed in a custom licensing agreement, no part of the * - * SuperNET software, including this file may be copied, modified, propagated * - * or distributed except according to the terms contained in the LICENSE file * - * * - * Removal or modification of this copyright notice is prohibited. * - * * - ******************************************************************************/ - -#include "gamescc.h" -#ifdef BUILD_PRICES -#include "games/prices.c" -#else -#include "games/tetris.c" -#endif - -int32_t GAMEDATA(struct games_player *P,void *ptr); - -uint64_t _games_rngnext(uint64_t initseed) -{ - uint16_t seeds[4]; int32_t i; - seeds[0] = initseed; - seeds[1] = (initseed >> 16); - seeds[2] = (initseed >> 32); - seeds[3] = (initseed >> 48); - seeds[0] = (seeds[0]*GAMES_RNGMULT + GAMES_RNGOFFSET); - seeds[1] = ((seeds[0] ^ seeds[1])*GAMES_RNGMULT + GAMES_RNGOFFSET); - seeds[2] = ((seeds[0] ^ seeds[1] ^ seeds[2])*GAMES_RNGMULT + GAMES_RNGOFFSET); - seeds[3] = ((seeds[0] ^ seeds[1] ^ seeds[2] ^ seeds[3])*GAMES_RNGMULT + GAMES_RNGOFFSET); - return(((uint64_t)seeds[3] << 48) | ((uint64_t)seeds[2] << 24) | ((uint64_t)seeds[1] << 16) | seeds[0]); -} - -gamesevent games_revendian(gamesevent revx) -{ - int32_t i; gamesevent x = 0; - //fprintf(stderr,"%04x -> ",revx); - for (i=0; iguiflag == 0 ) - { - static uint32_t counter; - if ( rs->ind < rs->numkeys ) - { - ch = rs->keystrokes[rs->ind++]; - if ( 0 ) - { - static FILE *fp; static int32_t counter; - if ( fp == 0 ) - fp = fopen("log","wb"); - if ( fp != 0 ) - { - fprintf(fp,"%d: (%c) seed.%llu\n",counter,c,(long long)rs->origseed); - fflush(fp); - counter++; - } - } - return(ch); - } - if ( rs->replaydone != 0 && counter++ < 3 ) - fprintf(stderr,"replay finished but readchar called\n"); - rs->replaydone = (uint32_t)time(NULL); - return(0); - } - if ( rs == 0 || rs->guiflag != 0 ) - { - c = getch(); - switch ( c ) - { - case KEY_LEFT: - c = 'h'; - break; - case KEY_RIGHT: - c = 'l'; - break; - case KEY_UP: - c = 'k'; - break; - case KEY_DOWN: - c = 'j'; - break; - } - ch = c; - if (ch == 3) - { - //_quit(); - return(27); - } - } else fprintf(stderr,"readchar rs.%p non-gui error?\n",rs); - return(ch); -} - -int32_t games_replay2(uint8_t *newdata,uint64_t seed,gamesevent *keystrokes,int32_t num,struct games_player *player,int32_t sleepmillis) -{ - struct games_state *rs; FILE *fp; int32_t i,n; void *ptr; - rs = (struct games_state *)calloc(1,sizeof(*rs)); - rs->seed = rs->origseed = seed; - rs->keystrokes = keystrokes; - rs->numkeys = num; - rs->sleeptime = sleepmillis * 1000; - if ( player != 0 ) - { - rs->P = *player; - rs->restoring = 1; - if ( rs->P.packsize > MAXPACK ) - rs->P.packsize = MAXPACK; - } - globalR = *rs; - uint32_t starttime = (uint32_t)time(NULL); - ptr = gamesiterate(rs); - if ( 0 ) - { - fprintf(stderr,"elapsed %d seconds\n",(uint32_t)time(NULL) - starttime); - sleep(2); - starttime = (uint32_t)time(NULL); - for (i=0; i<10000; i++) - { - memset(rs,0,sizeof(*rs)); - rs->seed = rs->origseed = seed; - rs->keystrokes = keystrokes; - rs->numkeys = num; - rs->sleeptime = 0; - gamesiterate(rs); - } - fprintf(stderr,"elapsed %d seconds\n",(uint32_t)time(NULL)-starttime); - sleep(3); - } - // extract playerdata - - /*if ( (fp= fopen("checkfile","wb")) != 0 ) - { - //save_file(rs,fp,0); - if ( newdata != 0 && rs->playersize > 0 ) - memcpy(newdata,rs->playerdata,rs->playersize); - }*/ - if ( ptr != 0 ) - { - // extract data from ptr - if ( GAMEDATA(&rs->P,ptr) < 0 ) - memset(&rs->P,0,sizeof(rs->P)); - else - { - rs->playersize = sizeof(rs->P); - if ( newdata != 0 ) - memcpy(newdata,&rs->P,rs->playersize); - } - free(ptr); - } - n = rs->playersize; - //fprintf(stderr,"gold.%d\n",rs->P.gold); sleep(3); - free(rs); - return(n); -} - -#ifndef STANDALONE -#ifdef BUILD_PRICES -#include "games/prices.cpp" -#else -#include "games/tetris.cpp" -#endif - -void GAMEJSON(UniValue &obj,struct games_player *P); - -/* -./c cclib rng 17 \"[%229433dc3749aece1bd568f374a45da3b0bc6856990d7da3cd175399577940a775%22,250]\" -{ - "playerid": 250, - "seed": 1398876319979341887, - "rng": 14565767519458298868, - "lastrng": 15075236803740723044, - "maxrngs": 10000, - "result": "success" -} - - ./c cclib rngnext 17 \"[14565767519458298868]\" - { - "seed": 14565767519458297856, - "rng": 4253087318999719449, - "result": "success" - } - - The idea is for a game to start with a near future blockhash, so the lobby gets players signed up until just prior to the designated height. then that blockhash can be used to create a stream of rngs. - - the same initial rng can be used for all players, if the identical starting condition is required. up to 255 different initial rng can be derived from a single blockhash. (Actually any number is possible, for simplicity rng rpc limits to 255). - - you will notice maxrngs and lastrng, the lastrng is the rng value that will happen after maxrng iterations of calling rngnext with the current rng. This allows making time based multiplayer games where all the nodes can validate all the other nodes rng, even without realtime synchronization of all user input events. - - Every time period, all players would set their rng value to the lastrng value. The only thing to be careful of is it not exceed the maxrng calls to rngnext in a single time period. otherwise the same set of rng numbers will be repeated. - - events rpc is called after each user event and broadcasts to the network the tuple (gametxid, pk, eventid, payload). This allows the network to verify realtime user events from a specific pk/gametxid and also to make sure no user events were changed. In the event the events were changed, then the guilty pk will be blacklisted. If no realtime events, then the guilty pk would be penalized. - - ./c cclib events 17 \"[%226c%22,%229433dc3749aece1bd568f374a45da3b0bc6856990d7da3cd175399577940a775%22,0]\" - ./c cclib events 17 \"[%226d%22,%229433dc3749aece1bd568f374a45da3b0bc6856990d7da3cd175399577940a775%22,1]\" -*/ - - -CScript games_newgameopret(int64_t buyin,int32_t maxplayers) -{ - CScript opret; uint8_t evalcode = EVAL_GAMES; - opret << OP_RETURN << E_MARSHAL(ss << evalcode << 'G' << buyin << maxplayers); - return(opret); -} - -uint8_t games_newgameopreturndecode(int64_t &buyin,int32_t &maxplayers,CScript scriptPubKey) -{ - std::vector vopret; uint8_t e,f; - GetOpReturnData(scriptPubKey,vopret); - if ( vopret.size() > 2 && E_UNMARSHAL(vopret,ss >> e; ss >> f; ss >> buyin; ss >> maxplayers) != 0 && e == EVAL_GAMES && f == 'G' ) - { - return(f); - } - return(0); -} - -CScript games_registeropret(uint256 gametxid,uint256 playertxid) -{ - CScript opret; uint8_t evalcode = EVAL_GAMES; - //fprintf(stderr,"opret.(%s %s).R\n",gametxid.GetHex().c_str(),playertxid.GetHex().c_str()); - opret << OP_RETURN << E_MARSHAL(ss << evalcode << 'R' << gametxid << playertxid); - return(opret); -} - -CScript games_keystrokesopret(uint256 gametxid,uint256 batontxid,CPubKey pk,std::vectorkeystrokes) -{ - CScript opret; uint8_t evalcode = EVAL_GAMES; - opret << OP_RETURN << E_MARSHAL(ss << evalcode << 'K' << gametxid << batontxid << pk << keystrokes); - return(opret); -} - -uint8_t games_keystrokesopretdecode(uint256 &gametxid,uint256 &batontxid,CPubKey &pk,std::vector &keystrokes,CScript scriptPubKey) -{ - std::vector vopret; uint8_t e,f; - GetOpReturnData(scriptPubKey,vopret); - if ( vopret.size() > 2 && E_UNMARSHAL(vopret,ss >> e; ss >> f; ss >> gametxid; ss >> batontxid; ss >> pk; ss >> keystrokes) != 0 && e == EVAL_GAMES && f == 'K' ) - { - return(f); - } - return(0); -} - -uint8_t games_registeropretdecode(uint256 &gametxid,uint256 &tokenid,uint256 &playertxid,CScript scriptPubKey) -{ - std::string name, description; std::vector vorigPubkey; - std::vector> oprets; - std::vector vopretNonfungible, vopret, vopretDummy,origpubkey; - uint8_t e, f,*script; std::vector voutPubkeys; - tokenid = zeroid; - GetOpReturnData(scriptPubKey, vopret); - script = (uint8_t *)vopret.data(); - if ( script[1] == 'c' && (f= DecodeTokenCreateOpRet(scriptPubKey,origpubkey,name,description,oprets)) == 'c' ) - { - GetOpretBlob(oprets, OPRETID_NONFUNGIBLEDATA, vopretNonfungible); - vopret = vopretNonfungible; - } - else if ( script[1] != 'R' && (f= DecodeTokenOpRet(scriptPubKey, e, tokenid, voutPubkeys, oprets)) != 0 ) - { - GetOpretBlob(oprets, OPRETID_ROGUEGAMEDATA, vopretDummy); // blob from non-creation tx opret - vopret = vopretDummy; - } - if ( vopret.size() > 2 && E_UNMARSHAL(vopret,ss >> e; ss >> f; ss >> gametxid; ss >> playertxid) != 0 && e == EVAL_GAMES && f == 'R' ) - { - return(f); - } - //fprintf(stderr,"e.%d f.%c game.%s playertxid.%s\n",e,f,gametxid.GetHex().c_str(),playertxid.GetHex().c_str()); - return(0); -} - -CScript games_finishopret(uint8_t funcid,uint256 gametxid,int32_t regslot,CPubKey pk,std::vectorplayerdata,std::string pname) -{ - CScript opret; uint8_t evalcode = EVAL_GAMES; std::string symbol(SMART_CHAIN_SYMBOL); - opret << OP_RETURN << E_MARSHAL(ss << evalcode << funcid << gametxid << symbol << pname << regslot << pk << playerdata ); - return(opret); -} - -uint8_t games_finishopretdecode(uint256 &gametxid, uint256 &tokenid, int32_t ®slot, CPubKey &pk, std::vector &playerdata, std::string &symbol, std::string &pname,CScript scriptPubKey) -{ - std::string name, description; std::vector vorigPubkey; - std::vector> oprets, opretsDummy; - std::vector vopretNonfungible, vopret, vopretDummy,origpubkey; - uint8_t e, f,*script; std::vector voutPubkeys; - tokenid = zeroid; - GetOpReturnData(scriptPubKey, vopret); - script = (uint8_t *)vopret.data(); - if ( script[1] == 'c' && (f= DecodeTokenCreateOpRet(scriptPubKey,origpubkey,name,description, oprets)) == 'c' ) - { - GetOpretBlob(oprets, OPRETID_NONFUNGIBLEDATA, vopretNonfungible); - vopret = vopretNonfungible; - } - else if ( script[1] != 'H' && script[1] != 'Q' && (f= DecodeTokenOpRet(scriptPubKey, e, tokenid, voutPubkeys, opretsDummy)) != 0 ) - { - //fprintf(stderr,"decode opret %c tokenid.%s\n",script[1],tokenid.GetHex().c_str()); - GetNonfungibleData(tokenid, vopretNonfungible); //load nonfungible data from the 'tokenbase' tx - vopret = vopretNonfungible; - } - if ( vopret.size() > 2 && E_UNMARSHAL(vopret, ss >> e; ss >> f; ss >> gametxid; ss >> symbol; ss >> pname; ss >> regslot; ss >> pk; ss >> playerdata) != 0 && e == EVAL_GAMES && (f == 'H' || f == 'Q') ) - { - return(f); - } - fprintf(stderr,"SKIP obsolete: e.%d f.%c game.%s regslot.%d psize.%d\n",e,f,gametxid.GetHex().c_str(),regslot,(int32_t)playerdata.size()); - return(0); -} - -CScript games_eventopret(uint32_t timestamp,CPubKey pk,std::vector sig,std::vector payload) -{ - CScript opret; uint8_t evalcode = EVAL_GAMES; - opret << OP_RETURN << E_MARSHAL(ss << evalcode << 'E' << timestamp << pk << sig << payload); - return(opret); -} - -uint8_t games_eventdecode(uint32_t ×tamp,CPubKey &pk,std::vector &sig,std::vector &payload,std::vector vopret) -{ - uint8_t e,f; - timestamp = 0; - if ( vopret.size() > 6 && E_UNMARSHAL(vopret,ss >> e; ss >> f; ss >> timestamp; ss >> pk; ss >> sig; ss >> payload) != 0 && e == EVAL_GAMES ) - { - return(f); - } - fprintf(stderr,"ERROR e.%d f.%d pk.%d sig.%d payload.%d\n",e,f,(int32_t)pk.size(),(int32_t)sig.size(),(int32_t)payload.size()); - return(0); -} - -UniValue games_rawtxresult(UniValue &result,std::string rawtx,int32_t broadcastflag) -{ - CTransaction tx; - if ( rawtx.size() > 0 ) - { - result.push_back(Pair("hex",rawtx)); - if ( DecodeHexTx(tx,rawtx) != 0 ) - { - if ( broadcastflag != 0 && myAddtomempool(tx) != 0 ) - RelayTransaction(tx); - result.push_back(Pair("txid",tx.GetHash().ToString())); - result.push_back(Pair("result","success")); - } else result.push_back(Pair("error","decode hex")); - } else result.push_back(Pair("error","couldnt finalize CCtx")); - return(result); -} - -UniValue games_rngnext(uint64_t txfee,struct CCcontract_info *cp,cJSON *params) -{ - UniValue result(UniValue::VOBJ); int32_t n; uint64_t seed; - if ( params != 0 && (n= cJSON_GetArraySize(params)) == 1 ) - { - seed = jdouble(jitem(params,0),0); - result.push_back(Pair("seed",seed)); - seed = _games_rngnext(seed); - result.push_back(Pair("rng",seed)); - result.push_back(Pair("result","success")); - } - else - { - result.push_back(Pair("result","error")); - result.push_back(Pair("error","not enough params")); - } - return(result); -} - -UniValue games_rng(uint64_t txfee,struct CCcontract_info *cp,cJSON *params) -{ - UniValue result(UniValue::VOBJ); int32_t i,n,playerid=0; uint64_t seed=0,initseed; bits256 hash; - if ( params != 0 && ((n= cJSON_GetArraySize(params)) == 1 || n == 2) ) - { - hash = jbits256(jitem(params,0),0); - if ( n == 2 ) - { - playerid = juint(jitem(params,1),0); - if ( playerid >= 0xff ) - { - result.push_back(Pair("result","error")); - result.push_back(Pair("error","playerid too big")); - return(result); - } - } - playerid++; - for (i=0; i<8; i++) - { - if ( ((1 << i) & playerid) != 0 ) - seed ^= (uint64_t)hash.uints[i] << ((i&1)*32); - } - initseed = seed; - seed = _games_rngnext(initseed); - result.push_back(Pair("playerid",(int64_t)(playerid - 1))); - result.push_back(Pair("seed",initseed)); - result.push_back(Pair("rng",seed)); - for (i=0; i &sig,std::vector payload,CPubKey pk) -{ - static secp256k1_context *ctx; - size_t siglen = 74; secp256k1_pubkey pubkey; secp256k1_ecdsa_signature signature; int32_t len,verifyflag = 1,retval=-100; uint8_t privkey[32]; uint256 hash; uint32_t t; - if ( ctx == 0 ) - ctx = secp256k1_context_create(SECP256K1_CONTEXT_SIGN | SECP256K1_CONTEXT_VERIFY); - if ( ctx != 0 ) - { - Myprivkey(privkey); - len = payload.size(); - payload.resize(len + 4); - if ( timestamp == 0 ) - { - timestamp = (uint32_t)time(NULL); - verifyflag = 0; - } - t = timestamp; - payload[len++] = t, t >>= 8; - payload[len++] = t, t >>= 8; - payload[len++] = t, t >>= 8; - payload[len++] = t; - vcalc_sha256(0,(uint8_t *)&hash,&payload[0],len); - if ( verifyflag == 0 ) - { - if ( secp256k1_ecdsa_sign(ctx,&signature,(uint8_t *)&hash,privkey,NULL,NULL) > 0 ) - { - sig.resize(siglen); - if ( secp256k1_ecdsa_signature_serialize_der(ctx,&sig[0],&siglen,&signature) > 0 ) - { - if ( siglen != sig.size() ) - sig.resize(siglen); - retval = 0; - } else retval = -3; - } else retval = -2; - } - else - { - if ( secp256k1_ec_pubkey_parse(ctx,&pubkey,pk.begin(),33) > 0 ) - { - if ( secp256k1_ecdsa_signature_parse_der(ctx,&signature,&sig[0],sig.size()) > 0 ) - { - if ( secp256k1_ecdsa_verify(ctx,&signature,(uint8_t *)&hash,&pubkey) > 0 ) - retval = 0; - else retval = -4; - } else retval = -3; - } else retval = -2; - } - } else retval = -1; - memset(privkey,0,sizeof(privkey)); - return(retval); -} - -int32_t games_event(uint32_t timestamp,uint256 gametxid,int32_t eventid,std::vector payload) -{ - std::vector sig,vopret; CPubKey mypk; uint32_t x; int32_t i,len = payload.size(); - payload.resize(len + 4 + 32); - for (i=0; i<32; i++) - payload[len++] = ((uint8_t *)&gametxid)[i]; - x = eventid; - payload[len++] = x, x >>= 8; - payload[len++] = x, x >>= 8; - payload[len++] = x, x >>= 8; - payload[len++] = x; - mypk = pubkey2pk(Mypubkey()); - if ( games_eventsign(timestamp,sig,payload,mypk) == 0 ) - { - GetOpReturnData(games_eventopret(timestamp,mypk,sig,payload),vopret); - games_payloadrecv(mypk,timestamp,payload); - hush_sendmessage(4,8,"events",vopret); - return(0); - } - fprintf(stderr,"games_eventsign error\n"); - return(-1); -} - -UniValue games_events(uint64_t txfee,struct CCcontract_info *cp,cJSON *params) -{ - static uint256 lastgametxid; static uint32_t numevents; - UniValue result(UniValue::VOBJ); std::vector payload; int32_t len,i,n; uint32_t x; CPubKey mypk; char str[67]; uint32_t eventid,timestamp = 0; uint256 gametxid; - if ( params != 0 && (n= cJSON_GetArraySize(params)) >= 1 && n <= 3 ) - { - mypk = pubkey2pk(Mypubkey()); - if ( payments_parsehexdata(payload,jitem(params,0),0) == 0 ) - { - if ( n >= 2 ) - gametxid = juint256(jitem(params,1)); - else gametxid = zeroid; - if ( gametxid != lastgametxid ) - { - lastgametxid = gametxid; - numevents = 1; - eventid = 0; - } - if ( n == 3 ) - { - eventid = juint(jitem(params,2),0); - if ( numevents <= eventid ) - numevents = eventid+1; - } else eventid = numevents++; - if ( games_event(timestamp,gametxid,eventid,payload) == 0 ) - { - result.push_back(Pair("gametxid",gametxid.GetHex())); - result.push_back(Pair("eventid",(int64_t)eventid)); - result.push_back(Pair("payload",jstr(jitem(params,0),0))); - result.push_back(Pair("timestamp",(int64_t)timestamp)); - result.push_back(Pair("result","success")); - result.push_back(Pair("pubkey33",pubkey33_str(str,(uint8_t *)&mypk))); - } - else - { - result.push_back(Pair("result","error")); - result.push_back(Pair("error","signing ereror")); - } - } - else - { - result.push_back(Pair("result","error")); - result.push_back(Pair("error","couldnt parsehexdata")); - } - } - else - { - result.push_back(Pair("result","error")); - result.push_back(Pair("error","not enough params")); - } - return(result); -} - -void hush_netevent(std::vector message) -{ - int32_t i,retval,lag,lagerr=0; uint32_t timestamp,now; CPubKey pk; std::vector sig,payload; char str[67]; - if ( games_eventdecode(timestamp,pk,sig,payload,message) == 'E' ) - { - now = (uint32_t)time(NULL); - lag = now - timestamp; - if ( lag < -3 || lag > 3 ) - { - fprintf(stderr,"LAG ERROR "); - lagerr = lag; - } - if ( (retval= games_eventsign(timestamp,sig,payload,pk)) != 0 ) - fprintf(stderr,"SIG ERROR.%d ",retval); - else if ( lagerr == 0 ) - { - if ( games_payloadrecv(pk,timestamp,payload) == 0 ) // first time this is seen - { - if ( (rand() % 10) == 0 ) - { - //fprintf(stderr,"relay message.[%d]\n",(int32_t)message.size()); - hush_sendmessage(2,2,"events",message); - } - } - } - //for (i=0; i 0 ) - result.push_back(Pair("maxplayers",maxplayers)); - if ( buyin >= 0 ) - { - result.push_back(Pair("buyin",ValueFromAmount(buyin))); - if ( buyin == 0 ) - result.push_back(Pair("type","newbie")); - else result.push_back(Pair("type","buyin")); - } -} - -int32_t games_isvalidgame(struct CCcontract_info *cp,int32_t &gameheight,CTransaction &tx,int64_t &buyin,int32_t &maxplayers,uint256 txid,int32_t unspentv0) -{ - uint256 hashBlock; int32_t i,numvouts; char coinaddr[64]; CPubKey gamespk; uint64_t txfee = 10000; - buyin = maxplayers = 0; - if ( (txid == zeroid || myGetTransaction(txid,tx,hashBlock) != 0) && (numvouts= tx.vout.size()) > 1 ) - { - if ( txid != zeroid ) - gameheight = hush_blockheight(hashBlock); - else - { - txid = tx.GetHash(); - //fprintf(stderr,"set txid %s %llu\n",txid.GetHex().c_str(),(long long)CCgettxout(txid,0,1)); - } - if ( IsCClibvout(cp,tx,0,cp->unspendableCCaddr) == txfee && (unspentv0 == 0 || CCgettxout(txid,0,1,0) == txfee) ) - { - if ( games_newgameopreturndecode(buyin,maxplayers,tx.vout[numvouts-1].scriptPubKey) == 'G' ) - { - if ( maxplayers < 1 || maxplayers > GAMES_MAXPLAYERS || buyin < 0 ) - return(-6); - if ( numvouts > 2*maxplayers+1 ) - { - for (i=0; i= 0 ) - txid = spenttxid; - else if ( myIsutxo_spentinmempool(spenttxid,spentvini,txid,vout) == 0 || spenttxid == zeroid ) - { - fprintf(stderr,"mempool tracking error %s/v0\n",txid.ToString().c_str()); - break; - } - txid = spenttxid; - vout = 0; - //fprintf(stderr,"n.%d next txid.%s/v%d\n",n,txid.GetHex().c_str(),spentvini); - if ( spentvini != 0 ) - break; - if ( n++ > GAMES_MAXITERATIONS ) - break; - } - if ( txid != zeroid ) - { - if ( myGetTransaction(txid,tx,hashBlock) != 0 ) - { - if ( (pindex= hush_blockindex(hashBlock)) != 0 ) - { - if ( pindex->GetHeight() <= gameht+GAMES_MAXKEYSTROKESGAP ) - alive++; - } - } - } - } - } - else if ( registration_open != 0 ) - openslots++; - } - //fprintf(stderr,"numalive.%d openslots.%d\n",alive,openslots); - return(alive); -} - -UniValue games_playerobj(std::vector playerdata,uint256 playertxid,uint256 tokenid,std::string symbol,std::string pname,uint256 gametxid) -{ - int32_t i,vout,spentvini,numvouts,n=0; uint256 txid,spenttxid,hashBlock; struct games_player P; char packitemstr[512],*datastr=0; UniValue obj(UniValue::VOBJ),a(UniValue::VARR); CTransaction tx; - memset(&P,0,sizeof(P)); - if ( playerdata.size() > 0 ) - { - datastr = (char *)malloc(playerdata.size()*2+1); - for (i=0; i= 0 ) - txid = spenttxid; - else if ( myIsutxo_spentinmempool(spenttxid,spentvini,txid,vout) == 0 || spenttxid == zeroid ) - { - fprintf(stderr,"mempool tracking error %s/v0\n",txid.ToString().c_str()); - break; - } - txid = spenttxid; - vout = 0; - if ( myGetTransaction(txid,tx,hashBlock) != 0 && (numvouts= tx.vout.size()) > 1 ) - { - for (i=0; i GAMES_MAXITERATIONS ) - break; - } - obj.push_back(Pair("gametxid",gametxid.GetHex())); - if ( txid != playertxid ) - obj.push_back(Pair("batontxid",txid.GetHex())); - obj.push_back(Pair("playertxid",playertxid.GetHex())); - if ( tokenid != zeroid ) - obj.push_back(Pair("tokenid",tokenid.GetHex())); - else obj.push_back(Pair("tokenid",playertxid.GetHex())); - if ( datastr != 0 ) - { - obj.push_back(Pair("data",datastr)); - free(datastr); - } - obj.push_back(Pair("pack",a)); - GAMEPLAYERJSON(obj,&P); - obj.push_back(Pair("chain",symbol)); - obj.push_back(Pair("pname",pname)); - return(obj); -} - -int32_t games_iterateplayer(uint256 ®istertxid,uint256 firsttxid,int32_t firstvout,uint256 lasttxid) // retrace playertxid vins to reach highlander <- this verifies player is valid and rogue_playerdataspend makes sure it can only be used once -{ - uint256 spenttxid,txid = firsttxid; int32_t spentvini,n,vout = firstvout; - registertxid = zeroid; - if ( vout < 0 ) - return(-1); - n = 0; - while ( (spentvini= myIsutxo_spent(spenttxid,txid,vout)) == 0 ) - { - txid = spenttxid; - vout = spentvini; - if ( registertxid == zeroid ) - registertxid = txid; - if ( ++n >= GAMES_MAXITERATIONS ) - { - fprintf(stderr,"games_iterateplayer n.%d, seems something is wrong\n",n); - return(-2); - } - } - if ( txid == lasttxid ) - return(0); - else - { - fprintf(stderr,"firsttxid.%s/v%d -> %s != last.%s\n",firsttxid.ToString().c_str(),firstvout,txid.ToString().c_str(),lasttxid.ToString().c_str()); - return(-1); - } -} - -int32_t games_playerdata(struct CCcontract_info *cp,uint256 &origplayergame,uint256 &tokenid,CPubKey &pk,std::vector &playerdata,std::string &symbol,std::string &pname,uint256 playertxid) -{ - uint256 origplayertxid,hashBlock,gametxid,registertxid; CTransaction gametx,playertx,highlandertx; std::vector vopret; uint8_t *script,e,f; int32_t i,regslot,gameheight,numvouts,maxplayers; int64_t buyin; - if ( myGetTransaction(playertxid,playertx,hashBlock) != 0 && (numvouts= playertx.vout.size()) > 0 ) - { - if ( (f= games_finishopretdecode(gametxid,tokenid,regslot,pk,playerdata,symbol,pname,playertx.vout[numvouts-1].scriptPubKey)) == 'H' || f == 'Q' ) - { - origplayergame = gametxid; - if ( tokenid != zeroid ) - { - playertxid = tokenid; - if ( myGetTransaction(playertxid,playertx,hashBlock) == 0 || (numvouts= playertx.vout.size()) <= 0 ) - { - fprintf(stderr,"couldnt get tokenid.%s\n",playertxid.GetHex().c_str()); - return(-2); - } - } - if ( games_isvalidgame(cp,gameheight,gametx,buyin,maxplayers,gametxid,0) == 0 ) - { - //fprintf(stderr,"playertxid.%s got vin.%s/v%d gametxid.%s iterate.%d\n",playertxid.ToString().c_str(),playertx.vin[1].prevout.hash.ToString().c_str(),(int32_t)playertx.vin[1].prevout.n-maxplayers,gametxid.ToString().c_str(),games_iterateplayer(registertxid,gametxid,playertx.vin[1].prevout.n-maxplayers,playertxid)); - if ( (tokenid != zeroid || playertx.vin[1].prevout.hash == gametxid) && games_iterateplayer(registertxid,gametxid,playertx.vin[1].prevout.n-maxplayers,playertxid) == 0 ) - { - // if registertxid has vin from pk, it can be used - return(0); - } else fprintf(stderr,"hash mismatch or illegal gametxid\n"); - } else fprintf(stderr,"invalid game %s\n",gametxid.GetHex().c_str()); - } //else fprintf(stderr,"invalid player funcid.%c\n",f); - } else fprintf(stderr,"couldnt get playertxid.%s\n",playertxid.GetHex().c_str()); - return(-1); -} - -int32_t games_iamregistered(int32_t maxplayers,uint256 gametxid,CTransaction tx,char *mygamesaddr) -{ - int32_t i,vout; uint256 spenttxid,hashBlock; CTransaction spenttx; char destaddr[64]; - for (i=0; i= 0 ) - { - if ( myGetTransaction(spenttxid,spenttx,hashBlock) != 0 && spenttx.vout.size() > 0 ) - { - Getscriptaddress(destaddr,spenttx.vout[0].scriptPubKey); - if ( strcmp(mygamesaddr,destaddr) == 0 ) - return(1); - //else fprintf(stderr,"myaddr.%s vs %s\n",mygamesaddr,destaddr); - } //else fprintf(stderr,"cant find spenttxid.%s\n",spenttxid.GetHex().c_str()); - } //else fprintf(stderr,"vout %d is unspent\n",vout); - } - return(0); -} - -int64_t games_buyins(uint256 gametxid,int32_t maxplayers) -{ - int32_t i,vout; uint256 spenttxid,hashBlock; CTransaction spenttx; int64_t buyins = 0; - for (i=0; i= 0 ) - { - if ( myGetTransaction(spenttxid,spenttx,hashBlock) != 0 && spenttx.vout.size() > 0 ) - { - if ( spenttx.vout[0].nValue > GAMES_REGISTRATIONSIZE ) - buyins += (spenttx.vout[0].nValue - GAMES_REGISTRATIONSIZE); - } //else fprintf(stderr,"cant find spenttxid.%s\n",spenttxid.GetHex().c_str()); - } //else fprintf(stderr,"vout %d is unspent\n",vout); - } - return(buyins); -} - -uint64_t games_gamefields(UniValue &obj,int64_t maxplayers,int64_t buyin,uint256 gametxid,char *mygamesaddr) -{ - CBlockIndex *pindex; int32_t ht,openslots,delay,numplayers; uint256 hashBlock; uint64_t seed=0; char cmd[512]; CTransaction tx; - if ( myGetTransaction(gametxid,tx,hashBlock) != 0 && (pindex= hush_blockindex(hashBlock)) != 0 ) - { - ht = pindex->GetHeight(); - delay = GAMES_REGISTRATION * (maxplayers > 1); - obj.push_back(Pair("height",ht)); - obj.push_back(Pair("start",ht+delay)); - if ( hush_nextheight() > ht+delay ) - { - if ( (pindex= hush_chainactive(ht+delay)) != 0 ) - { - hashBlock = pindex->GetBlockHash(); - obj.push_back(Pair("starthash",hashBlock.ToString())); - memcpy(&seed,&hashBlock,sizeof(seed)); - seed &= (1LL << 62) - 1; - obj.push_back(Pair("seed",(int64_t)seed)); - if ( games_iamregistered(maxplayers,gametxid,tx,mygamesaddr) > 0 ) - sprintf(cmd,"cc/%s %llu %s",GAMENAME,(long long)seed,gametxid.ToString().c_str()); - else sprintf(cmd,"./hush-cli -ac_name=%s cclib register %d \"[%%22%s%%22]\"",SMART_CHAIN_SYMBOL,EVAL_GAMES,gametxid.ToString().c_str()); - obj.push_back(Pair("run",cmd)); - } - } - obj.push_back(Pair("alive",games_playersalive(openslots,numplayers,gametxid,maxplayers,ht,tx))); - obj.push_back(Pair("openslots",openslots)); - obj.push_back(Pair("numplayers",numplayers)); - obj.push_back(Pair("buyins",ValueFromAmount(games_buyins(gametxid,maxplayers)))); - } - obj.push_back(Pair("maxplayers",maxplayers)); - obj.push_back(Pair("buyin",ValueFromAmount(buyin))); - return(seed); -} - -UniValue games_playerinfo(uint64_t txfee,struct CCcontract_info *cp,cJSON *params) -{ - UniValue result(UniValue::VOBJ); std::vector playerdata; uint256 playertxid,tokenid,origplayergame;int32_t n; CPubKey pk; bits256 t; std::string symbol,pname; - result.push_back(Pair("result","success")); - games_univalue(result,"playerinfo",-1,-1); - if ( params != 0 && (n= cJSON_GetArraySize(params)) > 0 ) - { - if ( n > 0 ) - { - playertxid = juint256(jitem(params,0)); - if ( games_playerdata(cp,origplayergame,tokenid,pk,playerdata,symbol,pname,playertxid) < 0 ) - return(cclib_error(result,"invalid playerdata")); - result.push_back(Pair("player",games_playerobj(playerdata,playertxid,tokenid,symbol,pname,origplayergame))); - } else return(cclib_error(result,"no playertxid")); - return(result); - } else return(cclib_error(result,"couldnt reparse params")); -} - -void disp_gamesplayerdata(std::vector playerdata) -{ - struct games_player P; int32_t i; char packitemstr[512],str[512]; - if ( playerdata.size() > 0 ) - { - for (i=0; i maxplayers+1 ) - { - r = rand() % maxplayers; - for (j=0; j &playerdata,uint256 &batontxid,int32_t &batonvout,int64_t &batonvalue,int32_t &batonht,uint256 gametxid,CTransaction gametx,int32_t maxplayers,char *destaddr,int32_t &numplayers,std::string &symbol,std::string &pname) -{ - int32_t i,numvouts,spentvini,n,matches = 0; CPubKey pk; uint256 tid,active,spenttxid,tokenid,hashBlock,txid,origplayergame; CTransaction spenttx,matchtx,batontx; std::vector checkdata; CBlockIndex *pindex; char ccaddr[64]; gamesevent *keystrokes=0; - batonvalue = numkeys = numplayers = batonht = 0; - playertxid = batontxid = zeroid; - if ( keystrokesp != 0 ) - *keystrokesp = 0; - for (i=0; i= 0 ) - { - if ( myGetTransaction(spenttxid,spenttx,hashBlock) != 0 && spenttx.vout.size() > 0 ) - { - numplayers++; - Getscriptaddress(ccaddr,spenttx.vout[0].scriptPubKey); - if ( strcmp(destaddr,ccaddr) == 0 ) - { - matches++; - regslot = i; - matchtx = spenttx; - } //else fprintf(stderr,"%d+1 doesnt match %s vs %s\n",i,ccaddr,destaddr); - } //else fprintf(stderr,"%d+1 couldnt find spenttx.%s\n",i,spenttxid.GetHex().c_str()); - } //else fprintf(stderr,"%d+1 unspent\n",i); - } - if ( matches == 1 ) - { - numvouts = matchtx.vout.size(); -//fprintf(stderr,"matchtxid.%s matches.%d numvouts.%d\n",matchtx.GetHash().GetHex().c_str(),matches,numvouts); - if ( games_registeropretdecode(txid,tokenid,playertxid,matchtx.vout[numvouts-1].scriptPubKey) == 'R' )//&& txid == gametxid ) - { - //fprintf(stderr,"tokenid.%s txid.%s vs gametxid.%s player.%s\n",tokenid.GetHex().c_str(),txid.GetHex().c_str(),gametxid.GetHex().c_str(),playertxid.GetHex().c_str()); - if ( tokenid != zeroid ) - active = tokenid; - else active = playertxid; - if ( active == zeroid || games_playerdata(cp,origplayergame,tid,pk,playerdata,symbol,pname,active) == 0 ) - { - txid = matchtx.GetHash(); - //fprintf(stderr,"scan forward active.%s spenttxid.%s\n",active.GetHex().c_str(),txid.GetHex().c_str()); - n = 0; - while ( CCgettxout(txid,0,1,0) < 0 ) - { - spenttxid = zeroid; - spentvini = -1; - if ( (spentvini= myIsutxo_spent(spenttxid,txid,0)) >= 0 ) - txid = spenttxid; - else - { - if ( myIsutxo_spentinmempool(spenttxid,spentvini,txid,0) == 0 || spenttxid == zeroid ) - { - fprintf(stderr,"mempool tracking error %s/v0\n",txid.ToString().c_str()); - return(-2); - } - } - txid = spenttxid; - //fprintf(stderr,"n.%d next txid.%s/v%d\n",n,txid.GetHex().c_str(),spentvini); - if ( spentvini != 0 ) // game is over? - { - //fprintf(stderr,"gameisover n.%d next txid.%s/v%d\n",n,txid.GetHex().c_str(),spentvini); - return(0); - } - if ( keystrokesp != 0 && myGetTransaction(spenttxid,spenttx,hashBlock) != 0 && spenttx.vout.size() >= 2 ) - { - uint256 g,b; CPubKey p; std::vector k; - if ( games_keystrokesopretdecode(g,b,p,k,spenttx.vout[spenttx.vout.size()-1].scriptPubKey) == 'K' ) - { - //fprintf(stderr,"update keystrokes.%p[%d]\n",keystrokes,numkeys); - keystrokes = (gamesevent *)realloc(keystrokes,(int32_t)(sizeof(*keystrokes)*numkeys + k.size())); - for (i=0; i= GAMES_MAXITERATIONS ) - { - fprintf(stderr,"games_findbaton n.%d, seems something is wrong\n",n); - return(-5); - } - } - //fprintf(stderr,"set baton %s\n",txid.GetHex().c_str()); - batontxid = txid; - batonvout = 0; // not vini - // how to detect timeout, bailedout, highlander - hashBlock = zeroid; - if ( myGetTransaction(batontxid,batontx,hashBlock) != 0 && batontx.vout.size() > 0 ) - { - if ( hashBlock == zeroid ) - batonht = hush_nextheight(); - else if ( (pindex= hush_blockindex(hashBlock)) == 0 ) - return(-4); - else batonht = pindex->GetHeight(); - batonvalue = batontx.vout[0].nValue; - //printf("batonht.%d keystrokes[%d]\n",batonht,numkeys); - return(0); - } else fprintf(stderr,"couldnt find baton\n"); - } else fprintf(stderr,"error with playerdata\n"); - } else fprintf(stderr,"findbaton opret error\n"); - } - return(-1); -} - -void games_gameplayerinfo(struct CCcontract_info *cp,UniValue &obj,uint256 gametxid,CTransaction gametx,int32_t vout,int32_t maxplayers,char *mygamesaddr) -{ - // identify if bailout or quit or timed out - uint256 batontxid,spenttxid,gtxid,ptxid,tokenid,hashBlock,playertxid; CTransaction spenttx,batontx; int32_t numplayers,regslot,numkeys,batonvout,batonht,retval; int64_t batonvalue; std::vector playerdata; char destaddr[64]; std::string symbol,pname; - destaddr[0] = 0; - if ( myIsutxo_spent(spenttxid,gametxid,vout) >= 0 ) - { - if ( myGetTransaction(spenttxid,spenttx,hashBlock) != 0 && spenttx.vout.size() > 0 ) - Getscriptaddress(destaddr,spenttx.vout[0].scriptPubKey); - } - obj.push_back(Pair("slot",(int64_t)vout-1)); - if ( (retval= games_findbaton(cp,playertxid,0,numkeys,regslot,playerdata,batontxid,batonvout,batonvalue,batonht,gametxid,gametx,maxplayers,destaddr,numplayers,symbol,pname)) == 0 ) - { - if ( CCgettxout(gametxid,maxplayers+vout,1,0) == 10000 ) - { - if ( myGetTransaction(batontxid,batontx,hashBlock) != 0 && batontx.vout.size() > 1 ) - { - if ( games_registeropretdecode(gtxid,tokenid,ptxid,batontx.vout[batontx.vout.size()-1].scriptPubKey) == 'R' && ptxid == playertxid && gtxid == gametxid ) - obj.push_back(Pair("status","registered")); - else obj.push_back(Pair("status","alive")); - } else obj.push_back(Pair("status","error")); - } else obj.push_back(Pair("status","finished")); - obj.push_back(Pair("baton",batontxid.ToString())); - obj.push_back(Pair("tokenid",tokenid.ToString())); - obj.push_back(Pair("batonaddr",destaddr)); - obj.push_back(Pair("ismine",strcmp(mygamesaddr,destaddr)==0)); - obj.push_back(Pair("batonvout",(int64_t)batonvout)); - obj.push_back(Pair("batonvalue",ValueFromAmount(batonvalue))); - obj.push_back(Pair("batonht",(int64_t)batonht)); - if ( playerdata.size() > 0 ) - obj.push_back(Pair("player",games_playerobj(playerdata,playertxid,tokenid,symbol,pname,gametxid))); - } else fprintf(stderr,"findbaton err.%d\n",retval); -} - -UniValue games_newgame(uint64_t txfee,struct CCcontract_info *cp,cJSON *params) -{ - CMutableTransaction mtx = CreateNewContextualCMutableTransaction(Params().GetConsensus(), hush_nextheight()); - UniValue result(UniValue::VOBJ); std::string rawtx; CPubKey gamespk,mypk; char *jsonstr; uint64_t inputsum,change,required,buyin=0; int32_t i,n,maxplayers = 1; - if ( txfee == 0 ) - txfee = 10000; - if ( params != 0 && (n= cJSON_GetArraySize(params)) > 0 ) - { - if ( n > 0 ) - { - maxplayers = juint(jitem(params,0),0); - if ( n > 1 ) - buyin = jdouble(jitem(params,1),0) * COIN + 0.0000000049; - } - } - if ( maxplayers < 1 || maxplayers > GAMES_MAXPLAYERS ) - return(cclib_error(result,"illegal maxplayers")); - mypk = pubkey2pk(Mypubkey()); - gamespk = GetUnspendable(cp,0); - games_univalue(result,"newgame",maxplayers,buyin); - required = (3*txfee + maxplayers*(GAMES_REGISTRATIONSIZE+txfee)); - if ( (inputsum= AddCClibInputs(cp,mtx,gamespk,required,16,cp->unspendableCCaddr,1)) >= required ) - { - mtx.vout.push_back(MakeCC1vout(cp->evalcode,txfee,gamespk)); - for (i=0; ievalcode,GAMES_REGISTRATIONSIZE,gamespk,gamespk)); - for (i=0; ievalcode,txfee,gamespk,gamespk)); - if ( (change= inputsum - required) >= txfee ) - mtx.vout.push_back(MakeCC1vout(cp->evalcode,change,gamespk)); - rawtx = FinalizeCCTx(0,cp,mtx,mypk,txfee,games_newgameopret(buyin,maxplayers)); - return(games_rawtxresult(result,rawtx,1)); - } - else return(cclib_error(result,"illegal maxplayers")); - return(result); -} - -UniValue games_pending(uint64_t txfee,struct CCcontract_info *cp,cJSON *params) -{ - UniValue result(UniValue::VOBJ),a(UniValue::VARR); int64_t buyin; uint256 txid,hashBlock; CTransaction tx; int32_t openslots,maxplayers,numplayers,gameheight,nextheight,vout,numvouts; CPubKey gamespk; char coinaddr[64]; - std::vector > unspentOutputs; - gamespk = GetUnspendable(cp,0); - GetCCaddress(cp,coinaddr,gamespk); - SetCCunspents(unspentOutputs,coinaddr,true); - nextheight = hush_nextheight(); - for (std::vector >::const_iterator it=unspentOutputs.begin(); it!=unspentOutputs.end(); it++) - { - txid = it->first.txhash; - vout = (int32_t)it->first.index; - //char str[65]; fprintf(stderr,"%s check %s/v%d %.8f\n",coinaddr,uint256_str(str,txid),vout,(double)it->second.satoshis/COIN); - if ( it->second.satoshis != txfee || vout != 0 ) // reject any that are not highlander markers - continue; - if ( games_isvalidgame(cp,gameheight,tx,buyin,maxplayers,txid,1) == 0 && nextheight <= gameheight+GAMES_MAXKEYSTROKESGAP ) - { - games_playersalive(openslots,numplayers,txid,maxplayers,gameheight,tx); - if ( openslots > 0 ) - a.push_back(txid.GetHex()); - } - } - result.push_back(Pair("result","success")); - games_univalue(result,"pending",-1,-1); - result.push_back(Pair("pending",a)); - result.push_back(Pair("numpending",(int64_t)a.size())); - return(result); -} - -UniValue games_gameinfo(uint64_t txfee,struct CCcontract_info *cp,cJSON *params) -{ - UniValue result(UniValue::VOBJ),a(UniValue::VARR); int32_t i,n,gameheight,maxplayers,numvouts; uint256 txid; CTransaction tx; int64_t buyin; uint64_t seed; bits256 t; char myaddr[64],str[64]; CPubKey mypk,gamespk; - result.push_back(Pair("name","games")); - result.push_back(Pair("method","info")); - if ( params != 0 && (n= cJSON_GetArraySize(params)) > 0 ) - { - if ( n > 0 ) - { - txid = juint256(jitem(params,0)); - result.push_back(Pair("gametxid",txid.GetHex())); - if ( games_isvalidgame(cp,gameheight,tx,buyin,maxplayers,txid,0) == 0 ) - { - result.push_back(Pair("result","success")); - result.push_back(Pair("gameheight",(int64_t)gameheight)); - mypk = pubkey2pk(Mypubkey()); - gamespk = GetUnspendable(cp,0); - GetCCaddress1of2(cp,myaddr,gamespk,mypk); - seed = games_gamefields(result,maxplayers,buyin,txid,myaddr); - result.push_back(Pair("seed",(int64_t)seed)); - for (i=0; i GAMES_REGISTRATIONSIZE 1of2 registration baton from creategame - // vin1 -> optional nonfungible character vout @ - // vin2 -> original creation TCBOO playerdata used - // vin3+ -> buyin - // vout0 -> keystrokes/completion baton - CMutableTransaction mtx = CreateNewContextualCMutableTransaction(Params().GetConsensus(), hush_nextheight()); - UniValue result(UniValue::VOBJ); char destaddr[64],coinaddr[64]; uint256 tokenid,gametxid,origplayergame,playertxid,hashBlock; int32_t err,maxplayers,gameheight,n,numvouts,vout=1; int64_t inputsum,buyin,CCchange=0; CPubKey pk,mypk,gamespk,burnpk; CTransaction tx,playertx; std::vector playerdata; std::string rawtx,symbol,pname; bits256 t; - - if ( txfee == 0 ) - txfee = 10000; - mypk = pubkey2pk(Mypubkey()); - burnpk = pubkey2pk(ParseHex(CC_BURNPUBKEY)); - gamespk = GetUnspendable(cp,0); - games_univalue(result,"register",-1,-1); - playertxid = tokenid = zeroid; - if ( params != 0 && (n= cJSON_GetArraySize(params)) > 0 ) - { - if ( n > 0 ) - { - gametxid = juint256(jitem(params,0)); - if ( (err= games_isvalidgame(cp,gameheight,tx,buyin,maxplayers,gametxid,1)) == 0 ) - { - if ( n > 1 ) - { - playertxid = juint256(jitem(params,1)); - if ( games_playerdata(cp,origplayergame,tokenid,pk,playerdata,symbol,pname,playertxid) < 0 ) - return(cclib_error(result,"couldnt extract valid playerdata")); - if ( tokenid != zeroid ) // if it is tokentransfer this will be 0 - vout = 1; - } - if ( hush_nextheight() > gameheight + GAMES_MAXKEYSTROKESGAP ) - return(cclib_error(result,"didnt register in time, GAMES_MAXKEYSTROKESGAP")); - games_univalue(result,0,maxplayers,buyin); - GetCCaddress1of2(cp,coinaddr,gamespk,mypk); - if ( games_iamregistered(maxplayers,gametxid,tx,coinaddr) > 0 ) - return(cclib_error(result,"already registered")); - if ( (inputsum= games_registrationbaton(mtx,gametxid,tx,maxplayers)) != GAMES_REGISTRATIONSIZE ) - return(cclib_error(result,"couldnt find available registration baton")); - else if ( playertxid != zeroid && games_playerdataspend(mtx,playertxid,vout,origplayergame) < 0 ) - return(cclib_error(result,"couldnt find playerdata to spend")); - else if ( buyin > 0 && AddNormalinputs(mtx,mypk,buyin,64) < buyin ) - return(cclib_error(result,"couldnt find enough normal funds for buyin")); - if ( tokenid != zeroid ) - { - mtx.vin.push_back(CTxIn(tokenid,0)); // spending cc marker as token is burned - char unspendableTokenAddr[64]; uint8_t tokenpriv[32]; struct CCcontract_info *cpTokens, tokensC; - cpTokens = CCinit(&tokensC, EVAL_TOKENS); - CPubKey unspPk = GetUnspendable(cpTokens, tokenpriv); - GetCCaddress(cpTokens, unspendableTokenAddr, unspPk); - CCaddr2set(cp, EVAL_TOKENS, unspPk, tokenpriv, unspendableTokenAddr); - } - mtx.vout.push_back(MakeCC1of2vout(cp->evalcode,buyin + inputsum - txfee,gamespk,mypk)); - GetCCaddress1of2(cp,destaddr,gamespk,gamespk); - CCaddr1of2set(cp,gamespk,gamespk,cp->CCpriv,destaddr); - mtx.vout.push_back(MakeTokensCC1vout(cp->evalcode, 1, burnpk)); - - uint8_t e, funcid; uint256 tid; std::vector voutPubkeys, voutPubkeysEmpty; int32_t didtx = 0; - CScript opretRegister = games_registeropret(gametxid, playertxid); - if ( playertxid != zeroid ) - { - voutPubkeysEmpty.push_back(burnpk); - if ( myGetTransaction(playertxid,playertx,hashBlock) != 0 ) - { - std::vector> oprets; - if ( (funcid= DecodeTokenOpRet(playertx.vout.back().scriptPubKey, e, tid, voutPubkeys, oprets)) != 0) - { // if token in the opret - didtx = 1; - if ( funcid == 'c' ) - tid = tokenid == zeroid ? playertxid : tokenid; - vscript_t vopretRegister; - GetOpReturnData(opretRegister, vopretRegister); - rawtx = FinalizeCCTx(0, cp, mtx, mypk, txfee, - EncodeTokenOpRet(tid, voutPubkeysEmpty /*=never spent*/, std::make_pair(OPRETID_ROGUEGAMEDATA, vopretRegister))); - } - } - } - if ( didtx == 0 ) - rawtx = FinalizeCCTx(0, cp, mtx, mypk, txfee, opretRegister); - - return(games_rawtxresult(result,rawtx,1)); - } else return(cclib_error(result,"invalid gametxid")); - } else return(cclib_error(result,"no gametxid")); - } else return(cclib_error(result,"couldnt reparse params")); -} - -UniValue games_keystrokes(uint64_t txfee,struct CCcontract_info *cp,cJSON *params) -{ - // vin0 -> baton from registration or previous keystrokes - // vout0 -> new baton - // opret -> user input chars - // being killed should auto broadcast (possible to be suppressed?) - // respawn to be prevented by including timestamps - int32_t nextheight = hush_nextheight(); - CMutableTransaction mtx = CreateNewContextualCMutableTransaction(Params().GetConsensus(),nextheight); - UniValue result(UniValue::VOBJ); CPubKey gamespk,mypk; uint256 gametxid,playertxid,batontxid; int64_t batonvalue,buyin; std::vector keystrokes,playerdata; int32_t numplayers,regslot,numkeys,batonht,batonvout,n,elapsed,gameheight,maxplayers; CTransaction tx; CTxOut txout; char *keystrokestr,destaddr[64]; std::string rawtx,symbol,pname; bits256 t; uint8_t mypriv[32]; - // if ( txfee == 0 ) - txfee = 1000; // smaller than normal on purpose - games_univalue(result,"keystrokes",-1,-1); - if ( params != 0 && (n= cJSON_GetArraySize(params)) == 2 && (keystrokestr= jstr(jitem(params,1),0)) != 0 ) - { - gametxid = juint256(jitem(params,0)); - result.push_back(Pair("gametxid",gametxid.GetHex())); - result.push_back(Pair("keystrokes",keystrokestr)); - keystrokes = ParseHex(keystrokestr); - mypk = pubkey2pk(Mypubkey()); - gamespk = GetUnspendable(cp,0); - GetCCaddress1of2(cp,destaddr,gamespk,mypk); - if ( games_isvalidgame(cp,gameheight,tx,buyin,maxplayers,gametxid,1) == 0 ) - { - if ( games_findbaton(cp,playertxid,0,numkeys,regslot,playerdata,batontxid,batonvout,batonvalue,batonht,gametxid,tx,maxplayers,destaddr,numplayers,symbol,pname) == 0 ) - { - result.push_back(Pair("batontxid",batontxid.GetHex())); - result.push_back(Pair("playertxid",playertxid.GetHex())); - if ( maxplayers == 1 || nextheight <= batonht+GAMES_MAXKEYSTROKESGAP ) - { - mtx.vin.push_back(CTxIn(batontxid,batonvout,CScript())); //this validates user if pk - mtx.vout.push_back(MakeCC1of2vout(cp->evalcode,batonvalue-txfee,gamespk,mypk)); - Myprivkey(mypriv); - CCaddr1of2set(cp,gamespk,mypk,mypriv,destaddr); - rawtx = FinalizeCCTx(0,cp,mtx,mypk,txfee,games_keystrokesopret(gametxid,batontxid,mypk,keystrokes)); - //fprintf(stderr,"KEYSTROKES.(%s)\n",rawtx.c_str()); - memset(mypriv,0,sizeof(mypriv)); - return(games_rawtxresult(result,rawtx,1)); - } else return(cclib_error(result,"keystrokes tx was too late")); - } else return(cclib_error(result,"couldnt find batontxid")); - } else return(cclib_error(result,"invalid gametxid")); - } else return(cclib_error(result,"couldnt reparse params")); -} - -gamesevent *games_extractgame(int32_t makefiles,char *str,int32_t *numkeysp,std::vector &newdata,uint64_t &seed,uint256 &playertxid,struct CCcontract_info *cp,uint256 gametxid,char *gamesaddr) -{ - CPubKey gamespk; int32_t i,num,retval,maxplayers,gameheight,batonht,batonvout,numplayers,regslot,numkeys,err; std::string symbol,pname; CTransaction gametx; int64_t buyin,batonvalue; char fname[64]; gamesevent *keystrokes = 0; std::vector playerdata; uint256 batontxid; FILE *fp; uint8_t newplayer[10000]; struct games_player P,endP; - gamespk = GetUnspendable(cp,0); - *numkeysp = 0; - seed = 0; - num = numkeys = 0; - playertxid = zeroid; - str[0] = 0; - if ( (err= games_isvalidgame(cp,gameheight,gametx,buyin,maxplayers,gametxid,0)) == 0 ) - { - if ( (retval= games_findbaton(cp,playertxid,&keystrokes,numkeys,regslot,playerdata,batontxid,batonvout,batonvalue,batonht,gametxid,gametx,maxplayers,gamesaddr,numplayers,symbol,pname)) == 0 ) - { - UniValue obj; - //fprintf(stderr,"got baton\n"); - seed = games_gamefields(obj,maxplayers,buyin,gametxid,gamesaddr); - //fprintf(stderr,"(%s) found baton %s numkeys.%d seed.%llu playerdata.%d playertxid.%s\n",pname.size()!=0?pname.c_str():Games_pname.c_str(),batontxid.ToString().c_str(),numkeys,(long long)seed,(int32_t)playerdata.size(),playertxid.GetHex().c_str()); - memset(&P,0,sizeof(P)); - if ( playerdata.size() > 0 ) - { - for (i=0; i no playerdata\n"); - newdata.resize(0); - *numkeysp = numkeys; - return(keystrokes); - } - else - { - *numkeysp = numkeys; - return(keystrokes); - } - } else num = 0; - } - else - { - fprintf(stderr,"extractgame: couldnt find baton keystrokes.%p retval.%d\n",keystrokes,retval); - if ( keystrokes != 0 ) - free(keystrokes), keystrokes = 0; - } - } else fprintf(stderr,"extractgame: invalid game\n"); - //fprintf(stderr,"extract %s\n",gametxid.GetHex().c_str()); - return(0); -} - -UniValue games_extract(uint64_t txfee,struct CCcontract_info *cp,cJSON *params) -{ - UniValue result(UniValue::VOBJ); CPubKey pk,gamespk; int32_t i,n,numkeys,flag = 0; uint64_t seed; char str[512],gamesaddr[64],*pubstr,*hexstr; gamesevent *keystrokes = 0; std::vector newdata; uint256 gametxid,playertxid; FILE *fp; uint8_t pub33[33]; - pk = pubkey2pk(Mypubkey()); - gamespk = GetUnspendable(cp,0); - result.push_back(Pair("name","games")); - result.push_back(Pair("method","extract")); - gamesaddr[0] = 0; - if ( params != 0 && (n= cJSON_GetArraySize(params)) > 0 ) - { - if ( n > 0 ) - { - gametxid = juint256(jitem(params,0)); - result.push_back(Pair("gametxid",gametxid.GetHex())); - if ( n == 2 ) - { - if ( (pubstr= jstr(jitem(params,1),0)) != 0 ) - { - if (strlen(pubstr) == 66 ) - { - decode_hex(pub33,33,pubstr); - pk = buf2pk(pub33); - } - else if ( strlen(pubstr) < 36 ) - strcpy(gamesaddr,pubstr); - } - //fprintf(stderr,"gametxid.%s %s\n",gametxid.GetHex().c_str(),pubstr); - } - if ( gamesaddr[0] == 0 ) - GetCCaddress1of2(cp,gamesaddr,gamespk,pk); - result.push_back(Pair("gamesaddr",gamesaddr)); - str[0] = 0; - if ( (keystrokes= games_extractgame(1,str,&numkeys,newdata,seed,playertxid,cp,gametxid,gamesaddr)) != 0 ) - { - result.push_back(Pair("status","success")); - flag = 1; - hexstr = (char *)calloc(1,sizeof(gamesevent)*numkeys*2 + 1); - for (i=0; i highlander vout from creategame TCBOO - //vin1 -> keystrokes baton of completed game, must be last to quit or first to win, only spent registration batons matter. If more than 60 blocks since last keystrokes, it is forfeit - //vins2+ -> rest of unspent registration utxo so all newgame vouts are spent - //vout0 -> nonfungible character with pack @ - //vout1 -> 1% ingame gold and all the buyins - - // detect if last to bailout - // vin0 -> kestrokes baton of completed game with Q - // vout0 -> playerdata marker - // vout0 -> 1% ingame gold - // get any playerdata, get all keystrokes, replay game and compare final state - CMutableTransaction mtx = CreateNewContextualCMutableTransaction(Params().GetConsensus(), hush_nextheight()); - UniValue result(UniValue::VOBJ); std::string rawtx,symbol,pname; CTransaction gametx; uint64_t seed; int64_t buyin,batonvalue,inputsum,cashout=0,CCchange=0; int32_t i,err,gameheight,tmp,numplayers,regslot,n,num,numkeys,maxplayers,batonht,batonvout; char mygamesaddr[64],str[512]; gamesevent *keystrokes = 0; std::vector playerdata,newdata,nodata; uint256 batontxid,playertxid,gametxid; CPubKey mypk,gamespk; uint8_t player[10000],mypriv[32],funcid; - struct CCcontract_info *cpTokens, tokensC; - - if ( txfee == 0 ) - txfee = 10000; - mypk = pubkey2pk(Mypubkey()); - gamespk = GetUnspendable(cp,0); - GetCCaddress1of2(cp,mygamesaddr,gamespk,mypk); - result.push_back(Pair("name","games")); - result.push_back(Pair("method",method)); - result.push_back(Pair("mygamesaddr",mygamesaddr)); - if ( strcmp(method,"bailout") == 0 ) - funcid = 'Q'; - else funcid = 'H'; - if ( params != 0 && (n= cJSON_GetArraySize(params)) > 0 ) - { - if ( n > 0 ) - { - gametxid = juint256(jitem(params,0)); - result.push_back(Pair("gametxid",gametxid.GetHex())); - if ( (err= games_isvalidgame(cp,gameheight,gametx,buyin,maxplayers,gametxid,1)) == 0 ) - { - if ( games_findbaton(cp,playertxid,&keystrokes,numkeys,regslot,playerdata,batontxid,batonvout,batonvalue,batonht,gametxid,gametx,maxplayers,mygamesaddr,numplayers,symbol,pname) == 0 ) - { - UniValue obj; struct games_player P; - seed = games_gamefields(obj,maxplayers,buyin,gametxid,mygamesaddr); - fprintf(stderr,"(%s) found baton %s numkeys.%d seed.%llu playerdata.%d\n",pname.size()!=0?pname.c_str():Games_pname.c_str(),batontxid.ToString().c_str(),numkeys,(long long)seed,(int32_t)playerdata.size()); - memset(&P,0,sizeof(P)); - if ( playerdata.size() > 0 ) - { - for (i=0; i 0 ) - { - newdata.resize(num); - for (i=0; i no playerdata\n"); - newdata.resize(0); - } - else - { - cpTokens = CCinit(&tokensC, EVAL_TOKENS); - mtx.vout.push_back(MakeCC1vout(EVAL_TOKENS, txfee, GetUnspendable(cpTokens,NULL))); // marker to token cc addr, burnable and validated - mtx.vout.push_back(MakeTokensCC1vout(cp->evalcode,1,mypk)); - cashout = games_cashout(&P); - fprintf(stderr,"\ncashout %.8f extracted %s\n",(double)cashout/COIN,str); - if ( funcid == 'H' && maxplayers > 1 ) - { - /*if ( P.amulet == 0 ) - { - if ( numplayers != maxplayers ) - return(cclib_error(result,"numplayers != maxplayers")); - else if ( games_playersalive(tmp,tmp,gametxid,maxplayers,gameheight,gametx) > 1 ) - return(cclib_error(result,"highlander must be a winner or last one standing")); - }*/ - cashout += games_buyins(gametxid,maxplayers);//numplayers * buyin; - } - if ( cashout > 0 ) - { - if ( (inputsum= AddCClibInputs(cp,mtx,gamespk,cashout,60,cp->unspendableCCaddr,1)) > cashout ) - CCchange = (inputsum - cashout); - else fprintf(stderr,"couldnt find enough utxos\n"); - } - mtx.vout.push_back(CTxOut(cashout,CScript() << ParseHex(HexStr(mypk)) << OP_CHECKSIG)); - } - } - if ( CCchange + (batonvalue-3*txfee) >= txfee ) - mtx.vout.push_back(MakeCC1vout(cp->evalcode,CCchange + (batonvalue-3*txfee),gamespk)); - Myprivkey(mypriv); - CCaddr1of2set(cp,gamespk,mypk,mypriv,mygamesaddr); - CScript opret; - if ( pname.size() == 0 ) - pname = Games_pname; - if ( newdata.size() == 0 ) - { - opret = games_finishopret(funcid, gametxid, regslot, mypk, nodata,pname); - rawtx = FinalizeCCTx(0,cp,mtx,mypk,txfee,opret); - //fprintf(stderr,"nodata finalizetx.(%s)\n",rawtx.c_str()); - } - else - { - opret = games_finishopret(funcid, gametxid, regslot, mypk, newdata,pname); - char seedstr[32]; - sprintf(seedstr,"%llu",(long long)seed); - std::vector vopretNonfungible; - GetOpReturnData(opret, vopretNonfungible); - rawtx = FinalizeCCTx(0, cp, mtx, mypk, txfee, EncodeTokenCreateOpRet('c', Mypubkey(), std::string(seedstr), gametxid.GetHex(), vopretNonfungible)); - } - memset(mypriv,0,sizeof(mypriv)); - return(games_rawtxresult(result,rawtx,1)); - } - result.push_back(Pair("result","success")); - } else fprintf(stderr,"illegal game err.%d\n",err); - } else fprintf(stderr,"parameters only n.%d\n",n); - } - return(result); -} - -UniValue games_bailout(uint64_t txfee,struct CCcontract_info *cp,cJSON *params) -{ - return(games_finish(txfee,cp,params,(char *)"bailout")); -} - -UniValue games_highlander(uint64_t txfee,struct CCcontract_info *cp,cJSON *params) -{ - return(games_finish(txfee,cp,params,(char *)"highlander")); -} - -UniValue games_players(uint64_t txfee,struct CCcontract_info *cp,cJSON *params) -{ - UniValue result(UniValue::VOBJ),a(UniValue::VARR); int64_t buyin; uint256 tokenid,gametxid,txid,hashBlock; CTransaction playertx,tx; int32_t maxplayers,vout,numvouts; std::vector playerdata; CPubKey gamespk,mypk,pk; std::string symbol,pname; char coinaddr[64]; - std::vector > unspentOutputs; - gamespk = GetUnspendable(cp,0); - mypk = pubkey2pk(Mypubkey()); - GetTokensCCaddress(cp,coinaddr,mypk); - SetCCunspents(unspentOutputs,coinaddr,true); - games_univalue(result,"players",-1,-1); - for (std::vector >::const_iterator it=unspentOutputs.begin(); it!=unspentOutputs.end(); it++) - { - txid = it->first.txhash; - vout = (int32_t)it->first.index; - //char str[65]; fprintf(stderr,"%s check %s/v%d %.8f\n",coinaddr,uint256_str(str,txid),vout,(double)it->second.satoshis/COIN); - if ( it->second.satoshis != 1 || vout > 1 ) - continue; - if ( games_playerdata(cp,gametxid,tokenid,pk,playerdata,symbol,pname,txid) == 0 )//&& pk == mypk ) - { - a.push_back(txid.GetHex()); - //a.push_back(Pair("playerdata",games_playerobj(playerdata))); - } - } - result.push_back(Pair("playerdata",a)); - result.push_back(Pair("numplayerdata",(int64_t)a.size())); - return(result); -} - -UniValue games_games(uint64_t txfee,struct CCcontract_info *cp,cJSON *params) -{ - UniValue result(UniValue::VOBJ),a(UniValue::VARR),b(UniValue::VARR); uint256 txid,hashBlock,gametxid,tokenid,playertxid; int32_t vout,maxplayers,gameheight,numvouts; CPubKey gamespk,mypk; char coinaddr[64]; CTransaction tx,gametx; int64_t buyin; - std::vector txids; - gamespk = GetUnspendable(cp,0); - mypk = pubkey2pk(Mypubkey()); - GetCCaddress1of2(cp,coinaddr,gamespk,mypk); - SetCCtxids(txids,coinaddr,true,cp->evalcode,zeroid,'R'); - games_univalue(result,"games",-1,-1); - for (std::vector::const_iterator it=txids.begin(); it!=txids.end(); it++) - { - txid = *it; - //char str[65]; fprintf(stderr,"%s check %s/v%d %.8f\n",coinaddr,uint256_str(str,txid),vout,(double)it->second.satoshis/COIN); - if ( myGetTransaction(txid,tx,hashBlock) != 0 && (numvouts= tx.vout.size()) > 1 ) - { - if ( games_registeropretdecode(gametxid,tokenid,playertxid,tx.vout[numvouts-1].scriptPubKey) == 'R' ) - { - if ( games_isvalidgame(cp,gameheight,gametx,buyin,maxplayers,gametxid,0) == 0 ) - { - if ( CCgettxout(txid,vout,1,0) < 0 ) - b.push_back(gametxid.GetHex()); - else a.push_back(gametxid.GetHex()); - } - } - } - } - result.push_back(Pair("pastgames",b)); - result.push_back(Pair("games",a)); - result.push_back(Pair("numgames",(int64_t)(a.size()+b.size()))); - return(result); -} - -UniValue games_setname(uint64_t txfee,struct CCcontract_info *cp,cJSON *params) -{ - UniValue result(UniValue::VOBJ); int32_t n; char *namestr = 0; - games_univalue(result,"setname",-1,-1); - if ( params != 0 && (n= cJSON_GetArraySize(params)) > 0 ) - { - if ( n > 0 ) - { - if ( (namestr= jstri(params,0)) != 0 ) - { - result.push_back(Pair("result","success")); - result.push_back(Pair("pname",namestr)); - Games_pname = namestr; - return(result); - } - } - } - result.push_back(Pair("result","error")); - result.push_back(Pair("error","couldnt get name")); - return(result); -} - -UniValue games_fund(uint64_t txfee,struct CCcontract_info *cp,cJSON *params) -{ - CMutableTransaction mtx = CreateNewContextualCMutableTransaction(Params().GetConsensus(), hush_nextheight()); - UniValue result(UniValue::VOBJ); std::string rawtx; int64_t amount,inputsum; CPubKey gamespk,mypk; CScript opret; - if ( params != 0 && cJSON_GetArraySize(params) == 1 ) - { - amount = jdouble(jitem(params,0),0) * COIN + 0.0000000049; - gamespk = GetUnspendable(cp,0); - mypk = pubkey2pk(Mypubkey()); - if ( amount > GAMES_TXFEE ) - { - if ( (inputsum= AddNormalinputs(mtx,mypk,amount+GAMES_TXFEE,64)) >= amount+GAMES_TXFEE ) - { - mtx.vout.push_back(MakeCC1vout(cp->evalcode,amount,gamespk)); - rawtx = FinalizeCCTx(0,cp,mtx,mypk,GAMES_TXFEE,opret); - return(games_rawtxresult(result,rawtx,1)); - } - else - { - result.push_back(Pair("result","error")); - result.push_back(Pair("error","not enough funds")); - } - } - else - { - result.push_back(Pair("result","error")); - result.push_back(Pair("error","amount too small")); - } - } - else - { - result.push_back(Pair("result","error")); - result.push_back(Pair("error","couldnt parse")); - } - return(result); -} - -int32_t games_playerdata_validate(int64_t *cashoutp,uint256 &playertxid,struct CCcontract_info *cp,std::vector playerdata,uint256 gametxid,CPubKey pk) -{ - static uint32_t good,bad; static uint256 prevgame; - char str[512],gamesaddr[64],str2[67],fname[64]; gamesevent *keystrokes; int32_t i,numkeys; std::vector newdata; uint64_t seed; CPubKey gamespk; struct games_player P; - *cashoutp = 0; - gamespk = GetUnspendable(cp,0); - GetCCaddress1of2(cp,gamesaddr,gamespk,pk); - if ( (keystrokes= games_extractgame(0,str,&numkeys,newdata,seed,playertxid,cp,gametxid,gamesaddr)) != 0 ) - { - free(keystrokes); - sprintf(fname,"%s.%llu.pack",GAMENAME,(long long)seed); - remove(fname); - for (i=0; i int64_t Add1of2AddressInputs(struct CCcontract_info* cp, if ((txid == fundingtxid || fundingTxidInOpret == fundingtxid) && funcId != 0 && isMyFuncId(funcId) && - (typeid(Helper) != typeid(TokenHelper) || IsTokensvout(true, true, cp, nullptr, heirtx, voutIndex, tokenid) > 0) && // token validation logic + (typeid(Helper) != typeid(TokenHelper) ) && // token validation logic //(voutValue = IsHeirFundingVout(cp, heirtx, voutIndex, ownerPubkey, heirPubkey)) > 0 && // heir contract vout validation logic - not used since we moved to 2-eval vouts !myIsutxo_spentinmempool(ignoretxid,ignorevin,txid, voutIndex)) { @@ -596,7 +596,7 @@ template int64_t LifetimeHeirContractFunds(struct CCcontract_info if (funcId != 0 && (txid == fundingtxid || fundingTxidInOpret == fundingtxid) && isMyFuncId(funcId) && !isSpendingTx(funcId) && - (typeid(Helper) != typeid(TokenHelper) || IsTokensvout(true, true, cp, nullptr, heirtx, ivout, tokenid) > 0) && + (typeid(Helper) != typeid(TokenHelper) ) && !myIsutxo_spentinmempool(ignoretxid,ignorevin,txid, ivout)) // exclude tx in mempool { total += it->second; // dont do this: tx.vout[ivout].nValue; // in vin[0] always is the pay to 1of2 addr (funding or change) diff --git a/src/cc/heir_validate.h b/src/cc/heir_validate.h index b5c5e0c62..4e0a24668 100644 --- a/src/cc/heir_validate.h +++ b/src/cc/heir_validate.h @@ -68,9 +68,12 @@ class TokenHelper { public: static uint8_t getMyEval() { return EVAL_TOKENS; } static int64_t addOwnerInputs(uint256 tokenid, CMutableTransaction& mtx, CPubKey ownerPubkey, int64_t total, int32_t maxinputs) { + /* struct CCcontract_info *cpHeir, heirC; cpHeir = CCinit(&heirC, EVAL_TOKENS); return AddTokenCCInputs(cpHeir, mtx, ownerPubkey, tokenid, total, maxinputs); + */ + return 0; } static CScript makeCreateOpRet(uint256 tokenid, std::vector voutTokenPubkeys, CPubKey ownerPubkey, CPubKey heirPubkey, int64_t inactivityTimeSec, std::string heirName, std::string memo) { diff --git a/src/cc/import.cpp b/src/cc/import.cpp deleted file mode 100644 index 98cd3f30c..000000000 --- a/src/cc/import.cpp +++ /dev/null @@ -1,764 +0,0 @@ -// Copyright (c) 2016-2023 The Hush developers -// Distributed under the GPLv3 software license, see the accompanying -// file COPYING or https://www.gnu.org/licenses/gpl-3.0.en.html -/****************************************************************************** - * Copyright © 2014-2019 The SuperNET Developers. * - * * - * See the AUTHORS, DEVELOPER-AGREEMENT and LICENSE files at * - * the top-level directory of this distribution for the individual copyright * - * holder information and the developer policies on copyright and licensing. * - * * - * Unless otherwise agreed in a custom licensing agreement, no part of the * - * SuperNET software, including this file may be copied, modified, propagated * - * or distributed except according to the terms contained in the LICENSE file * - * * - * Removal or modification of this copyright notice is prohibited. * - * * - ******************************************************************************/ - -#include "cc/eval.h" -#include "cc/utils.h" -#include "importcoin.h" -#include "crosschain.h" -#include "primitives/transaction.h" -#include "cc/CCinclude.h" -#include -#include "cc/CCtokens.h" - -#include "key_io.h" -#define CODA_BURN_ADDRESS "KPrrRoPfHOnNpZZQ6laHXdQDkSQDkVHaN0V+LizLlHxz7NaA59sBAAAA" -/* - * CC Eval method for import coin. - * - * This method should control every parameter of the ImportCoin transaction, since it has no signature - * to protect it from malleability. - - ##### 0xffffffff is a special CCid for single chain/dual daemon imports - */ - -extern std::string ASSETCHAINS_SELFIMPORT; -extern uint16_t ASSETCHAINS_CODAPORT,ASSETCHAINS_BEAMPORT; -extern uint8_t ASSETCHAINS_OVERRIDE_PUBKEY33[33]; -extern uint256 HUSH_EARLYTXID; - -// utilities from gateways.cpp -uint256 BitcoinGetProofMerkleRoot(const std::vector &proofData, std::vector &txids); -uint256 GatewaysReverseScan(uint256 &txid, int32_t height, uint256 reforacletxid, uint256 batontxid); -int32_t GatewaysCointxidExists(struct CCcontract_info *cp, uint256 cointxid); -uint8_t DecodeImportGatewayBindOpRet(char *burnaddr,const CScript &scriptPubKey,std::string &coin,uint256 &oracletxid,uint8_t &M,uint8_t &N,std::vector &importgatewaypubkeys,uint8_t &taddr,uint8_t &prefix,uint8_t &prefix2,uint8_t &wiftype); -int64_t ImportGatewayVerify(char *refburnaddr,uint256 oracletxid,int32_t claimvout,std::string refcoin,uint256 burntxid,const std::string deposithex,std::vectorproof,uint256 merkleroot,CPubKey destpub,uint8_t taddr,uint8_t prefix,uint8_t prefix2); -char *nonportable_path(char *str); -char *portable_path(char *str); -void *loadfile(char *fname,uint8_t **bufp,long *lenp,long *allocsizep); -void *filestr(long *allocsizep,char *_fname); - -cJSON* CodaRPC(char **retstr,char const *arg0,char const *arg1,char const *arg2,char const *arg3,char const *arg4,char const *arg5) -{ - char cmdstr[5000],fname[256],*jsonstr; - long fsize; - cJSON *retjson=NULL; - - sprintf(fname,"/tmp/coda.%s",arg0); - sprintf(cmdstr,"coda.exe client %s %s %s %s %s %s > %s 2>&1",arg0,arg1,arg2,arg3,arg4,arg5,fname); - *retstr = 0; - if (system(cmdstr)<0) return (retjson); - if ( (jsonstr=(char *)filestr(&fsize,fname)) != 0 ) - { - jsonstr[strlen(jsonstr)-1]='\0'; - if ( (strncmp(jsonstr,"Merkle List of transactions:",28)!=0) || (retjson= cJSON_Parse(jsonstr+29)) == 0) - *retstr=jsonstr; - else free(jsonstr); - } - return(retjson); -} - -// makes source tx for self import tx -CMutableTransaction MakeSelfImportSourceTx(CTxDestination &dest, int64_t amount) -{ - const int64_t txfee = 10000; - int64_t inputs, change; - CPubKey myPubKey = Mypubkey(); - struct CCcontract_info *cpDummy, C; - - cpDummy = CCinit(&C, EVAL_TOKENS); // this is just for FinalizeCCTx to work - - CMutableTransaction mtx = CreateNewContextualCMutableTransaction(Params().GetConsensus(), hush_nextheight()); - - if (AddNormalinputs(mtx, myPubKey, 2 * txfee, 4) == 0) { - LOGSTREAM("importcoin", CCLOG_INFO, stream << "MakeSelfImportSourceTx() warning: cannot find normal inputs for txfee" << std::endl); - } - - CScript scriptPubKey = GetScriptForDestination(dest); - mtx.vout.push_back(CTxOut(txfee, scriptPubKey)); - - //make opret with 'burned' amount: - FinalizeCCTx(0, cpDummy, mtx, myPubKey, txfee, CScript() << OP_RETURN << E_MARSHAL(ss << (uint8_t)EVAL_IMPORTCOIN << (uint8_t)'A' << amount)); - return mtx; -} - -// make sure vin is signed by pubkey33 -bool CheckVinPubKey(const CTransaction &sourcetx, int32_t i, uint8_t pubkey33[33]) -{ - CTransaction vintx; - uint256 blockHash; - char destaddr[64], pkaddr[64]; - - if (i < 0 || i >= sourcetx.vin.size()) - return false; - - if( !myGetTransaction(sourcetx.vin[i].prevout.hash, vintx, blockHash) ) { - LOGSTREAM("importcoin", CCLOG_INFO, stream << "CheckVinPubKey() could not load vintx" << sourcetx.vin[i].prevout.hash.GetHex() << std::endl); - return false; - } - if( sourcetx.vin[i].prevout.n < vintx.vout.size() && Getscriptaddress(destaddr, vintx.vout[sourcetx.vin[i].prevout.n].scriptPubKey) != 0 ) - { - pubkey2addr(pkaddr, pubkey33); - if (strcmp(pkaddr, destaddr) == 0) { - return true; - } - LOGSTREAM("importcoin", CCLOG_INFO, stream << "CheckVinPubKey() mismatched vin[" << i << "].prevout.n=" << sourcetx.vin[i].prevout.n << " -> destaddr=" << destaddr << " vs pkaddr=" << pkaddr << std::endl); - } - return false; -} - -// ac_import=PUBKEY support: -// prepare a tx for creating import tx and quasi-burn tx -int32_t GetSelfimportProof(const CMutableTransaction sourceMtx, CMutableTransaction &templateMtx, ImportProof &proofNull) // find burnTx with hash from "other" daemon -{ - MerkleBranch newBranch; - CMutableTransaction tmpmtx; - //CTransaction sourcetx; - - tmpmtx = CreateNewContextualCMutableTransaction(Params().GetConsensus(), hush_nextheight()); - - /* - if (!E_UNMARSHAL(ParseHex(rawsourcetx), ss >> sourcetx)) { - LOGSTREAM("importcoin", CCLOG_INFO, stream << "GetSelfimportProof: could not unmarshal source tx" << std::endl); - return(-1); - } - - if (sourcetx.vout.size() == 0) { - LOGSTREAM("importcoin", CCLOG_INFO, stream << "GetSelfimportProof: vout size is 0" << std::endl); - return -1; - } */ - - /*if (ivout < 0) { // "ivout < 0" means "find" - // try to find vout - CPubKey myPubkey = Mypubkey(); - ivout = 0; - // skip change: - if (sourcetx.vout[ivout].scriptPubKey == (CScript() << ParseHex(HexStr(myPubkey)) << OP_CHECKSIG)) - ivout++; - } - - if (ivout >= sourcetx.vout.size()) { - LOGSTREAM("importcoin", CCLOG_INFO, stream << "GetSelfimportProof: needed vout not found" << std::endl); - return -1; - } */ - - int32_t ivout = 0; - - // LOGSTREAM("importcoin", CCLOG_DEBUG1, stream << "GetSelfimportProof: using vout[" << ivout << "] of the passed rawtx" << std::endl); - - CScript scriptPubKey = sourceMtx.vout[ivout].scriptPubKey; - - //mtx is template for import tx - templateMtx = sourceMtx; - templateMtx.fOverwintered = tmpmtx.fOverwintered; - - //malleability fix for burn tx: - //mtx.nExpiryHeight = tmpmtx.nExpiryHeight; - templateMtx.nExpiryHeight = sourceMtx.nExpiryHeight; - - templateMtx.nVersionGroupId = tmpmtx.nVersionGroupId; - templateMtx.nVersion = tmpmtx.nVersion; - templateMtx.vout.clear(); - templateMtx.vout.resize(1); - - uint8_t evalCode, funcId; - int64_t burnAmount; - vscript_t vopret; - if( !GetOpReturnData(sourceMtx.vout.back().scriptPubKey, vopret) || - !E_UNMARSHAL(vopret, ss >> evalCode; ss >> funcId; ss >> burnAmount)) { - LOGSTREAM("importcoin", CCLOG_INFO, stream << "GetSelfimportProof() could not unmarshal source tx opret" << std::endl); - return -1; - } - templateMtx.vout[0].nValue = burnAmount; - templateMtx.vout[0].scriptPubKey = scriptPubKey; - - // not sure we need this now as we create sourcetx ourselves: - /*if (sourcetx.GetHash() != sourcetxid) { - LOGSTREAM("importcoin", CCLOG_INFO, stream << "GetSelfimportProof: passed source txid incorrect" << std::endl); - return(-1); - }*/ - - // check ac_pubkey: - if (!CheckVinPubKey(sourceMtx, 0, ASSETCHAINS_OVERRIDE_PUBKEY33)) { - return -1; - } - proofNull = ImportProof(std::make_pair(sourceMtx.GetHash(), newBranch)); - return 0; -} - -// make import tx with burntx and dual daemon -std::string MakeCodaImportTx(uint64_t txfee, std::string receipt, std::string srcaddr, std::vector vouts) -{ - CMutableTransaction mtx = CreateNewContextualCMutableTransaction(Params().GetConsensus(), hush_nextheight()),burntx = CreateNewContextualCMutableTransaction(Params().GetConsensus(), hush_nextheight()); - CPubKey mypk; uint256 codaburntxid; std::vector dummyproof; - int32_t i,numvouts,n,m; std::string coin,error; struct CCcontract_info *cp, C; - cJSON *result,*tmp,*tmp1; unsigned char hash[SHA256_DIGEST_LENGTH+1]; - char out[SHA256_DIGEST_LENGTH*2+1],*retstr,*destaddr,*receiver; TxProof txProof; uint64_t amount; - - cp = CCinit(&C, EVAL_GATEWAYS); - if (txfee == 0) - txfee = 10000; - mypk = pubkey2pk(Mypubkey()); - SHA256_CTX sha256; - SHA256_Init(&sha256); - SHA256_Update(&sha256, receipt.c_str(), receipt.size()); - SHA256_Final(hash, &sha256); - for(i = 0; i < SHA256_DIGEST_LENGTH; i++) - { - sprintf(out + (i * 2), "%02x", hash[i]); - } - out[65]='\0'; - LOGSTREAM("importcoin", CCLOG_DEBUG1, stream << "MakeCodaImportTx: hash=" << out << std::endl); - codaburntxid.SetHex(out); - LOGSTREAM("importcoin", CCLOG_DEBUG1, stream << "MakeCodaImportTx: receipt=" << receipt << " codaburntxid=" << codaburntxid.GetHex().data() << " amount=" << (double)amount / COIN << std::endl); - result=CodaRPC(&retstr,"prove-payment","-address",srcaddr.c_str(),"-receipt-chain-hash",receipt.c_str(),""); - if (result==0) - { - if (retstr!=0) - { - CCerror=std::string("CodaRPC: ")+retstr; - free(retstr); - } - return(""); - } - else - { - if ((tmp=jobj(jitem(jarray(&n,result,(char *)"payments"),0),(char *)"payload"))!=0 && (destaddr=jstr(jobj(tmp,(char *)"common"),(char *)"memo"))!=0 && - (receiver=jstr(jitem(jarray(&m,tmp,(char *)"body"),1),(char *)"receiver"))!=0 && (amount=j64bits(jitem(jarray(&m,tmp,(char *)"body"),1),(char *)"amount"))!=0) - { - LOGSTREAM("importcoin", CCLOG_DEBUG1, stream << "MakeCodaImportTx: receiver=" << receiver << " destaddr=" << destaddr << " amount=" << amount << std::endl); - if (strcmp(receiver,CODA_BURN_ADDRESS)!=0) - { - CCerror="MakeCodaImportTx: invalid burn address, coins do not go to predefined burn address - "; - CCerror+=CODA_BURN_ADDRESS; - LOGSTREAM("importcoin", CCLOG_INFO, stream << CCerror << std::endl); - free(result); - return(""); - } - CTxDestination dest = DecodeDestination(destaddr); - CScript scriptPubKey = GetScriptForDestination(dest); - if (vouts[0]!=CTxOut(amount*COIN,scriptPubKey)) - { - CCerror="MakeCodaImportTx: invalid destination address, burnTx memo!=importTx destination"; - LOGSTREAM("importcoin", CCLOG_INFO, stream << CCerror << std::endl); - free(result); - return(""); - } - if (amount*COIN!=vouts[0].nValue) - { - CCerror="MakeCodaImportTx: invalid amount, burnTx amount!=importTx amount"; - LOGSTREAM("importcoin", CCLOG_INFO, stream << CCerror << std::endl); - free(result); - return(""); - } - burntx.vin.push_back(CTxIn(codaburntxid,0,CScript())); - burntx.vout.push_back(MakeBurnOutput(amount*COIN,0xffffffff,"CODA",vouts,dummyproof,srcaddr,receipt)); - return HexStr(E_MARSHAL(ss << MakeImportCoinTransaction(txProof,burntx,vouts))); - } - else - { - CCerror="MakeCodaImportTx: invalid Coda burn tx"; - LOGSTREAM("importcoin", CCLOG_INFO, stream << CCerror << std::endl); - free(result); - return(""); - } - - } - CCerror="MakeCodaImportTx: error fetching Coda tx"; - LOGSTREAM("importcoin", CCLOG_INFO, stream << CCerror << std::endl); - free(result); - return(""); -} - -// use proof from the above functions to validate the import - -int32_t CheckBEAMimport(TxProof proof,std::vector rawproof,CTransaction burnTx,std::vector payouts) -{ - // check with dual-BEAM daemon via ASSETCHAINS_BEAMPORT for validity of burnTx - return(-1); -} - -int32_t CheckCODAimport(CTransaction importTx,CTransaction burnTx,std::vector payouts,std::string srcaddr,std::string receipt) -{ - cJSON *result,*tmp,*tmp1; char *retstr,out[SHA256_DIGEST_LENGTH*2+1]; unsigned char hash[SHA256_DIGEST_LENGTH+1]; int i,n,m; - SHA256_CTX sha256; uint256 codaburntxid; char *destaddr,*receiver; uint64_t amount; - - // check with dual-CODA daemon via ASSETCHAINS_CODAPORT for validity of burnTx - SHA256_Init(&sha256); - SHA256_Update(&sha256, receipt.c_str(), receipt.size()); - SHA256_Final(hash, &sha256); - for(i = 0; i < SHA256_DIGEST_LENGTH; i++) - { - sprintf(out + (i * 2), "%02x", hash[i]); - } - out[65]='\0'; - codaburntxid.SetHex(out); - result=CodaRPC(&retstr,"prove-payment","-address",srcaddr.c_str(),"-receipt-chain-hash",receipt.c_str(),""); - if (result==0) - { - LOGSTREAM("importcoin", CCLOG_INFO, stream << "CodaRPC error: " << retstr << std::endl); - free(retstr); - return (-1); - } - else - { - if ((tmp=jobj(jitem(jarray(&n,result,(char *)"payments"),0),(char *)"payload"))==0 || (destaddr=jstr(jobj(tmp,(char *)"common"),(char *)"memo"))==0 || - (receiver=jstr(jitem(jarray(&m,tmp,(char *)"body"),1),(char *)"receiver"))==0 || (amount=j64bits(jitem(jarray(&m,tmp,(char *)"body"),1),(char *)"amount"))==0) - { - LOGSTREAM("importcoin", CCLOG_INFO, stream << "Invalid Coda burn tx" << jprint(result,1) << std::endl); - free(result); - return (-1); - } - CTxDestination dest = DecodeDestination(destaddr); - CScript scriptPubKey = GetScriptForDestination(dest); - if (payouts[0]!=CTxOut(amount*COIN,scriptPubKey)); - { - LOGSTREAM("importcoin", CCLOG_INFO, stream << "Destination address in burn tx does not match destination in import tx" << std::endl); - free(result); - return (-1); - } - if (strcmp(receiver,CODA_BURN_ADDRESS)!=0) - { - LOGSTREAM("importcoin", CCLOG_INFO, stream << "Invalid burn address " << jstr(tmp1,(char *)"receiver") << std::endl); - free(result); - return (-1); - } - if (amount*COIN!=payouts[0].nValue) - { - LOGSTREAM("importcoin", CCLOG_INFO, stream << "Burn amount and import amount not matching, " << j64bits(tmp,(char *)"amount") << " - " << payouts[0].nValue/COIN << std::endl); - free(result); - return (-1); - } - if (burnTx.vin[0].prevout.hash!=codaburntxid || importTx.vin[0].prevout.hash!=burnTx.GetHash()) - { - LOGSTREAM("importcoin", CCLOG_INFO, stream << "Invalid import/burn tx vin" << std::endl); - free(result); - return (-1); - } - free(result); - } - return(0); -} - -int32_t CheckGATEWAYimport(CTransaction importTx,CTransaction burnTx,std::string refcoin,std::vector proof, - uint256 bindtxid,std::vector publishers,std::vector txids,uint256 burntxid,int32_t height,int32_t burnvout,std::string rawburntx,CPubKey destpub, int64_t amount) -{ - CTransaction oracletx,bindtx,regtx; int32_t i,m,n=0,numvouts; uint8_t M,N,taddr,prefix,prefix2,wiftype; - uint256 txid,oracletxid,tmporacletxid,merkleroot,mhash,hashBlock; - std::string name,desc,format,coin; std::vector vouts; CPubKey regpk; - std::vector pubkeys,tmppubkeys,tmppublishers; char markeraddr[64],deposit[64],destaddr[64],tmpdest[64]; int64_t datafee; - std::vector > unspentOutputs; - - // ASSETCHAINS_SELFIMPORT is coin - if (HUSH_EARLYTXID!=zeroid && bindtxid!=HUSH_EARLYTXID) - { - LOGSTREAM("importgateway", CCLOG_INFO, stream << "CheckGATEWAYimport invalid import gateway. On this chain only valid import gateway is " << HUSH_EARLYTXID.GetHex() << std::endl); - return(-1); - } - // check for valid burn from external coin blockchain and if valid return(0); - if (myGetTransaction(bindtxid, bindtx, hashBlock) == 0 || (numvouts = bindtx.vout.size()) <= 0) - { - LOGSTREAM("importgateway", CCLOG_INFO, stream << "CheckGATEWAYimport cant find bindtxid=" << bindtxid.GetHex() << std::endl); - return(-1); - } - else if (DecodeImportGatewayBindOpRet(deposit,bindtx.vout[numvouts - 1].scriptPubKey,coin,oracletxid,M,N,tmppubkeys,taddr,prefix,prefix2,wiftype) != 'B') - { - LOGSTREAM("importcoin", CCLOG_INFO, stream << "CheckGATEWAYimport invalid bind tx. bindtxid=" << bindtxid.GetHex() << std::endl); - return(-1); - } - else if (refcoin!=coin) - { - LOGSTREAM("importgateway", CCLOG_INFO, stream << "CheckGATEWAYimport invalid coin " << refcoin << "!=" << coin << std::endl); - return(-1); - } - else if ( N == 0 || N > 15 || M > N ) - { - LOGSTREAM("importgateway", CCLOG_INFO, stream << "CheckGATEWAYimport invalid N or M " << std::endl); - return(-1); - } - else if (tmppubkeys.size()!=N) - { - LOGSTREAM("importgateway", CCLOG_INFO, stream << "CheckGATEWAYimport not enough pubkeys for given N " << std::endl); - return(-1); - } - else if (hush_txnotarizedconfirmed(bindtxid) == false) - { - LOGSTREAM("importgateway", CCLOG_INFO, stream << "CheckGATEWAYimport bindtx not yet confirmed/notarized" << std::endl); - return(-1); - } - else if (myGetTransaction(oracletxid, oracletx, hashBlock) == 0 || (numvouts = oracletx.vout.size()) <= 0) - { - LOGSTREAM("importgateway", CCLOG_INFO, stream << "CheckGATEWAYimport cant find oracletxid=" << oracletxid.GetHex() << std::endl); - return(-1); - } - else if (DecodeOraclesCreateOpRet(oracletx.vout[numvouts - 1].scriptPubKey,name,desc,format) != 'C') - { - LOGSTREAM("importgateway", CCLOG_INFO, stream << "CheckGATEWAYimport invalid oracle tx. oracletxid=" << oracletxid.GetHex() << std::endl); - return(-1); - } - else if (name!=refcoin || format!="Ihh") - { - LOGSTREAM("importgateway", CCLOG_INFO, stream << "CheckGATEWAYimport invalid oracle name or format tx. oracletxid=" << oracletxid.GetHex() << " name=" << name << " format=" << format << std::endl); - return(-1); - } - CCtxidaddr(markeraddr,oracletxid); - SetCCunspents(unspentOutputs,markeraddr,false); - for (std::vector >::const_iterator it=unspentOutputs.begin(); it!=unspentOutputs.end(); it++) - { - txid = it->first.txhash; - if ( myGetTransaction(txid,regtx,hashBlock) != 0 && regtx.vout.size() > 0 - && DecodeOraclesOpRet(regtx.vout[regtx.vout.size()-1].scriptPubKey,tmporacletxid,regpk,datafee) == 'R' && oracletxid == tmporacletxid ) - { - pubkeys.push_back(regpk); - n++; - } - } - if (pubkeys.size()!=tmppubkeys.size()) - { - LOGSTREAM("importgateway", CCLOG_INFO, stream << "CheckGATEWAYimport different number of bind and oracle pubkeys " << tmppubkeys.size() << "!=" << pubkeys.size() << std::endl); - return(-1); - } - merkleroot = zeroid; - for (i = m = 0; i < n; i++) - { - if ((mhash = CCOraclesReverseScan("importgateway-1",txid, height, oracletxid, OraclesBatontxid(oracletxid, pubkeys[i]))) != zeroid) - { - if (merkleroot == zeroid) - merkleroot = mhash, m = 1; - else if (mhash == merkleroot) - m ++; - tmppublishers.push_back(pubkeys[i]); - } - } - if (publishers.size()!=tmppublishers.size()) - { - LOGSTREAM("importgateway", CCLOG_INFO, stream << "CheckGATEWAYimport different number of publishers for burtx in oracle" << std::endl); - return(-1); - } - else if (merkleroot == zeroid || m < n / 2) // none or less than half oracle nodes sent merkleroot - { - LOGSTREAM("importgateway", CCLOG_INFO, stream << "CheckGATEWAYimport couldnt find merkleroot for block height=" << height << "coin=" << refcoin.c_str() << " oracleid=" << oracletxid.GetHex() << " m=" << m << " vs n=" << n << std::endl ); - return(-1); - } - else if ( ImportGatewayVerify(deposit,oracletxid,burnvout,refcoin,burntxid,rawburntx,proof,merkleroot,destpub,taddr,prefix,prefix2) != amount ) - { - CCerror = strprintf("burntxid didnt validate !"); - LOGSTREAM("importgateway",CCLOG_INFO, stream << CCerror << std::endl); - return(-1); - } - else if (importTx.vout[0].nValue!=amount) - { - LOGSTREAM("importgateway", CCLOG_INFO, stream << "CheckGATEWAYimport import amount different than in burntx" << std::endl); - return(-1); - } - Getscriptaddress(destaddr,importTx.vout[0].scriptPubKey); - Getscriptaddress(tmpdest,CScript() << ParseHex(HexStr(destpub)) << OP_CHECKSIG); - if (strcmp(destaddr,tmpdest)!=0) - { - LOGSTREAM("importgateway", CCLOG_INFO, stream << "CheckGATEWAYimport import coins destination different than in burntx" << std::endl); - return(-1); - } - return(0); -} - -int32_t CheckPUBKEYimport(TxProof proof,std::vector rawproof,CTransaction burnTx,std::vector payouts) -{ - // if burnTx has ASSETCHAINS_PUBKEY vin, it is valid return(0); - LOGSTREAM("importcoin", CCLOG_DEBUG1, stream << "proof txid=" << proof.first.GetHex() << std::endl); - - uint256 sourcetxid = proof.first, hashBlock; - CTransaction sourcetx; - - if (!myGetTransaction(sourcetxid, sourcetx, hashBlock)) { - LOGSTREAM("importcoin", CCLOG_INFO, stream << "could not load source txid=" << sourcetxid.GetHex() << std::endl); - return -1; - } - - if (sourcetx.vout.size() == 0) { - LOGSTREAM("importcoin", CCLOG_INFO, stream << "no vouts in source txid=" << sourcetxid.GetHex() << std::endl); - return -1; - } - - // might be malleable: - if (burnTx.nExpiryHeight != sourcetx.nExpiryHeight) { - LOGSTREAM("importcoin", CCLOG_INFO, stream << "burntx nExpiryHeight incorrect for source txid=" << sourcetxid.GetHex() << std::endl); - return -1; - } - - //ac_pubkey check: - if (!CheckVinPubKey(sourcetx, 0, ASSETCHAINS_OVERRIDE_PUBKEY33)) { - return -1; - } - - // get source tx opret: - std::vector vopret; - uint8_t evalCode, funcId; - int64_t amount; - - if (!GetOpReturnData(sourcetx.vout.back().scriptPubKey, vopret) || - vopret.size() == 0 || - !E_UNMARSHAL(vopret, ss >> evalCode; ss >> funcId; ss >> amount) || - evalCode != EVAL_IMPORTCOIN || funcId != 'A') { - LOGSTREAM("importcoin", CCLOG_INFO, stream << "none or incorrect opret to validate in source txid=" << sourcetxid.GetHex() << std::endl); - return -1; - } - - LOGSTREAM("importcoin", CCLOG_DEBUG1, stream << "importTx amount=" << payouts[0].nValue << " burnTx amount=" << burnTx.vout[0].nValue << " opret amount=" << amount << " source txid=" << sourcetxid.GetHex() << std::endl); - - // amount malleability check with the opret from the source tx: - if (payouts[0].nValue != amount) { // assume that burntx amount is checked in the common code in Eval::ImportCoin() - LOGSTREAM("importcoin", CCLOG_INFO, stream << "importTx amount != amount in the opret of source txid=" << sourcetxid.GetHex() << std::endl); - return -1; - } - - return(0); -} - -bool CheckMigration(Eval *eval, const CTransaction &importTx, const CTransaction &burnTx, std::vector & payouts, const ImportProof &proof, const std::vector &rawproof) -{ - vscript_t vimportOpret; - if (!GetOpReturnData(importTx.vout.back().scriptPubKey, vimportOpret) || - vimportOpret.empty()) - return eval->Invalid("invalid-import-tx-no-opret"); - - - uint256 tokenid = zeroid; - if (vimportOpret.begin()[0] == EVAL_TOKENS) { // for tokens (new opret with tokens) - struct CCcontract_info *cpTokens, CCtokens_info; - std::vector> oprets; - uint8_t evalCodeInOpret; - std::vector voutTokenPubkeys; - vscript_t vnonfungibleOpret; - - cpTokens = CCinit(&CCtokens_info, EVAL_TOKENS); - - if (DecodeTokenOpRet(importTx.vout.back().scriptPubKey, evalCodeInOpret, tokenid, voutTokenPubkeys, oprets) == 0) - return eval->Invalid("cannot-decode-import-tx-token-opret"); - - uint8_t nonfungibleEvalCode = EVAL_TOKENS; // init to no non-fungibles - GetOpretBlob(oprets, OPRETID_NONFUNGIBLEDATA, vnonfungibleOpret); - if (!vnonfungibleOpret.empty()) - nonfungibleEvalCode = vnonfungibleOpret.begin()[0]; - - // check if burn tx at least has cc evaltoken vins (we cannot get cc input) - bool hasTokenVin = false; - for (auto vin : burnTx.vin) - if (cpTokens->ismyvin(vin.scriptSig)) - hasTokenVin = true; - if (!hasTokenVin) - return eval->Invalid("burn-tx-has-no-token-vins"); - - // calc outputs for burn tx - CAmount ccBurnOutputs = 0; - for (auto v : burnTx.vout) - if (v.scriptPubKey.IsPayToCryptoCondition() && - CTxOut(v.nValue, v.scriptPubKey) == MakeTokensCC1vout(nonfungibleEvalCode, v.nValue, pubkey2pk(ParseHex(CC_BURNPUBKEY)))) // burned to dead pubkey - ccBurnOutputs += v.nValue; - - // calc outputs for import tx - CAmount ccImportOutputs = 0; - for (auto v : importTx.vout) - if (v.scriptPubKey.IsPayToCryptoCondition() && - !IsTokenMarkerVout(v)) // should not be marker here - ccImportOutputs += v.nValue; - - if (ccBurnOutputs != ccImportOutputs) - return eval->Invalid("token-cc-burned-output-not-equal-cc-imported-output"); - - } - else if (vimportOpret.begin()[0] != EVAL_IMPORTCOIN) { - return eval->Invalid("import-tx-incorrect-opret-eval"); - } - - // for tokens check burn, import, tokenbase tx - if (!tokenid.IsNull()) { - - std::string sourceSymbol; - CTransaction tokenbaseTx; - if (!E_UNMARSHAL(rawproof, ss >> sourceSymbol; ss >> tokenbaseTx)) - return eval->Invalid("cannot-unmarshal-rawproof-for-tokens"); - - uint256 sourceTokenId; - std::vector> oprets; - uint8_t evalCodeInOpret; - std::vector voutTokenPubkeys; - if (burnTx.vout.size() > 0 && DecodeTokenOpRet(burnTx.vout.back().scriptPubKey, evalCodeInOpret, sourceTokenId, voutTokenPubkeys, oprets) == 0) - return eval->Invalid("cannot-decode-burn-tx-token-opret"); - - if (sourceTokenId != tokenbaseTx.GetHash()) // check tokenid in burn tx opret maches the passed tokenbase tx (to prevent cheating by importing user) - return eval->Invalid("incorrect-token-creation-tx-passed"); - - std::vector> opretsSrc; - vscript_t vorigpubkeySrc; - std::string nameSrc, descSrc; - if (DecodeTokenCreateOpRet(tokenbaseTx.vout.back().scriptPubKey, vorigpubkeySrc, nameSrc, descSrc, opretsSrc) == 0) - return eval->Invalid("cannot-decode-token-creation-tx"); - - std::vector> opretsImport; - vscript_t vorigpubkeyImport; - std::string nameImport, descImport; - if (importTx.vout.size() == 0 || DecodeTokenCreateOpRet(importTx.vout.back().scriptPubKey, vorigpubkeySrc, nameSrc, descSrc, opretsImport) == 0) - return eval->Invalid("cannot-decode-token-import-tx"); - - // check that name,pubkey,description in import tx correspond ones in token creation tx in the source chain: - if (vorigpubkeySrc != vorigpubkeyImport || - nameSrc != nameImport || - descSrc != descImport) - return eval->Invalid("import-tx-token-params-incorrect"); - } - - - // Check burntx shows correct outputs hash -// if (payoutsHash != SerializeHash(payouts)) // done in ImportCoin -// return eval->Invalid("wrong-payouts"); - - - TxProof merkleBranchProof; - std::vector notaryTxids; - - // Check proof confirms existance of burnTx - if (proof.IsMerkleBranch(merkleBranchProof)) { - uint256 target = merkleBranchProof.second.Exec(burnTx.GetHash()); - LOGSTREAM("importcoin", CCLOG_DEBUG2, stream << "Eval::ImportCoin() momom target=" << target.GetHex() << " merkleBranchProof.first=" << merkleBranchProof.first.GetHex() << std::endl); - if (!CheckMoMoM(merkleBranchProof.first, target)) { - LOGSTREAM("importcoin", CCLOG_INFO, stream << "MoMoM check failed for importtx=" << importTx.GetHash().GetHex() << std::endl); - return eval->Invalid("momom-check-fail"); - } - } - else if (proof.IsNotaryTxids(notaryTxids)) { - if (!CheckNotariesApproval(burnTx.GetHash(), notaryTxids)) { - return eval->Invalid("notaries-approval-check-fail"); - } - } - else { - return eval->Invalid("invalid-import-proof"); - } - -/* if (vimportOpret.begin()[0] == EVAL_TOKENS) - return eval->Invalid("test-invalid-tokens-are-good!!"); - else - return eval->Invalid("test-invalid-coins-are-good!!"); */ - return true; -} - -bool Eval::ImportCoin(const std::vector params, const CTransaction &importTx, unsigned int nIn) -{ - ImportProof proof; - CTransaction burnTx; - std::vector payouts; - CAmount txfee = 10000, amount; - int32_t height, burnvout; - std::vector publishers; - uint32_t targetCcid; - std::string targetSymbol, srcaddr, destaddr, receipt, rawburntx; - uint256 payoutsHash, bindtxid, burntxid; - std::vector rawproof; - std::vector txids; - CPubKey destpub; - - LOGSTREAM("importcoin", CCLOG_DEBUG1, stream << "Validating import tx..., txid=" << importTx.GetHash().GetHex() << std::endl); - - if (importTx.vout.size() < 2) - return Invalid("too-few-vouts"); - // params - if (!UnmarshalImportTx(importTx, proof, burnTx, payouts)) - return Invalid("invalid-params"); - // Control all aspects of this transaction - // It should not be at all malleable - if (ASSETCHAINS_SELFIMPORT!="PEGSCC" && MakeImportCoinTransaction(proof, burnTx, payouts, importTx.nExpiryHeight).GetHash() != importTx.GetHash()) // ExistsImportTombstone prevents from duplication - return Invalid("non-canonical"); - // burn params - if (!UnmarshalBurnTx(burnTx, targetSymbol, &targetCcid, payoutsHash, rawproof)) - return Invalid("invalid-burn-tx"); - - if (burnTx.vout.size() == 0) - return Invalid("invalid-burn-tx-no-vouts"); - - // check burned normal amount >= import amount && burned amount <= import amount + txfee (extra txfee is for miners and relaying, see GetImportCoinValue() func) - CAmount burnAmount = burnTx.vout.back().nValue; - if (burnAmount == 0) - return Invalid("invalid-burn-amount"); - CAmount totalOut = 0; - for (auto v : importTx.vout) - if (!v.scriptPubKey.IsPayToCryptoCondition()) - totalOut += v.nValue; - if (totalOut > burnAmount || totalOut < burnAmount - txfee) - return Invalid("payout-too-high-or-too-low"); - - // Check burntx shows correct outputs hash - if (payoutsHash != SerializeHash(payouts)) - return Invalid("wrong-payouts"); - if (targetCcid < HUSH_FIRSTFUNGIBLEID) - return Invalid("chain-not-fungible"); - - if ( targetCcid != 0xffffffff ) - { - - if (targetCcid != GetAssetchainsCC() || targetSymbol != GetAssetchainsSymbol()) - return Invalid("importcoin-wrong-chain"); - - if (!CheckMigration(this, importTx, burnTx, payouts, proof, rawproof)) - return false; // eval->Invalid() is called in the func - } - else - { - TxProof merkleBranchProof; - if (!proof.IsMerkleBranch(merkleBranchProof)) - return Invalid("invalid-import-proof-for-0xFFFFFFFF"); - - if ( targetSymbol == "BEAM" ) - { - if ( ASSETCHAINS_BEAMPORT == 0 ) - return Invalid("BEAM-import-without-port"); - else if ( CheckBEAMimport(merkleBranchProof,rawproof,burnTx,payouts) < 0 ) - return Invalid("BEAM-import-failure"); - } - else if ( targetSymbol == "CODA" ) - { - if ( ASSETCHAINS_CODAPORT == 0 ) - return Invalid("CODA-import-without-port"); - else if ( UnmarshalBurnTx(burnTx,srcaddr,receipt)==0 || CheckCODAimport(importTx,burnTx,payouts,srcaddr,receipt) < 0 ) - return Invalid("CODA-import-failure"); - } - else if ( targetSymbol == "PEGSCC" ) - { - if ( ASSETCHAINS_SELFIMPORT != "PEGSCC" ) - return Invalid("PEGSCC-import-when-not PEGSCC"); - // else if ( CheckPUBKEYimport(merkleBranchProof,rawproof,burnTx,payouts) < 0 ) - // return Invalid("PEGSCC-import-failure"); - } - else if ( targetSymbol == "PUBKEY" ) - { - if ( ASSETCHAINS_SELFIMPORT != "PUBKEY" ) - return Invalid("PUBKEY-import-when-not PUBKEY"); - else if ( CheckPUBKEYimport(merkleBranchProof,rawproof,burnTx,payouts) < 0 ) - return Invalid("PUBKEY-import-failure"); - } - else - { - if ( targetSymbol != ASSETCHAINS_SELFIMPORT ) - return Invalid("invalid-gateway-import-coin"); - else if ( UnmarshalBurnTx(burnTx,bindtxid,publishers,txids,burntxid,height,burnvout,rawburntx,destpub,amount)==0 || CheckGATEWAYimport(importTx,burnTx,targetSymbol,rawproof,bindtxid,publishers,txids,burntxid,height,burnvout,rawburntx,destpub,amount) < 0 ) - return Invalid("GATEWAY-import-failure"); - } - } - - // return Invalid("test-invalid"); - LOGSTREAM("importcoin", CCLOG_DEBUG2, stream << "Valid import tx! txid=" << importTx.GetHash().GetHex() << std::endl); - - return Valid(); -} diff --git a/src/cc/importgateway.cpp b/src/cc/importgateway.cpp deleted file mode 100644 index ea4ea4318..000000000 --- a/src/cc/importgateway.cpp +++ /dev/null @@ -1,1288 +0,0 @@ -// Copyright (c) 2016-2023 The Hush developers -// Distributed under the GPLv3 software license, see the accompanying -// file COPYING or https://www.gnu.org/licenses/gpl-3.0.en.html -/****************************************************************************** - * Copyright © 2014-2019 The SuperNET Developers. * - * * - * See the AUTHORS, DEVELOPER-AGREEMENT and LICENSE files at * - * the top-level directory of this distribution for the individual copyright * - * holder information and the developer policies on copyright and licensing. * - * * - * Unless otherwise agreed in a custom licensing agreement, no part of the * - * SuperNET software, including this file may be copied, modified, propagated * - * or distributed except according to the terms contained in the LICENSE file * - * * - * Removal or modification of this copyright notice is prohibited. * - * * - ******************************************************************************/ - -#include "CCImportGateway.h" -#include "key_io.h" -#include "../importcoin.h" -// start of consensus code -#define HUSH_PUBTYPE 60 -#define HUSH_P2SHTYPE 85 -#define HUSH_WIFTYPE 188 -#define HUSH_TADDR 0 -#define CC_MARKER_VALUE 10000 - -extern uint256 HUSH_EARLYTXID; - -CScript EncodeImportGatewayBindOpRet(uint8_t funcid,std::string coin,uint256 oracletxid,uint8_t M,uint8_t N,std::vector importgatewaypubkeys,uint8_t taddr,uint8_t prefix,uint8_t prefix2,uint8_t wiftype) -{ - CScript opret; uint8_t evalcode = EVAL_IMPORTGATEWAY; - opret << OP_RETURN << E_MARSHAL(ss << evalcode << funcid << coin << oracletxid << M << N << importgatewaypubkeys << taddr << prefix << prefix2 << wiftype); - return(opret); -} - -uint8_t DecodeImportGatewayBindOpRet(char *burnaddr,const CScript &scriptPubKey,std::string &coin,uint256 &oracletxid,uint8_t &M,uint8_t &N,std::vector &importgatewaypubkeys,uint8_t &taddr,uint8_t &prefix,uint8_t &prefix2,uint8_t &wiftype) -{ - std::vector vopret; uint8_t *script,e,f; std::vector pubkeys; - - GetOpReturnData(scriptPubKey, vopret); - script = (uint8_t *)vopret.data(); - burnaddr[0] = 0; - if ( vopret.size() > 2 && E_UNMARSHAL(vopret,ss >> e; ss >> f; ss >> coin; ss >> oracletxid; ss >> M; ss >> N; ss >> importgatewaypubkeys; ss >> taddr; ss >> prefix; ss >> prefix2; ss >> wiftype) != 0 ) - { - if ( prefix == HUSH_PUBTYPE && prefix2 == HUSH_P2SHTYPE ) - { - if ( N > 1 ) - { - strcpy(burnaddr,CBitcoinAddress(CScriptID(GetScriptForMultisig(M,importgatewaypubkeys))).ToString().c_str()); - LOGSTREAM("importgateway", CCLOG_DEBUG1, stream << "f." << f << " M." << (int)M << " of N." << (int)N << " size." << (int32_t)importgatewaypubkeys.size() << " -> " << burnaddr << std::endl); - } else Getscriptaddress(burnaddr,CScript() << ParseHex(HexStr(importgatewaypubkeys[0])) << OP_CHECKSIG); - } - else - { - if ( N > 1 ) strcpy(burnaddr,CCustomBitcoinAddress(CScriptID(GetScriptForMultisig(M,importgatewaypubkeys)),taddr,prefix,prefix2).ToString().c_str()); - else GetCustomscriptaddress(burnaddr,CScript() << ParseHex(HexStr(importgatewaypubkeys[0])) << OP_CHECKSIG,taddr,prefix,prefix2); - } - return(f); - } else LOGSTREAM("importgateway",CCLOG_DEBUG1, stream << "error decoding bind opret" << std::endl); - return(0); -} - -CScript EncodeImportGatewayDepositOpRet(uint8_t funcid,uint256 bindtxid,std::string refcoin,std::vector publishers,std::vectortxids,int32_t height,uint256 burntxid,int32_t claimvout,std::string deposithex,std::vectorproof,CPubKey destpub,int64_t amount) -{ - CScript opret; uint8_t evalcode = EVAL_IMPORTGATEWAY; - - opret << OP_RETURN << E_MARSHAL(ss << evalcode << funcid << refcoin << bindtxid << publishers << txids << height << burntxid << claimvout << deposithex << proof << destpub << amount); - return(opret); -} - -uint8_t DecodeImportGatewayDepositOpRet(const CScript &scriptPubKey,uint256 &bindtxid,std::string &refcoin,std::vector&publishers,std::vector&txids,int32_t &height,uint256 &burntxid, int32_t &claimvout,std::string &deposithex,std::vector &proof,CPubKey &destpub,int64_t &amount) -{ - std::vector vopret; uint8_t *script,e,f; - - GetOpReturnData(scriptPubKey, vopret); - script = (uint8_t *)vopret.data(); - if ( vopret.size() > 2 && E_UNMARSHAL(vopret,ss >> e; ss >> f; ss >> refcoin; ss >> bindtxid; ss >> publishers; ss >> txids; ss >> height; ss >> burntxid; ss >> claimvout; ss >> deposithex; ss >> proof; ss >> destpub; ss >> amount) != 0 ) - { - return(f); - } - return(0); -} - -CScript EncodeImportGatewayWithdrawOpRet(uint8_t funcid,uint256 bindtxid,std::string refcoin,CPubKey withdrawpub,int64_t amount) -{ - CScript opret; uint8_t evalcode = EVAL_IMPORTGATEWAY; - - opret << OP_RETURN << E_MARSHAL(ss << evalcode << funcid << bindtxid << refcoin << withdrawpub << amount); - return(opret); -} - -uint8_t DecodeImportGatewayWithdrawOpRet(const CScript &scriptPubKey,uint256 &bindtxid,std::string &refcoin,CPubKey &withdrawpub,int64_t &amount) -{ - std::vector vopret; uint8_t *script,e,f; - - GetOpReturnData(scriptPubKey, vopret); - script = (uint8_t *)vopret.data(); - if ( vopret.size() > 2 && E_UNMARSHAL(vopret, ss >> e; ss >> f; ss >> bindtxid; ss >> refcoin; ss >> withdrawpub; ss >> amount) != 0 ) - { - return(f); - } - return(0); -} - -CScript EncodeImportGatewayPartialOpRet(uint8_t funcid, uint256 withdrawtxid,std::string refcoin,uint8_t K, CPubKey signerpk,std::string hex) -{ - CScript opret; uint8_t evalcode = EVAL_IMPORTGATEWAY; - - opret << OP_RETURN << E_MARSHAL(ss << evalcode << funcid << withdrawtxid << refcoin << K << signerpk << hex); - return(opret); -} - -uint8_t DecodeImportGatewayPartialOpRet(const CScript &scriptPubKey,uint256 &withdrawtxid,std::string &refcoin,uint8_t &K,CPubKey &signerpk,std::string &hex) -{ - std::vector vopret; uint8_t *script,e,f; - GetOpReturnData(scriptPubKey, vopret); - script = (uint8_t *)vopret.data(); - if ( vopret.size() > 2 && E_UNMARSHAL(vopret,ss >> e; ss >> f; ss >> withdrawtxid; ss >> refcoin; ss >> K; ss >> signerpk; ss >> hex) != 0 ) - { - return(f); - } - return(0); -} - -CScript EncodeImportGatewayCompleteSigningOpRet(uint8_t funcid,uint256 withdrawtxid,std::string refcoin,uint8_t K,std::string hex) -{ - CScript opret; uint8_t evalcode = EVAL_IMPORTGATEWAY; - opret << OP_RETURN << E_MARSHAL(ss << evalcode << funcid << withdrawtxid << refcoin << K << hex); - return(opret); -} - -uint8_t DecodeImportGatewayCompleteSigningOpRet(const CScript &scriptPubKey,uint256 &withdrawtxid,std::string &refcoin,uint8_t &K,std::string &hex) -{ - std::vector vopret; uint8_t *script,e,f; - - GetOpReturnData(scriptPubKey, vopret); - script = (uint8_t *)vopret.data(); - if ( vopret.size() > 2 && E_UNMARSHAL(vopret,ss >> e; ss >> f; ss >> withdrawtxid; ss >> refcoin; ss >> K; ss >> hex) != 0 ) - { - return(f); - } - return(0); -} - -CScript EncodeImportGatewayMarkDoneOpRet(uint8_t funcid,uint256 withdrawtxid,std::string refcoin,uint256 completetxid) -{ - CScript opret; uint8_t evalcode = EVAL_IMPORTGATEWAY; - - opret << OP_RETURN << E_MARSHAL(ss << evalcode << funcid << withdrawtxid << refcoin << completetxid); - return(opret); -} - -uint8_t DecodeImportGatewayMarkDoneOpRet(const CScript &scriptPubKey, uint256 &withdrawtxid, std::string &refcoin, uint256 &completetxid) -{ - std::vector vopret; uint8_t *script,e,f; - - GetOpReturnData(scriptPubKey, vopret); - script = (uint8_t *)vopret.data(); - if ( vopret.size() > 2 && E_UNMARSHAL(vopret,ss >> e; ss >> f; ss >> withdrawtxid; ss >> refcoin; ss >> completetxid;) != 0 ) - { - return(f); - } - return(0); -} - -uint8_t DecodeImportGatewayOpRet(const CScript &scriptPubKey) -{ - std::vector vopret; uint8_t *script,e,f; - - GetOpReturnData(scriptPubKey, vopret); - script = (uint8_t *)vopret.data(); - if ( vopret.size() > 2 && script[0] == EVAL_IMPORTGATEWAY) - { - f=script[1]; - if (f == 'B' || f == 'D' || f == 'C' || f == 'W' || f == 'P' || f == 'S' || f == 'M') - return(f); - } - return(0); -} - -int64_t IsImportGatewayvout(struct CCcontract_info *cp,const CTransaction& tx,int32_t v) -{ - char destaddr[64]; - - if ( tx.vout[v].scriptPubKey.IsPayToCryptoCondition() != 0 ) - { - if ( Getscriptaddress(destaddr,tx.vout[v].scriptPubKey) > 0 && strcmp(destaddr,cp->unspendableCCaddr) == 0 ) - return(tx.vout[v].nValue); - } - return(0); -} - -int64_t ImportGatewayVerify(char *refburnaddr,uint256 oracletxid,int32_t claimvout,std::string refcoin,uint256 burntxid,const std::string deposithex,std::vectorproof,uint256 merkleroot,CPubKey destpub,uint8_t taddr,uint8_t prefix,uint8_t prefix2) -{ - std::vector txids; uint256 proofroot,hashBlock,txid = zeroid; CTransaction tx; std::string name,description,format; - char destaddr[64],destpubaddr[64],claimaddr[64]; int32_t i,numvouts; int64_t nValue = 0; - - if ( myGetTransaction(oracletxid,tx,hashBlock) == 0 || (numvouts= tx.vout.size()) <= 0 ) - { - LOGSTREAM("importgateway",CCLOG_INFO, stream << "ImportGatewayVerify cant find oracletxid " << oracletxid.GetHex() << std::endl); - return(0); - } - if ( DecodeOraclesCreateOpRet(tx.vout[numvouts-1].scriptPubKey,name,description,format) != 'C' || name != refcoin ) - { - LOGSTREAM("importgateway",CCLOG_INFO, stream << "ImportGatewayVerify mismatched oracle name " << name << " != " << refcoin << std::endl); - return(0); - } - proofroot = BitcoinGetProofMerkleRoot(proof,txids); - if ( proofroot != merkleroot ) - { - LOGSTREAM("importgateway",CCLOG_INFO, stream << "ImportGatewayVerify mismatched merkleroot " << proofroot.GetHex() << " != " << merkleroot.GetHex() << std::endl); - return(0); - } - if (std::find(txids.begin(), txids.end(), burntxid) == txids.end()) - { - LOGSTREAM("importgateway",CCLOG_INFO, stream << "ImportGatewayVerify invalid proof for this burntxid " << burntxid.GetHex() << std::endl); - return 0; - } - if ( DecodeHexTx(tx,deposithex) != 0 ) - { - GetCustomscriptaddress(claimaddr,tx.vout[claimvout].scriptPubKey,taddr,prefix,prefix2); - GetCustomscriptaddress(destpubaddr,CScript() << ParseHex(HexStr(destpub)) << OP_CHECKSIG,taddr,prefix,prefix2); - if ( strcmp(claimaddr,destpubaddr) == 0 ) - { - for (i=0; i publishers; std::vectortxids; uint256 bindtxid,burntxid; std::vector proof; CPubKey claimpubkey; - if ( (numvouts= tx.vout.size()) > 0 ) - { - if ( DecodeImportGatewayDepositOpRet(tx.vout[numvouts-1].scriptPubKey,bindtxid,coin,publishers,txids,height,burntxid,claimvout,deposithex,proof,claimpubkey,amount) == 'D' && claimpubkey == mypk ) - { - return(amount); - } - } - return(0); -} - -int32_t ImportGatewayBindExists(struct CCcontract_info *cp,CPubKey importgatewaypk,std::string refcoin) -{ - char markeraddr[64],burnaddr[64]; std::string coin; int32_t numvouts; int64_t totalsupply; uint256 tokenid,oracletxid,hashBlock; - uint8_t M,N,taddr,prefix,prefix2,wiftype; std::vector pubkeys; CTransaction tx; - std::vector txids; - - _GetCCaddress(markeraddr,EVAL_IMPORTGATEWAY,importgatewaypk); - SetCCtxids(txids,markeraddr,true,cp->evalcode,zeroid,'B'); - for (std::vector::const_iterator it=txids.begin(); it!=txids.end(); it++) - { - if ( myGetTransaction(*it,tx,hashBlock) != 0 && (numvouts= tx.vout.size()) > 0 && DecodeImportGatewayOpRet(tx.vout[numvouts-1].scriptPubKey)=='B' ) - { - if ( DecodeImportGatewayBindOpRet(burnaddr,tx.vout[numvouts-1].scriptPubKey,coin,oracletxid,M,N,pubkeys,taddr,prefix,prefix2,wiftype) == 'B' ) - { - if ( coin == refcoin ) - { - LOGSTREAM("importgateway",CCLOG_INFO, stream << "trying to bind an existing import for coin" << std::endl); - return(1); - } - } - } - } - std::vector tmp_txs; - myGet_mempool_txs(tmp_txs,EVAL_IMPORTGATEWAY,'B'); - for (std::vector::const_iterator it=tmp_txs.begin(); it!=tmp_txs.end(); it++) - { - const CTransaction &txmempool = *it; - - if ((numvouts=txmempool.vout.size()) > 0 && DecodeImportGatewayOpRet(tx.vout[numvouts-1].scriptPubKey)=='B') - if (DecodeImportGatewayBindOpRet(burnaddr,tx.vout[numvouts-1].scriptPubKey,coin,oracletxid,M,N,pubkeys,taddr,prefix,prefix2,wiftype) == 'B') - return(1); - } - - return(0); -} - -bool ImportGatewayValidate(struct CCcontract_info *cp,Eval *eval,const CTransaction &tx, uint32_t nIn) -{ - int32_t numvins,numvouts,preventCCvins,preventCCvouts,i,numblocks,height,claimvout; bool retval; uint8_t funcid,hash[32],K,M,N,taddr,prefix,prefix2,wiftype; - char str[65],destaddr[65],burnaddr[65],importgatewayaddr[65],validationError[512]; - std::vector txids; std::vector pubkeys,publishers,tmppublishers; std::vector proof; int64_t amount,tmpamount; - uint256 hashblock,txid,bindtxid,deposittxid,withdrawtxid,completetxid,tmptokenid,oracletxid,bindtokenid,burntxid,tmptxid,merkleroot,mhash; CTransaction bindtx,tmptx; - std::string refcoin,tmprefcoin,hex,name,description,format; CPubKey pubkey,tmppubkey,importgatewaypk; - - return (true); - numvins = tx.vin.size(); - numvouts = tx.vout.size(); - preventCCvins = preventCCvouts = -1; - if ( numvouts < 1 ) - return eval->Invalid("no vouts"); - else - { - //LogPrint("importgateway-1","check amounts\n"); - // if ( ImportGatewayExactAmounts(cp,eval,tx,1,10000) == false ) - // { - // return eval->Invalid("invalid inputs vs. outputs!"); - // } - // else - // { - importgatewaypk = GetUnspendable(cp,0); - GetCCaddress(cp, importgatewayaddr, importgatewaypk); - if ( (funcid = DecodeImportGatewayOpRet(tx.vout[numvouts-1].scriptPubKey)) != 0) - { - switch ( funcid ) - { - case 'B': - //vin.0: normal input - //vout.0: CC vout marker - //vout.n-1: opreturn - 'B' coin oracletxid M N pubkeys taddr prefix prefix2 wiftype - return eval->Invalid("unexpected ImportGatewayValidate for gatewaysbind!"); - break; - case 'W': - //vin.0: normal input - //vin.1: CC input of tokens - //vout.0: CC vout marker to gateways CC address - //vout.1: CC vout of gateways tokens back to gateways tokens CC address - //vout.2: CC vout change of tokens back to owners pubkey (if any) - //vout.n-1: opreturn - 'W' bindtxid refcoin withdrawpub amount - return eval->Invalid("unexpected ImportGatewayValidate for gatewaysWithdraw!"); - break; - case 'P': - //vin.0: normal input - //vin.1: CC input of marker from previous tx (withdraw or partialsing) - //vout.0: CC vout marker to gateways CC address - //vout.n-1: opreturn - 'P' withdrawtxid refcoin number_of_signs mypk hex - if ((numvouts=tx.vout.size()) > 0 && DecodeImportGatewayPartialOpRet(tx.vout[numvouts-1].scriptPubKey,withdrawtxid,refcoin,K,pubkey,hex)!='P') - return eval->Invalid("invalid gatewaysPartialSign OP_RETURN data!"); - else if (myGetTransaction(withdrawtxid,tmptx,hashblock) == 0) - return eval->Invalid("invalid withdraw txid!"); - else if ((numvouts=tmptx.vout.size()) > 0 && DecodeImportGatewayWithdrawOpRet(tmptx.vout[numvouts-1].scriptPubKey,bindtxid,tmprefcoin,pubkey,amount)!='W') - return eval->Invalid("invalid gatewayswithdraw OP_RETURN data!"); - else if (tmprefcoin!=refcoin) - return eval->Invalid("refcoin different than in bind tx"); - else if ( IsCCInput(tmptx.vin[0].scriptSig) != 0 ) - return eval->Invalid("vin.0 is normal for gatewaysWithdraw!"); - else if ( IsCCInput(tmptx.vin[1].scriptSig) == 0 ) - return eval->Invalid("vin.1 is CC for gatewaysWithdraw!"); - else if ( ConstrainVout(tmptx.vout[0],1,cp->unspendableCCaddr,CC_MARKER_VALUE)==0) - return eval->Invalid("invalid marker vout for gatewaysWithdraw!"); - else if ( ConstrainVout(tmptx.vout[1],1,importgatewayaddr,amount)==0) - return eval->Invalid("invalid tokens to gateways vout for gatewaysWithdraw!"); - else if (tmptx.vout[1].nValue!=amount) - return eval->Invalid("amount in opret not matching tx tokens amount!"); - else if (hush_txnotarizedconfirmed(withdrawtxid) == false) - return eval->Invalid("gatewayswithdraw tx is not yet confirmed(notarized)!"); - else if (myGetTransaction(bindtxid,tmptx,hashblock) == 0) - return eval->Invalid("invalid gatewaysbind txid!"); - else if ((numvouts=tmptx.vout.size()) < 1 || DecodeImportGatewayBindOpRet(burnaddr,tmptx.vout[numvouts-1].scriptPubKey,tmprefcoin,oracletxid,M,N,pubkeys,taddr,prefix,prefix2,wiftype) != 'B') - return eval->Invalid("invalid gatewaysbind OP_RETURN data!"); - else if (tmprefcoin!=refcoin) - return eval->Invalid("refcoin different than in bind tx"); - else if (hush_txnotarizedconfirmed(bindtxid) == false) - return eval->Invalid("gatewaysbind tx is not yet confirmed(notarized)!"); - else if (IsCCInput(tx.vin[0].scriptSig) != 0) - return eval->Invalid("vin.0 is normal for gatewayspartialsign!"); - else if ((*cp->ismyvin)(tx.vin[1].scriptSig) == 0 || myGetTransaction(tx.vin[1].prevout.hash,tmptx,hashblock)==0 || tmptx.vout[tx.vin[1].prevout.n].nValue!=CC_MARKER_VALUE) - return eval->Invalid("vin.1 is CC marker for gatewayspartialsign or invalid marker amount!"); - else if (ConstrainVout(tx.vout[0],1,cp->unspendableCCaddr,CC_MARKER_VALUE) == 0 ) - return eval->Invalid("vout.0 invalid marker for gatewayspartialsign!"); - else if (K>M) - return eval->Invalid("invalid number of signs!"); - break; - case 'S': - //vin.0: normal input - //vin.1: CC input of marker from previous tx (withdraw or partialsing) - //vout.0: CC vout marker to gateways CC address - //vout.n-1: opreturn - 'S' withdrawtxid refcoin hex - if ((numvouts=tx.vout.size()) > 0 && DecodeImportGatewayCompleteSigningOpRet(tx.vout[numvouts-1].scriptPubKey,withdrawtxid,refcoin,K,hex)!='S') - return eval->Invalid("invalid gatewayscompletesigning OP_RETURN data!"); - else if (myGetTransaction(withdrawtxid,tmptx,hashblock) == 0) - return eval->Invalid("invalid withdraw txid!"); - else if ((numvouts=tmptx.vout.size()) > 0 && DecodeImportGatewayWithdrawOpRet(tmptx.vout[numvouts-1].scriptPubKey,bindtxid,tmprefcoin,pubkey,amount)!='W') - return eval->Invalid("invalid gatewayswithdraw OP_RETURN data!"); - else if (tmprefcoin!=refcoin) - return eval->Invalid("refcoin different than in bind tx"); - else if ( IsCCInput(tmptx.vin[0].scriptSig) != 0 ) - return eval->Invalid("vin.0 is normal for gatewaysWithdraw!"); - else if ( IsCCInput(tmptx.vin[1].scriptSig) == 0 ) - return eval->Invalid("vin.1 is CC for gatewaysWithdraw!"); - else if ( ConstrainVout(tmptx.vout[0],1,cp->unspendableCCaddr,CC_MARKER_VALUE)==0) - return eval->Invalid("invalid marker vout for gatewaysWithdraw!"); - else if ( ConstrainVout(tmptx.vout[1],1,importgatewayaddr,amount)==0) - return eval->Invalid("invalid tokens to gateways vout for gatewaysWithdraw!"); - else if (tmptx.vout[1].nValue!=amount) - return eval->Invalid("amount in opret not matching tx tokens amount!"); - else if (hush_txnotarizedconfirmed(withdrawtxid) == false) - return eval->Invalid("gatewayswithdraw tx is not yet confirmed(notarized)!"); - else if (myGetTransaction(bindtxid,tmptx,hashblock) == 0) - return eval->Invalid("invalid gatewaysbind txid!"); - else if ((numvouts=tmptx.vout.size()) < 1 || DecodeImportGatewayBindOpRet(burnaddr,tmptx.vout[numvouts-1].scriptPubKey,tmprefcoin,oracletxid,M,N,pubkeys,taddr,prefix,prefix2,wiftype) != 'B') - return eval->Invalid("invalid gatewaysbind OP_RETURN data!"); - else if (tmprefcoin!=refcoin) - return eval->Invalid("refcoin different than in bind tx"); - else if (hush_txnotarizedconfirmed(bindtxid) == false) - return eval->Invalid("gatewaysbind tx is not yet confirmed(notarized)!"); - else if (IsCCInput(tx.vin[0].scriptSig) != 0) - return eval->Invalid("vin.0 is normal for gatewayscompletesigning!"); - else if ((*cp->ismyvin)(tx.vin[1].scriptSig) == 0 || myGetTransaction(tx.vin[1].prevout.hash,tmptx,hashblock)==0 || tmptx.vout[tx.vin[1].prevout.n].nValue!=CC_MARKER_VALUE) - return eval->Invalid("vin.1 is CC marker for gatewayscompletesigning or invalid marker amount!"); - else if (ConstrainVout(tx.vout[0],1,cp->unspendableCCaddr,CC_MARKER_VALUE) == 0 ) - return eval->Invalid("vout.0 invalid marker for gatewayscompletesigning!"); - else if (KInvalid("invalid number of signs!"); - break; - case 'M': - //vin.0: normal input - //vin.1: CC input of gatewayscompletesigning tx marker to gateways CC address - //vout.0: opreturn - 'M' withdrawtxid refcoin completetxid - if ((numvouts=tx.vout.size()) > 0 && DecodeImportGatewayMarkDoneOpRet(tx.vout[numvouts-1].scriptPubKey,withdrawtxid,refcoin,completetxid)!='M') - return eval->Invalid("invalid gatewaysmarkdone OP_RETURN data!"); - else if (myGetTransaction(completetxid,tmptx,hashblock) == 0) - return eval->Invalid("invalid gatewayscompletesigning txid!"); - else if ((numvouts=tmptx.vout.size()) > 0 && DecodeImportGatewayCompleteSigningOpRet(tmptx.vout[numvouts-1].scriptPubKey,withdrawtxid,tmprefcoin,K,hex)!='S') - return eval->Invalid("invalid gatewayscompletesigning OP_RETURN data!"); - else if (hush_txnotarizedconfirmed(completetxid) == false) - return eval->Invalid("gatewayscompletesigning tx is not yet confirmed(notarized)!"); - else if (myGetTransaction(withdrawtxid,tmptx,hashblock) == 0) - return eval->Invalid("invalid withdraw txid!"); - else if ((numvouts=tmptx.vout.size()) > 0 && DecodeImportGatewayWithdrawOpRet(tmptx.vout[numvouts-1].scriptPubKey,bindtxid,tmprefcoin,pubkey,amount)!='W') - return eval->Invalid("invalid gatewayswithdraw OP_RETURN data!"); - else if (tmprefcoin!=refcoin) - return eval->Invalid("refcoin different than in bind tx"); - else if (hush_txnotarizedconfirmed(withdrawtxid) == false) - return eval->Invalid("gatewayswithdraw tx is not yet confirmed(notarized)!"); - else if (myGetTransaction(bindtxid,tmptx,hashblock) == 0) - return eval->Invalid("invalid gatewaysbind txid!"); - else if ((numvouts=tmptx.vout.size()) < 1 || DecodeImportGatewayBindOpRet(burnaddr,tmptx.vout[numvouts-1].scriptPubKey,tmprefcoin,oracletxid,M,N,pubkeys,taddr,prefix,prefix2,wiftype) != 'B') - return eval->Invalid("invalid gatewaysbind OP_RETURN data!"); - else if (tmprefcoin!=refcoin) - return eval->Invalid("refcoin different than in bind tx"); - else if (hush_txnotarizedconfirmed(bindtxid) == false) - return eval->Invalid("gatewaysbind tx is not yet confirmed(notarized)!"); - else if ( IsCCInput(tx.vin[0].scriptSig) != 0 ) - return eval->Invalid("vin.0 is normal for gatewaysmarkdone!"); - else if ((*cp->ismyvin)(tx.vin[1].scriptSig) == 0 || myGetTransaction(tx.vin[1].prevout.hash,tmptx,hashblock)==0 || tmptx.vout[tx.vin[1].prevout.n].nValue!=CC_MARKER_VALUE) - return eval->Invalid("vin.1 is CC marker for gatewaysmarkdone or invalid marker amount!"); - else if (KInvalid("invalid number of signs!"); - break; - } - } - retval = PreventCC(eval,tx,preventCCvins,numvins,preventCCvouts,numvouts); - if ( retval != 0 ) - LOGSTREAM("importgateway",CCLOG_INFO, stream << "ImportGateway tx validated" << std::endl); - else fprintf(stderr,"ImportGateway tx invalid\n"); - return(retval); - // } - } -} -// end of consensus code - -// helper functions for rpc calls in rpcwallet.cpp - -std::string ImportGatewayBind(uint64_t txfee,std::string coin,uint256 oracletxid,uint8_t M,uint8_t N,std::vector pubkeys,uint8_t p1,uint8_t p2,uint8_t p3,uint8_t p4) -{ - CMutableTransaction mtx = CreateNewContextualCMutableTransaction(Params().GetConsensus(), hush_nextheight()); - CTransaction oracletx; uint8_t taddr,prefix,prefix2,wiftype; CPubKey mypk,importgatewaypk; CScript opret; uint256 hashBlock; - struct CCcontract_info *cp,*cpTokens,C,CTokens; std::string name,description,format; int32_t i,numvouts; - char destaddr[64],coinaddr[64],myTokenCCaddr[64],str[65],*fstr; - - cp = CCinit(&C,EVAL_IMPORTGATEWAY); - cpTokens = CCinit(&CTokens,EVAL_TOKENS); - if (coin=="HUSH") - { - prefix = HUSH_PUBTYPE; - prefix2 = HUSH_P2SHTYPE; - wiftype = HUSH_WIFTYPE; - taddr = HUSH_TADDR; - } - else - { - prefix = p1; - prefix2 = p2; - wiftype = p3; - taddr = p4; - LOGSTREAM("importgateway",CCLOG_DEBUG1, stream << "set prefix " << prefix << ", prefix2 " << prefix2 << ", wiftype " << wiftype << ", taddr " << taddr << " for " << coin << std::endl); - } - if ( N == 0 || N > 15 || M > N ) - { - CCerror = strprintf("illegal M.%d or N.%d",M,N); - LOGSTREAM("importgateway",CCLOG_INFO, stream << CCerror << std::endl); - return(""); - } - if ( pubkeys.size() != N ) - { - CCerror = strprintf("M.%d N.%d but pubkeys[%d]",M,N,(int32_t)pubkeys.size()); - LOGSTREAM("importgateway",CCLOG_INFO, stream << CCerror << std::endl); - return(""); - } - for (i=0; i 0 ) - { - mtx.vout.push_back(MakeCC1vout(cp->evalcode,CC_MARKER_VALUE,importgatewaypk)); - return(FinalizeCCTx(0,cp,mtx,mypk,txfee,EncodeImportGatewayBindOpRet('B',coin,oracletxid,M,N,pubkeys,taddr,prefix,prefix2,wiftype))); - } - CCerror = strprintf("cant find enough inputs"); - LOGSTREAM("importgateway",CCLOG_INFO, stream << CCerror << std::endl); - return(""); -} - -std::string ImportGatewayDeposit(uint64_t txfee,uint256 bindtxid,int32_t height,std::string refcoin,uint256 burntxid,int32_t claimvout,std::string rawburntx,std::vectorproof,CPubKey destpub,int64_t amount) -{ - CMutableTransaction mtx = CreateNewContextualCMutableTransaction(Params().GetConsensus(), hush_nextheight()), burntx = CreateNewContextualCMutableTransaction(Params().GetConsensus(), hush_nextheight()); - CTransaction bindtx; CPubKey mypk; uint256 oracletxid,merkleroot,mhash,hashBlock,txid; std::vector vouts; - int32_t i,m,n,numvouts; uint8_t M,N,taddr,prefix,prefix2,wiftype; std::string coin; struct CCcontract_info *cp,C; - std::vector pubkeys,publishers; std::vector txids; char str[128],burnaddr[64]; - - if (HUSH_EARLYTXID!=zeroid && bindtxid!=HUSH_EARLYTXID) - { - CCerror = strprintf("invalid import gateway. On this chain only valid import gateway is %s",HUSH_EARLYTXID.GetHex()); - LOGSTREAM("importgateway",CCLOG_INFO, stream << CCerror << std::endl); - return(""); - } - cp = CCinit(&C,EVAL_IMPORTGATEWAY); - if ( txfee == 0 ) - txfee = 10000; - mypk = pubkey2pk(Mypubkey()); - if (!E_UNMARSHAL(ParseHex(rawburntx), ss >> burntx)) - { - return std::string(""); - } - LOGSTREAM("importgateway",CCLOG_DEBUG1, stream << "ImportGatewayDeposit ht." << height << " " << refcoin << " " << (double)amount/COIN << " numpks." << (int32_t)pubkeys.size() << std::endl); - if ( myGetTransaction(bindtxid,bindtx,hashBlock) == 0 || (numvouts= bindtx.vout.size()) <= 0 ) - { - CCerror = strprintf("cant find bindtxid %s",uint256_str(str,bindtxid)); - LOGSTREAM("importgateway",CCLOG_INFO, stream << CCerror << std::endl); - return(""); - } - if ( DecodeImportGatewayBindOpRet(burnaddr,bindtx.vout[numvouts-1].scriptPubKey,coin,oracletxid,M,N,pubkeys,taddr,prefix,prefix2,wiftype) != 'B' || refcoin != coin ) - { - CCerror = strprintf("invalid coin - bindtxid %s coin.%s",uint256_str(str,bindtxid),coin.c_str()); - LOGSTREAM("importgateway",CCLOG_INFO, stream << CCerror << std::endl); - return(""); - } - if (hush_txnotarizedconfirmed(bindtxid)==false) - { - CCerror = strprintf("gatewaysbind tx not yet confirmed/notarized"); - LOGSTREAM("importgateway",CCLOG_INFO, stream << CCerror << std::endl); - return(""); - } - n = (int32_t)pubkeys.size(); - merkleroot = zeroid; - for (i=m=0; i leaftxids; - BitcoinGetProofMerkleRoot(proof, leaftxids); - MerkleBranch newBranch(0, leaftxids); - TxProof txProof = std::make_pair(burntxid, newBranch); - return HexStr(E_MARSHAL(ss << MakeImportCoinTransaction(txProof, burntx, vouts))); -} - -std::string ImportGatewayWithdraw(uint64_t txfee,uint256 bindtxid,std::string refcoin,CPubKey withdrawpub,int64_t amount) -{ - CMutableTransaction mtx = CreateNewContextualCMutableTransaction(Params().GetConsensus(), hush_nextheight()); - CTransaction tx; CPubKey mypk,importgatewaypk,signerpk; uint256 txid,hashBlock,oracletxid,tmptokenid,tmpbindtxid,withdrawtxid; int32_t vout,numvouts; - int64_t nValue,inputs,CCchange=0,tmpamount; uint8_t funcid,K,M,N,taddr,prefix,prefix2,wiftype; std::string coin,hex; - std::vector msigpubkeys; char burnaddr[64],str[65],coinaddr[64]; struct CCcontract_info *cp,C; - std::vector > unspentOutputs; - - if (HUSH_EARLYTXID!=zeroid && bindtxid!=HUSH_EARLYTXID) - { - CCerror = strprintf("invalid import gateway. On this chain only valid import gateway is %s",HUSH_EARLYTXID.GetHex()); - LOGSTREAM("importgateway",CCLOG_INFO, stream << CCerror << std::endl); - return(""); - } - cp = CCinit(&C,EVAL_IMPORTGATEWAY); - if ( txfee == 0 ) - txfee = 10000; - mypk = pubkey2pk(Mypubkey()); - importgatewaypk = GetUnspendable(cp, 0); - - if( myGetTransaction(bindtxid,tx,hashBlock) == 0 || (numvouts= tx.vout.size()) <= 0 ) - { - CCerror = strprintf("cant find bindtxid %s",uint256_str(str,bindtxid)); - LOGSTREAM("importgateway",CCLOG_INFO, stream << CCerror << std::endl); - return(""); - } - if( DecodeImportGatewayBindOpRet(burnaddr,tx.vout[numvouts-1].scriptPubKey,coin,oracletxid,M,N,msigpubkeys,taddr,prefix,prefix2,wiftype) != 'B' || coin != refcoin ) - { - CCerror = strprintf("invalid bindtxid %s coin.%s",uint256_str(str,bindtxid),coin.c_str()); - LOGSTREAM("importgateway",CCLOG_INFO, stream << CCerror << std::endl); - return(""); - } - if (hush_txnotarizedconfirmed(bindtxid)==false) - { - CCerror = strprintf("gatewaysbind tx not yet confirmed/notarized"); - LOGSTREAM("importgateway",CCLOG_INFO, stream << CCerror << std::endl); - return(""); - } - _GetCCaddress(coinaddr,EVAL_IMPORTGATEWAY,importgatewaypk); - SetCCunspents(unspentOutputs,coinaddr,true); - for (std::vector >::const_iterator it=unspentOutputs.begin(); it!=unspentOutputs.end(); it++) - { - txid = it->first.txhash; - vout = (int32_t)it->first.index; - nValue = (int64_t)it->second.satoshis; - K=0; - if ( vout == 0 && nValue == CC_MARKER_VALUE && myGetTransaction(txid,tx,hashBlock) != 0 && (numvouts= tx.vout.size())>0 && - (funcid=DecodeImportGatewayOpRet(tx.vout[numvouts-1].scriptPubKey))!=0 && (funcid=='W' || funcid=='P')) - { - if (funcid=='W' && DecodeImportGatewayWithdrawOpRet(tx.vout[numvouts-1].scriptPubKey,tmpbindtxid,coin,withdrawpub,tmpamount)=='W' - && refcoin==coin && tmpbindtxid==bindtxid) - { - CCerror = strprintf("unable to create withdraw, another withdraw pending"); - LOGSTREAM("importgateway",CCLOG_INFO, stream << CCerror << std::endl); - return(""); - } - - else if (funcid=='P' && DecodeImportGatewayPartialOpRet(tx.vout[numvouts-1].scriptPubKey,withdrawtxid,coin,K,signerpk,hex)=='P' && - myGetTransaction(withdrawtxid,tx,hashBlock)!=0 && (numvouts=tx.vout.size())>0 && DecodeImportGatewayWithdrawOpRet(tx.vout[numvouts-1].scriptPubKey,tmpbindtxid,coin,withdrawpub,tmpamount)=='W' - && refcoin==coin && tmpbindtxid==bindtxid) - { - CCerror = strprintf("unable to create withdraw, another withdraw pending"); - LOGSTREAM("importgateway",CCLOG_INFO, stream << CCerror << std::endl); - return(""); - } - } - } - if( AddNormalinputs(mtx, mypk, txfee+CC_MARKER_VALUE+amount, 64) > 0 ) - { - mtx.vout.push_back(MakeCC1vout(EVAL_IMPORTGATEWAY,CC_MARKER_VALUE,importgatewaypk)); - mtx.vout.push_back(MakeCC1vout(EVAL_IMPORTGATEWAY,amount,CCtxidaddr(str,bindtxid))); - return(FinalizeCCTx(0, cp, mtx, mypk, txfee,EncodeImportGatewayWithdrawOpRet('W',bindtxid,refcoin,withdrawpub,amount))); - } - CCerror = strprintf("cant find enough normal inputs"); - LOGSTREAM("importgateway",CCLOG_INFO, stream << CCerror << std::endl); - return(""); -} - -std::string ImportGatewayPartialSign(uint64_t txfee,uint256 lasttxid,std::string refcoin, std::string hex) -{ - CMutableTransaction mtx = CreateNewContextualCMutableTransaction(Params().GetConsensus(), hush_nextheight()); - CPubKey mypk,withdrawpub,signerpk,importgatewaypk; struct CCcontract_info *cp,C; CTransaction tx,tmptx; - std::vector > unspentOutputs; char funcid,str[65],burnaddr[64]; - int32_t numvouts; uint256 withdrawtxid,hashBlock,bindtxid,tokenid,oracletxid; std::string coin,tmphex; int64_t amount; - uint8_t K=0,M,N,taddr,prefix,prefix2,wiftype; std::vector pubkeys; - - cp = CCinit(&C,EVAL_IMPORTGATEWAY); - if ( txfee == 0 ) - txfee = 10000; - mypk = pubkey2pk(Mypubkey()); - importgatewaypk = GetUnspendable(cp,0); - if (myGetTransaction(lasttxid,tx,hashBlock)==0 || (numvouts= tx.vout.size())<=0 - || (funcid=DecodeImportGatewayOpRet(tx.vout[numvouts-1].scriptPubKey))==0 || (funcid!='W' && funcid!='P')) - { - CCerror = strprintf("can't find last tx %s",uint256_str(str,lasttxid)); - LOGSTREAM("importgateway",CCLOG_INFO, stream << CCerror << std::endl); - return(""); - } - if (funcid=='W') - { - withdrawtxid=lasttxid; - if (DecodeImportGatewayWithdrawOpRet(tx.vout[numvouts-1].scriptPubKey,bindtxid,coin,withdrawpub,amount)!='W' || refcoin!=coin) - { - CCerror = strprintf("invalid withdraw tx %s",uint256_str(str,lasttxid)); - LOGSTREAM("importgateway",CCLOG_INFO, stream << CCerror << std::endl); - return(""); - } - else if (HUSH_EARLYTXID!=zeroid && bindtxid!=HUSH_EARLYTXID) - { - CCerror = strprintf("invalid import gateway. On this chain only valid import gateway is %s",HUSH_EARLYTXID.GetHex()); - LOGSTREAM("importgateway",CCLOG_INFO, stream << CCerror << std::endl); - return(""); - } - else if (hush_txnotarizedconfirmed(withdrawtxid)==false) - { - CCerror = strprintf("gatewayswithdraw tx not yet confirmed/notarized"); - LOGSTREAM("importgateway",CCLOG_INFO, stream << CCerror << std::endl); - return(""); - } - else if (myGetTransaction(bindtxid,tmptx,hashBlock)==0 || (numvouts=tmptx.vout.size())<=0) - { - CCerror = strprintf("can't find bind tx %s",uint256_str(str,bindtxid)); - LOGSTREAM("importgateway",CCLOG_INFO, stream << CCerror << std::endl); - return(""); - } - else if (DecodeImportGatewayBindOpRet(burnaddr,tmptx.vout[numvouts-1].scriptPubKey,coin,oracletxid,M,N,pubkeys,taddr,prefix,prefix2,wiftype) != 'B' - || refcoin!=coin) - { - CCerror = strprintf("invalid bind tx %s",uint256_str(str,bindtxid)); - LOGSTREAM("importgateway",CCLOG_INFO, stream << CCerror << std::endl); - return(""); - } - } - else if (funcid=='P') - { - if (DecodeImportGatewayPartialOpRet(tx.vout[numvouts-1].scriptPubKey,withdrawtxid,coin,K,signerpk,tmphex)!='P' || refcoin!=coin) - { - CCerror = strprintf("cannot decode partialsign tx opret %s",uint256_str(str,lasttxid)); - LOGSTREAM("importgateway",CCLOG_INFO, stream << CCerror << std::endl); - return(""); - } - else if (myGetTransaction(withdrawtxid,tmptx,hashBlock)==0 || (numvouts= tmptx.vout.size())<=0) - { - CCerror = strprintf("can't find withdraw tx %s",uint256_str(str,withdrawtxid)); - LOGSTREAM("importgateway",CCLOG_INFO, stream << CCerror << std::endl); - return(""); - } - else if (DecodeImportGatewayWithdrawOpRet(tmptx.vout[numvouts-1].scriptPubKey,bindtxid,coin,withdrawpub,amount)!='W' - || refcoin!=coin) - { - CCerror = strprintf("invalid withdraw tx %s",uint256_str(str,lasttxid)); - LOGSTREAM("importgateway",CCLOG_INFO, stream << CCerror << std::endl); - return(""); - } - else if (HUSH_EARLYTXID!=zeroid && bindtxid!=HUSH_EARLYTXID) - { - CCerror = strprintf("invalid import gateway. On this chain only valid import gateway is %s",HUSH_EARLYTXID.GetHex()); - LOGSTREAM("importgateway",CCLOG_INFO, stream << CCerror << std::endl); - return(""); - } - else if (hush_txnotarizedconfirmed(withdrawtxid)==false) - { - CCerror = strprintf("gatewayswithdraw tx not yet confirmed/notarized"); - LOGSTREAM("importgateway",CCLOG_INFO, stream << CCerror << std::endl); - return(""); - } - else if (myGetTransaction(bindtxid,tmptx,hashBlock)==0 || (numvouts=tmptx.vout.size())<=0) - { - CCerror = strprintf("can't find bind tx %s",uint256_str(str,bindtxid)); - LOGSTREAM("importgateway",CCLOG_INFO, stream << CCerror << std::endl); - return(""); - } - else if (DecodeImportGatewayBindOpRet(burnaddr,tmptx.vout[numvouts-1].scriptPubKey,coin,oracletxid,M,N,pubkeys,taddr,prefix,prefix2,wiftype) != 'B' - || refcoin!=coin) - { - CCerror = strprintf("invalid bind tx %s",uint256_str(str,bindtxid)); - LOGSTREAM("importgateway",CCLOG_INFO, stream << CCerror << std::endl); - return(""); - } - } - if (AddNormalinputs(mtx,mypk,txfee,3)!=0) - { - mtx.vin.push_back(CTxIn(tx.GetHash(),0,CScript())); - mtx.vout.push_back(MakeCC1vout(EVAL_IMPORTGATEWAY,CC_MARKER_VALUE,importgatewaypk)); - return(FinalizeCCTx(0,cp,mtx,mypk,txfee,EncodeImportGatewayPartialOpRet('P',withdrawtxid,refcoin,K+1,mypk,hex))); - } - CCerror = strprintf("error adding funds for partialsign"); - LOGSTREAM("importgateway",CCLOG_INFO, stream << CCerror << std::endl); - return(""); -} - -std::string ImportGatewayCompleteSigning(uint64_t txfee,uint256 lasttxid,std::string refcoin,std::string hex) -{ - CMutableTransaction mtx = CreateNewContextualCMutableTransaction(Params().GetConsensus(), hush_nextheight()); - CPubKey mypk,importgatewaypk,signerpk,withdrawpub; struct CCcontract_info *cp,C; char funcid,str[65],burnaddr[64]; int64_t amount; - std::string coin,tmphex; CTransaction tx,tmptx; uint256 withdrawtxid,hashBlock,tokenid,bindtxid,oracletxid; int32_t numvouts; - uint8_t K=0,M,N,taddr,prefix,prefix2,wiftype; std::vector pubkeys; - - cp = CCinit(&C,EVAL_IMPORTGATEWAY); - mypk = pubkey2pk(Mypubkey()); - importgatewaypk = GetUnspendable(cp,0); - if ( txfee == 0 ) - txfee = 10000; - if (myGetTransaction(lasttxid,tx,hashBlock)==0 || (numvouts= tx.vout.size())<=0 - || (funcid=DecodeImportGatewayOpRet(tx.vout[numvouts-1].scriptPubKey))==0 || (funcid!='W' && funcid!='P')) - { - CCerror = strprintf("invalid last txid %s",uint256_str(str,lasttxid)); - LOGSTREAM("importgateway",CCLOG_INFO, stream << CCerror << std::endl); - return(""); - } - if (funcid=='W') - { - withdrawtxid=lasttxid; - if (DecodeImportGatewayWithdrawOpRet(tx.vout[numvouts-1].scriptPubKey,bindtxid,coin,withdrawpub,amount)!='W' || refcoin!=coin) - { - CCerror = strprintf("cannot decode withdraw tx opret %s",uint256_str(str,lasttxid)); - LOGSTREAM("importgateway",CCLOG_INFO, stream << CCerror << std::endl); - return(""); - } - else if (myGetTransaction(bindtxid,tmptx,hashBlock)==0 || (numvouts=tmptx.vout.size())<=0) - { - CCerror = strprintf("can't find bind tx %s",uint256_str(str,bindtxid)); - LOGSTREAM("importgateway",CCLOG_INFO, stream << CCerror << std::endl); - return(""); - } - else if (HUSH_EARLYTXID!=zeroid && bindtxid!=HUSH_EARLYTXID) - { - CCerror = strprintf("invalid import gateway. On this chain only valid import gateway is %s",HUSH_EARLYTXID.GetHex()); - LOGSTREAM("importgateway",CCLOG_INFO, stream << CCerror << std::endl); - return(""); - } - else if (hush_txnotarizedconfirmed(withdrawtxid)==false) - { - CCerror = strprintf("gatewayswithdraw tx not yet confirmed/notarized"); - LOGSTREAM("importgateway",CCLOG_INFO, stream << CCerror << std::endl); - return(""); - } - else if (GetTransaction(bindtxid,tmptx,hashBlock,false)==0 || (numvouts=tmptx.vout.size())<=0) - { - CCerror = strprintf("can't find bind tx %s",uint256_str(str,bindtxid)); - LOGSTREAM("importgateway",CCLOG_INFO, stream << CCerror << std::endl); - return(""); - } - else if (DecodeImportGatewayBindOpRet(burnaddr,tmptx.vout[numvouts-1].scriptPubKey,coin,oracletxid,M,N,pubkeys,taddr,prefix,prefix2,wiftype) != 'B' - || refcoin!=coin) - { - CCerror = strprintf("invalid bind tx %s",uint256_str(str,bindtxid)); - LOGSTREAM("importgateway",CCLOG_INFO, stream << CCerror << std::endl); - return(""); - } - } - else if (funcid=='P') - { - if (DecodeImportGatewayPartialOpRet(tx.vout[numvouts-1].scriptPubKey,withdrawtxid,coin,K,signerpk,tmphex)!='P' || refcoin!=coin) - { - CCerror = strprintf("cannot decode partialsign tx opret %s",uint256_str(str,lasttxid)); - LOGSTREAM("importgateway",CCLOG_INFO, stream << CCerror << std::endl); - return(""); - } - else if (myGetTransaction(withdrawtxid,tmptx,hashBlock)==0 || (numvouts=tmptx.vout.size())==0) - { - CCerror = strprintf("invalid withdraw txid %s",uint256_str(str,withdrawtxid)); - LOGSTREAM("importgateway",CCLOG_INFO, stream << CCerror << std::endl); - return(""); - } - else if (DecodeImportGatewayWithdrawOpRet(tmptx.vout[numvouts-1].scriptPubKey,bindtxid,coin,withdrawpub,amount)!='W' || refcoin!=coin) - { - CCerror = strprintf("cannot decode withdraw tx opret %s",uint256_str(str,withdrawtxid)); - LOGSTREAM("importgateway",CCLOG_INFO, stream << CCerror << std::endl); - return(""); - } - else if (HUSH_EARLYTXID!=zeroid && bindtxid!=HUSH_EARLYTXID) - { - CCerror = strprintf("invalid import gateway. On this chain only valid import gateway is %s",HUSH_EARLYTXID.GetHex()); - LOGSTREAM("importgateway",CCLOG_INFO, stream << CCerror << std::endl); - return(""); - } - else if (hush_txnotarizedconfirmed(withdrawtxid)==false) - { - CCerror = strprintf("gatewayswithdraw tx not yet confirmed/notarized"); - LOGSTREAM("importgateway",CCLOG_INFO, stream << CCerror << std::endl); - return(""); - } - else if (myGetTransaction(bindtxid,tmptx,hashBlock)==0 || (numvouts=tmptx.vout.size())<=0) - { - CCerror = strprintf("can't find bind tx %s",uint256_str(str,bindtxid)); - LOGSTREAM("importgateway",CCLOG_INFO, stream << CCerror << std::endl); - return(""); - } - else if (DecodeImportGatewayBindOpRet(burnaddr,tmptx.vout[numvouts-1].scriptPubKey,coin,oracletxid,M,N,pubkeys,taddr,prefix,prefix2,wiftype) != 'B' - || refcoin!=coin) - { - CCerror = strprintf("invalid bind tx %s",uint256_str(str,bindtxid)); - LOGSTREAM("importgateway",CCLOG_INFO, stream << CCerror << std::endl); - return(""); - } - } - if (AddNormalinputs(mtx,mypk,txfee,3)!=0) - { - mtx.vin.push_back(CTxIn(lasttxid,0,CScript())); - mtx.vout.push_back(MakeCC1vout(EVAL_IMPORTGATEWAY,CC_MARKER_VALUE,importgatewaypk)); - return(FinalizeCCTx(0,cp,mtx,mypk,txfee,EncodeImportGatewayCompleteSigningOpRet('S',withdrawtxid,refcoin,K+1,hex))); - } - CCerror = strprintf("error adding funds for completesigning"); - LOGSTREAM("importgateway",CCLOG_INFO, stream << CCerror << std::endl); - return(""); -} - -std::string ImportGatewayMarkDone(uint64_t txfee,uint256 completetxid,std::string refcoin) -{ - CMutableTransaction mtx = CreateNewContextualCMutableTransaction(Params().GetConsensus(), hush_nextheight()); - CPubKey mypk; struct CCcontract_info *cp,C; char str[65],burnaddr[64]; CTransaction tx; int32_t numvouts; - uint256 withdrawtxid,bindtxid,oracletxid,tokenid,hashBlock; std::string coin,hex; - uint8_t K,M,N,taddr,prefix,prefix2,wiftype; std::vector pubkeys; int64_t amount; CPubKey withdrawpub; - - cp = CCinit(&C,EVAL_IMPORTGATEWAY); - mypk = pubkey2pk(Mypubkey()); - if ( txfee == 0 ) - txfee = 10000; - if (myGetTransaction(completetxid,tx,hashBlock)==0 || (numvouts= tx.vout.size())<=0) - { - CCerror = strprintf("invalid completesigning txid %s",uint256_str(str,completetxid)); - LOGSTREAM("importgateway",CCLOG_INFO, stream << CCerror << std::endl); - return(""); - } - else if (DecodeImportGatewayCompleteSigningOpRet(tx.vout[numvouts-1].scriptPubKey,withdrawtxid,coin,K,hex)!='S' || refcoin!=coin) - { - CCerror = strprintf("cannot decode completesigning tx opret %s",uint256_str(str,completetxid)); - LOGSTREAM("importgateway",CCLOG_INFO, stream << CCerror << std::endl); - return(""); - } - if (hush_txnotarizedconfirmed(completetxid)==false) - { - CCerror = strprintf("gatewayscompletesigning tx not yet confirmed/notarized"); - LOGSTREAM("importgateway",CCLOG_INFO, stream << CCerror << std::endl); - return(""); - } - else if (myGetTransaction(withdrawtxid,tx,hashBlock)==0 || (numvouts= tx.vout.size())==0) - { - CCerror = strprintf("invalid withdraw txid %s",uint256_str(str,withdrawtxid)); - LOGSTREAM("importgateway",CCLOG_INFO, stream << CCerror << std::endl); - return(""); - } - else if (DecodeImportGatewayWithdrawOpRet(tx.vout[numvouts-1].scriptPubKey,bindtxid,coin,withdrawpub,amount)!='W' || refcoin!=coin) - { - CCerror = strprintf("cannot decode withdraw tx opret %s\n",uint256_str(str,withdrawtxid)); - LOGSTREAM("importgateway",CCLOG_INFO, stream << CCerror << std::endl); - return(""); - } - else if (HUSH_EARLYTXID!=zeroid && bindtxid!=HUSH_EARLYTXID) - { - CCerror = strprintf("invalid import gateway. On this chain only valid import gateway is %s",HUSH_EARLYTXID.GetHex()); - LOGSTREAM("importgateway",CCLOG_INFO, stream << CCerror << std::endl); - return(""); - } - else if (myGetTransaction(bindtxid,tx,hashBlock)==0 || (numvouts=tx.vout.size())<=0) - { - CCerror = strprintf("can't find bind tx %s",uint256_str(str,bindtxid)); - LOGSTREAM("importgateway",CCLOG_INFO, stream << CCerror << std::endl); - return(""); - } - else if (DecodeImportGatewayBindOpRet(burnaddr,tx.vout[numvouts-1].scriptPubKey,coin,oracletxid,M,N,pubkeys,taddr,prefix,prefix2,wiftype) != 'B' - || refcoin!=coin) - { - CCerror = strprintf("invalid bind tx %s",uint256_str(str,bindtxid)); - LOGSTREAM("importgateway",CCLOG_INFO, stream << CCerror << std::endl); - return(""); - } - if (AddNormalinputs(mtx,mypk,txfee,3)!=0) - { - mtx.vin.push_back(CTxIn(completetxid,0,CScript())); - mtx.vout.push_back(CTxOut(CC_MARKER_VALUE,CScript() << ParseHex(HexStr(mypk)) << OP_CHECKSIG)); - return(FinalizeCCTx(0,cp,mtx,mypk,txfee,EncodeImportGatewayMarkDoneOpRet('M',withdrawtxid,refcoin,completetxid))); - } - CCerror = strprintf("error adding funds for markdone"); - LOGSTREAM("importgateway",CCLOG_INFO, stream << CCerror << std::endl); - return(""); -} - -UniValue ImportGatewayPendingWithdraws(uint256 bindtxid,std::string refcoin) -{ - UniValue result(UniValue::VOBJ),pending(UniValue::VARR); CTransaction tx; std::string coin,hex; CPubKey mypk,importgatewaypk,withdrawpub,signerpk; - std::vector msigpubkeys; uint256 hashBlock,txid,tmpbindtxid,tmptokenid,oracletxid,withdrawtxid; uint8_t K,M,N,taddr,prefix,prefix2,wiftype; - char funcid,burnaddr[65],coinaddr[65],destaddr[65],str[65],withaddr[65],numstr[32],signeraddr[65],txidaddr[65]; - int32_t i,n,numvouts,vout,queueflag; int64_t amount,nValue; struct CCcontract_info *cp,C; - std::vector > unspentOutputs; - - cp = CCinit(&C,EVAL_IMPORTGATEWAY); - mypk = pubkey2pk(Mypubkey()); - importgatewaypk = GetUnspendable(cp,0); - _GetCCaddress(coinaddr,EVAL_IMPORTGATEWAY,importgatewaypk); - if ( myGetTransaction(bindtxid,tx,hashBlock) == 0 || (numvouts= tx.vout.size()) <= 0 ) - { - CCerror = strprintf("cant find bindtxid %s",uint256_str(str,bindtxid)); - LOGSTREAM("importgateway",CCLOG_INFO, stream << CCerror << std::endl); - return(""); - } - if ( DecodeImportGatewayBindOpRet(burnaddr,tx.vout[numvouts-1].scriptPubKey,coin,oracletxid,M,N,msigpubkeys,taddr,prefix,prefix2,wiftype) != 'B' || refcoin != coin ) - { - CCerror = strprintf("invalid bindtxid %s coin.%s",uint256_str(str,bindtxid),coin.c_str()); - LOGSTREAM("importgateway",CCLOG_INFO, stream << CCerror << std::endl); - return(""); - } - n = msigpubkeys.size(); - queueflag = 0; - for (i=0; i >::const_iterator it=unspentOutputs.begin(); it!=unspentOutputs.end(); it++) - { - txid = it->first.txhash; - vout = (int32_t)it->first.index; - nValue = (int64_t)it->second.satoshis; - K=0; - if ( vout == 0 && nValue == CC_MARKER_VALUE && myGetTransaction(txid,tx,hashBlock) != 0 && (numvouts= tx.vout.size())>0 && - (funcid=DecodeImportGatewayOpRet(tx.vout[numvouts-1].scriptPubKey))!=0 && (funcid=='W' || funcid=='P') && myIsutxo_spentinmempool(ignoretxid,ignorevin,txid,vout) == 0) - { - if (funcid=='W') - { - if (DecodeImportGatewayWithdrawOpRet(tx.vout[numvouts-1].scriptPubKey,tmpbindtxid,coin,withdrawpub,amount)==0 || refcoin!=coin || tmpbindtxid!=bindtxid) continue; - } - else if (funcid=='P') - { - if (DecodeImportGatewayPartialOpRet(tx.vout[numvouts-1].scriptPubKey,withdrawtxid,coin,K,signerpk,hex)!='P' || myGetTransaction(withdrawtxid,tx,hashBlock)==0 - || (numvouts=tx.vout.size())<=0 || DecodeImportGatewayWithdrawOpRet(tx.vout[numvouts-1].scriptPubKey,tmpbindtxid,coin,withdrawpub,amount)!='W' - || refcoin!=coin || tmpbindtxid!=bindtxid) - continue; - } - Getscriptaddress(destaddr,tx.vout[1].scriptPubKey); - GetCustomscriptaddress(withaddr,CScript() << ParseHex(HexStr(withdrawpub)) << OP_CHECKSIG,taddr,prefix,prefix2); - if ( strcmp(destaddr,coinaddr) == 0 ) - { - UniValue obj(UniValue::VOBJ); - obj.push_back(Pair("withdrawtxid",uint256_str(str,tx.GetHash()))); - CCCustomtxidaddr(txidaddr,tx.GetHash(),taddr,prefix,prefix2); - obj.push_back(Pair("withdrawtxidaddr",txidaddr)); - obj.push_back(Pair("withdrawaddr",withaddr)); - sprintf(numstr,"%.8f",(double)tx.vout[1].nValue/COIN); - obj.push_back(Pair("amount",numstr)); - obj.push_back(Pair("confirmed_or_notarized",hush_txnotarizedconfirmed(tx.GetHash()))); - if ( queueflag != 0 ) - { - obj.push_back(Pair("depositaddr",burnaddr)); - GetCustomscriptaddress(signeraddr,CScript() << ParseHex(HexStr(mypk)) << OP_CHECKSIG,taddr,prefix,prefix2); - obj.push_back(Pair("signeraddr",signeraddr)); - } - if (N>1) - { - obj.push_back(Pair("number_of_signs",K)); - obj.push_back(Pair("last_txid",uint256_str(str,txid))); - if (K>0) obj.push_back(Pair("hex",hex)); - } - pending.push_back(obj); - } - } - } - result.push_back(Pair("coin",refcoin)); - result.push_back(Pair("pending",pending)); - result.push_back(Pair("queueflag",queueflag)); - return(result); -} - -UniValue ImportGatewayProcessedWithdraws(uint256 bindtxid,std::string refcoin) -{ - UniValue result(UniValue::VOBJ),processed(UniValue::VARR); CTransaction tx; std::string coin,hex; - CPubKey mypk,importgatewaypk,withdrawpub; std::vector msigpubkeys; - uint256 withdrawtxid,hashBlock,txid,tmptokenid,oracletxid; uint8_t K,M,N,taddr,prefix,prefix2,wiftype; - char burnaddr[65],coinaddr[65],str[65],numstr[32],withaddr[65],txidaddr[65]; - int32_t i,n,numvouts,vout,queueflag; int64_t nValue,amount; struct CCcontract_info *cp,C; - std::vector > unspentOutputs; - - cp = CCinit(&C,EVAL_IMPORTGATEWAY); - mypk = pubkey2pk(Mypubkey()); - importgatewaypk = GetUnspendable(cp,0); - _GetCCaddress(coinaddr,EVAL_IMPORTGATEWAY,importgatewaypk); - if ( myGetTransaction(bindtxid,tx,hashBlock) == 0 || (numvouts= tx.vout.size()) <= 0 ) - { - CCerror = strprintf("cant find bindtxid %s",uint256_str(str,bindtxid)); - LOGSTREAM("importgateway",CCLOG_INFO, stream << CCerror << std::endl); - return(""); - } - if ( DecodeImportGatewayBindOpRet(burnaddr,tx.vout[numvouts-1].scriptPubKey,coin,oracletxid,M,N,msigpubkeys,taddr,prefix,prefix2,wiftype) != 'B' || refcoin != coin) - { - CCerror = strprintf("invalid bindtxid %s coin.%s",uint256_str(str,bindtxid),coin.c_str()); - LOGSTREAM("importgateway",CCLOG_INFO, stream << CCerror << std::endl); - return(""); - } - n = msigpubkeys.size(); - queueflag = 0; - for (i=0; i >::const_iterator it=unspentOutputs.begin(); it!=unspentOutputs.end(); it++) - { - txid = it->first.txhash; - vout = (int32_t)it->first.index; - nValue = (int64_t)it->second.satoshis; - if ( vout == 0 && nValue == CC_MARKER_VALUE && myGetTransaction(txid,tx,hashBlock) != 0 && (numvouts= tx.vout.size())>0 && - DecodeImportGatewayCompleteSigningOpRet(tx.vout[numvouts-1].scriptPubKey,withdrawtxid,coin,K,hex) == 'S' && refcoin == coin && myIsutxo_spentinmempool(ignoretxid,ignorevin,txid,vout) == 0) - { - if (myGetTransaction(withdrawtxid,tx,hashBlock) != 0 && (numvouts= tx.vout.size())>0 - && DecodeImportGatewayWithdrawOpRet(tx.vout[numvouts-1].scriptPubKey,bindtxid,coin,withdrawpub,amount) == 'W' || refcoin!=coin) - { - UniValue obj(UniValue::VOBJ); - obj.push_back(Pair("completesigningtxid",uint256_str(str,txid))); - obj.push_back(Pair("withdrawtxid",uint256_str(str,withdrawtxid))); - CCCustomtxidaddr(txidaddr,withdrawtxid,taddr,prefix,prefix2); - obj.push_back(Pair("withdrawtxidaddr",txidaddr)); - GetCustomscriptaddress(withaddr,CScript() << ParseHex(HexStr(withdrawpub)) << OP_CHECKSIG,taddr,prefix,prefix2); - obj.push_back(Pair("withdrawaddr",withaddr)); - obj.push_back(Pair("confirmed_or_notarized",hush_txnotarizedconfirmed(txid))); - sprintf(numstr,"%.8f",(double)tx.vout[1].nValue/COIN); - obj.push_back(Pair("amount",numstr)); - obj.push_back(Pair("hex",hex)); - processed.push_back(obj); - } - } - } - result.push_back(Pair("coin",refcoin)); - result.push_back(Pair("processed",processed)); - result.push_back(Pair("queueflag",queueflag)); - return(result); -} - -UniValue ImportGatewayList() -{ - UniValue result(UniValue::VARR); std::vector txids; - struct CCcontract_info *cp,C; uint256 txid,hashBlock,oracletxid; CTransaction vintx; std::string coin; - char str[65],burnaddr[64]; uint8_t M,N,taddr,prefix,prefix2,wiftype; std::vector pubkeys; - cp = CCinit(&C,EVAL_IMPORTGATEWAY); - SetCCtxids(txids,cp->unspendableCCaddr,true,cp->evalcode,zeroid,'B'); - for (std::vector::const_iterator it=txids.begin(); it!=txids.end(); it++) - { - txid = *it; - if ( myGetTransaction(txid,vintx,hashBlock) != 0 ) - { - if ( vintx.vout.size() > 0 && DecodeImportGatewayBindOpRet(burnaddr,vintx.vout[vintx.vout.size()-1].scriptPubKey,coin,oracletxid,M,N,pubkeys,taddr,prefix,prefix2,wiftype) != 0 ) - { - result.push_back(uint256_str(str,txid)); - } - } - } - return(result); -} - -UniValue ImportGatewayExternalAddress(uint256 bindtxid,CPubKey pubkey) -{ - UniValue result(UniValue::VOBJ); struct CCcontract_info *cp,C; uint256 txid,hashBlock,oracletxid; CTransaction tx; - std::string coin; int64_t numvouts; char str[65],addr[65],burnaddr[65]; uint8_t M,N,taddr,prefix,prefix2,wiftype; std::vector msigpubkeys; - - cp = CCinit(&C,EVAL_IMPORTGATEWAY); - if ( myGetTransaction(bindtxid,tx,hashBlock) == 0 || (numvouts= tx.vout.size()) <= 0 ) - { - CCerror = strprintf("cant find bindtxid %s",uint256_str(str,bindtxid)); - LOGSTREAM("importgateway",CCLOG_INFO, stream << CCerror << std::endl); - return(""); - } - if ( DecodeImportGatewayBindOpRet(burnaddr,tx.vout[numvouts-1].scriptPubKey,coin,oracletxid,M,N,msigpubkeys,taddr,prefix,prefix2,wiftype) != 'B') - { - CCerror = strprintf("invalid bindtxid %s coin.%s",uint256_str(str,bindtxid),coin.c_str()); - LOGSTREAM("importgateway",CCLOG_INFO, stream << CCerror << std::endl); - return(""); - } - GetCustomscriptaddress(addr,CScript() << ParseHex(HexStr(pubkey)) << OP_CHECKSIG,taddr,prefix,prefix2); - result.push_back(Pair("result","success")); - result.push_back(Pair("address",addr)); - return(result); -} - -UniValue ImportGatewayDumpPrivKey(uint256 bindtxid,CKey key) -{ - UniValue result(UniValue::VOBJ); struct CCcontract_info *cp,C; uint256 txid,hashBlock,oracletxid; CTransaction tx; - std::string coin,priv; int64_t numvouts; char str[65],addr[65],burnaddr[65]; uint8_t M,N,taddr,prefix,prefix2,wiftype; std::vector msigpubkeys; - - cp = CCinit(&C,EVAL_IMPORTGATEWAY); - if ( myGetTransaction(bindtxid,tx,hashBlock) == 0 || (numvouts= tx.vout.size()) <= 0 ) - { - CCerror = strprintf("cant find bindtxid %s",uint256_str(str,bindtxid)); - LOGSTREAM("importgateway",CCLOG_INFO, stream << CCerror << std::endl); - return(""); - } - if ( DecodeImportGatewayBindOpRet(burnaddr,tx.vout[numvouts-1].scriptPubKey,coin,oracletxid,M,N,msigpubkeys,taddr,prefix,prefix2,wiftype) != 'B') - { - CCerror = strprintf("invalid bindtxid %s coin.%s",uint256_str(str,bindtxid),coin.c_str()); - LOGSTREAM("importgateway",CCLOG_INFO, stream << CCerror << std::endl); - return(""); - } - - priv=EncodeCustomSecret(key,wiftype); - result.push_back(Pair("result","success")); - result.push_back(Pair("privkey",priv.c_str())); - return(result); -} - -UniValue ImportGatewayInfo(uint256 bindtxid) -{ - CMutableTransaction mtx = CreateNewContextualCMutableTransaction(Params().GetConsensus(), hush_nextheight()); - UniValue result(UniValue::VOBJ),a(UniValue::VARR); std::string coin; char str[67],numstr[65],burnaddr[64],gatewaystokens[64]; - uint8_t M,N; std::vector pubkeys; uint8_t taddr,prefix,prefix2,wiftype; uint256 oracletxid,hashBlock; CTransaction tx; - CPubKey ImportGatewaypk; struct CCcontract_info *cp,C; int32_t i; int64_t numvouts,remaining; std::vector msigpubkeys; - - cp = CCinit(&C,EVAL_IMPORTGATEWAY); - ImportGatewaypk = GetUnspendable(cp,0); - GetTokensCCaddress(cp,gatewaystokens,ImportGatewaypk); - if ( myGetTransaction(bindtxid,tx,hashBlock) == 0 || (numvouts= tx.vout.size()) <= 0 ) - { - CCerror = strprintf("cant find bindtxid %s",uint256_str(str,bindtxid)); - LOGSTREAM("importgateway",CCLOG_INFO, stream << CCerror << std::endl); - return(""); - } - if ( DecodeImportGatewayBindOpRet(burnaddr,tx.vout[numvouts-1].scriptPubKey,coin,oracletxid,M,N,msigpubkeys,taddr,prefix,prefix2,wiftype) != 'B') - { - CCerror = strprintf("invalid bindtxid %s coin.%s",uint256_str(str,bindtxid),coin.c_str()); - LOGSTREAM("importgateway",CCLOG_INFO, stream << CCerror << std::endl); - return(""); - } - if ( myGetTransaction(bindtxid,tx,hashBlock) != 0 ) - { - result.push_back(Pair("result","success")); - result.push_back(Pair("name","ImportGateway")); - burnaddr[0] = 0; - if ( tx.vout.size() > 0 && DecodeImportGatewayBindOpRet(burnaddr,tx.vout[tx.vout.size()-1].scriptPubKey,coin,oracletxid,M,N,pubkeys,taddr,prefix,prefix2,wiftype) != 0 && M <= N && N > 0 ) - { - result.push_back(Pair("M",M)); - result.push_back(Pair("N",N)); - for (i=0; i payouts; std::vector rawproof; - if (!UnmarshalImportTx(importTx, proof, burnTx, payouts)) - throw std::runtime_error("Couldn't unmarshal importTx"); - - std::string targetSymbol; - uint32_t targetCCid; - uint256 payoutsHash; - if (!UnmarshalBurnTx(burnTx, targetSymbol, &targetCCid, payoutsHash, rawproof)) - throw std::runtime_error("Couldn't unmarshal burnTx"); - - TxProof merkleBranch; - if( !proof.IsMerkleBranch(merkleBranch) ) - throw std::runtime_error("Incorrect import tx proof"); - TxProof newMerkleBranch = GetCrossChainProof(burnTx.GetHash(), targetSymbol.data(), targetCCid, merkleBranch, offset); - ImportProof newProof(newMerkleBranch); - - importTx = MakeImportCoinTransaction(newProof, burnTx, payouts); -} - bool IsSameAssetChain(const Notarization ¬a) { return strcmp(nota.second.symbol, SMART_CHAIN_SYMBOL) == 0; }; @@ -308,112 +282,6 @@ bool CheckMoMoM(uint256 hushNotarizationHash, uint256 momom) } -/* -* Check notaries approvals for the txoutproofs of burn tx -* (alternate check if MoMoM check has failed) -* Params: -* burntxid - txid of burn tx on the source chain -* rawproof - array of txids of notaries' proofs -*/ -bool CheckNotariesApproval(uint256 burntxid, const std::vector & notaryTxids) -{ - int count = 0; - - // get notaries: - uint8_t notaries_pubkeys[64][33]; - std::vector< std::vector > alreadySigned; - - //unmarshal notaries approval txids - for(auto notarytxid : notaryTxids ) { - EvalRef eval; - CBlockIndex block; - CTransaction notarytx; // tx with notary approval of txproof existence - - // get notary approval tx - if (eval->GetTxConfirmed(notarytxid, notarytx, block)) { - - std::vector vopret; - if (!notarytx.vout.empty() && GetOpReturnData(notarytx.vout.back().scriptPubKey, vopret)) { - std::vector txoutproof; - - if (E_UNMARSHAL(vopret, ss >> txoutproof)) { - CMerkleBlock merkleBlock; - std::vector prooftxids; - // extract block's merkle tree - if (E_UNMARSHAL(txoutproof, ss >> merkleBlock)) { - - // extract proven txids: - merkleBlock.txn.ExtractMatches(prooftxids); - if (merkleBlock.txn.ExtractMatches(prooftxids) != merkleBlock.header.hashMerkleRoot || // check block merkle root is correct - std::find(prooftxids.begin(), prooftxids.end(), burntxid) != prooftxids.end()) { // check burn txid is in proven txids list - - if (hush_notaries(notaries_pubkeys, block.GetHeight(), block.GetBlockTime()) >= 0) { - // check it is a notary who signed approved tx: - int i; - for (i = 0; i < sizeof(notaries_pubkeys) / sizeof(notaries_pubkeys[0]); i++) { - std::vector vnotarypubkey(notaries_pubkeys[i], notaries_pubkeys[i] + 33); -#ifdef TESTMODE - char test_notary_pubkey_hex[] = "029fa302968bbae81f41983d2ec20445557b889d31227caec5d910d19b7510ef86"; - uint8_t test_notary_pubkey33[33]; - decode_hex(test_notary_pubkey33, 33, test_notary_pubkey_hex); -#endif - if (CheckVinPubKey(notarytx, 0, notaries_pubkeys[i]) // is signed by a notary? - && std::find(alreadySigned.begin(), alreadySigned.end(), vnotarypubkey) == alreadySigned.end() // check if notary not re-used -#ifdef TESTMODE - || CheckVinPubKey(notarytx, 0, test_notary_pubkey33) // test -#endif - ) - { - alreadySigned.push_back(vnotarypubkey); - count++; - LOGSTREAM("importcoin", CCLOG_DEBUG1, stream << "CheckNotariesApproval() notary approval checked, count=" << count << std::endl); - break; - } - } - if (i == sizeof(notaries_pubkeys) / sizeof(notaries_pubkeys[0])) - LOGSTREAM("importcoin", CCLOG_DEBUG1, stream << "CheckNotariesApproval() txproof not signed by a notary or reused" << std::endl); - } - else { - LOGSTREAM("importcoin", CCLOG_INFO, stream << "CheckNotariesApproval() cannot get current notaries pubkeys" << std::endl); - } - } - else { - LOGSTREAM("importcoin", CCLOG_INFO, stream << "CheckNotariesApproval() burntxid not found in txoutproof or incorrect txoutproof" << std::endl); - } - } - else { - LOGSTREAM("importcoin", CCLOG_INFO, stream << "CheckNotariesApproval() could not unmarshal merkleBlock" << std::endl); - } - } - else { - LOGSTREAM("importcoin", CCLOG_INFO, stream << "CheckNotariesApproval() could not unmarshal txoutproof" << std::endl); - } - } - else { - LOGSTREAM("importcoin", CCLOG_INFO, stream << "CheckNotariesApproval() no opret in the notary tx" << std::endl); - } - } - else { - LOGSTREAM("importcoin", CCLOG_INFO, stream << "CheckNotariesApproval() could not load notary tx" << std::endl); - } - } - - bool retcode; -#ifdef TESTMODE - if (count < 1) { // 1 for test -#else - if (count < 5) { -#endif - LOGSTREAM("importcoin", CCLOG_INFO, stream << "CheckNotariesApproval() not enough signed notary transactions=" << count << std::endl); - retcode = false; - } - else - retcode = true; - - return retcode; -} - - /* * On assetchain * in: txid diff --git a/src/crosschain.h b/src/crosschain.h index bbde384bc..af5096b6b 100644 --- a/src/crosschain.h +++ b/src/crosschain.h @@ -38,10 +38,8 @@ uint256 CalculateProofRoot(const char* symbol, uint32_t targetCCid, int hushHeig std::vector &moms, uint256 &destNotarizationTxid); TxProof GetCrossChainProof(const uint256 txid, const char* targetSymbol, uint32_t targetCCid, const TxProof assetChainProof,int32_t offset); -void CompleteImportTransaction(CTransaction &importTx,int32_t offset); /* On assetchain */ bool CheckMoMoM(uint256 hushNotarizationHash, uint256 momom); -bool CheckNotariesApproval(uint256 burntxid, const std::vector & notaryTxids); #endif /* HUSH_CROSSCHAIN_H */ diff --git a/src/importcoin.cpp b/src/importcoin.cpp deleted file mode 100644 index 88e711e92..000000000 --- a/src/importcoin.cpp +++ /dev/null @@ -1,425 +0,0 @@ -// Copyright (c) 2016-2023 The Hush developers -// Distributed under the GPLv3 software license, see the accompanying -// file COPYING or https://www.gnu.org/licenses/gpl-3.0.en.html -/****************************************************************************** - * Copyright © 2014-2019 The SuperNET Developers. * - * * - * See the AUTHORS, DEVELOPER-AGREEMENT and LICENSE files at * - * the top-level directory of this distribution for the individual copyright * - * holder information and the developer policies on copyright and licensing. * - * * - * Unless otherwise agreed in a custom licensing agreement, no part of the * - * SuperNET software, including this file may be copied, modified, propagated * - * or distributed except according to the terms contained in the LICENSE file * - * * - * Removal or modification of this copyright notice is prohibited. * - * * - ******************************************************************************/ - -#include "crosschain.h" -#include "importcoin.h" -#include "cc/utils.h" -#include "coins.h" -#include "hash.h" -#include "script/cc.h" -#include "primitives/transaction.h" -#include "core_io.h" -#include "script/sign.h" -#include "wallet/wallet.h" - -#include "cc/CCinclude.h" - -int32_t hush_nextheight(); - -// makes import tx for either coins or tokens -CTransaction MakeImportCoinTransaction(const ImportProof proof, const CTransaction burnTx, const std::vector payouts, uint32_t nExpiryHeightOverride) -{ - //std::vector payload = E_MARSHAL(ss << EVAL_IMPORTCOIN); - CScript scriptSig; - - CMutableTransaction mtx = CreateNewContextualCMutableTransaction(Params().GetConsensus(), hush_nextheight()); - if (mtx.fOverwintered) - mtx.nExpiryHeight = 0; - mtx.vout = payouts; - if (mtx.vout.size() == 0) - return CTransaction(mtx); - - // add special import tx vin: - scriptSig << E_MARSHAL(ss << EVAL_IMPORTCOIN); // simple payload for coins - mtx.vin.push_back(CTxIn(COutPoint(burnTx.GetHash(), 10e8), scriptSig)); - - if (nExpiryHeightOverride != 0) - mtx.nExpiryHeight = nExpiryHeightOverride; //this is for validation code, to make a tx used for validating the import tx - - auto importData = E_MARSHAL(ss << EVAL_IMPORTCOIN; ss << proof; ss << burnTx); // added evalcode to differentiate importdata from token opret - // if it is tokens: - vscript_t vopret; - GetOpReturnData(mtx.vout.back().scriptPubKey, vopret); - - if (!vopret.empty()) { - std::vector vorigpubkey; - uint8_t funcId; - std::vector > oprets; - std::string name, desc; - - if (DecodeTokenCreateOpRet(mtx.vout.back().scriptPubKey, vorigpubkey, name, desc, oprets) == 'c') { // parse token 'c' opret - mtx.vout.pop_back(); //remove old token opret - oprets.push_back(std::make_pair(OPRETID_IMPORTDATA, importData)); - mtx.vout.push_back(CTxOut(0, EncodeTokenCreateOpRet('c', vorigpubkey, name, desc, oprets))); // make new token 'c' opret with importData - } - else { - LOGSTREAM("importcoin", CCLOG_INFO, stream << "MakeImportCoinTransaction() incorrect token import opret" << std::endl); - } - } - else { //no opret in coin payouts - mtx.vout.push_back(CTxOut(0, CScript() << OP_RETURN << importData)); // import tx's opret now is in the vout's tail - } - - return CTransaction(mtx); -} - -CTransaction MakePegsImportCoinTransaction(const ImportProof proof, const CTransaction burnTx, const std::vector payouts, uint32_t nExpiryHeightOverride) -{ - CMutableTransaction mtx; uint256 accounttxid,pegstxid,tokenid; CScript opret; CScript scriptSig; - - mtx=MakeImportCoinTransaction(proof,burnTx,payouts); - // for spending markers in import tx - to track account state - accounttxid=burnTx.vin[0].prevout.hash; - mtx.vin.push_back(CTxIn(accounttxid,0,CScript())); - mtx.vin.push_back(CTxIn(accounttxid,1,CScript())); - return (mtx); -} - - -CTxOut MakeBurnOutput(CAmount value, uint32_t targetCCid, const std::string targetSymbol, const std::vector payouts, const std::vector rawproof) -{ - std::vector opret; - opret = E_MARSHAL(ss << (uint8_t)EVAL_IMPORTCOIN; // should mark burn opret to differentiate it from token opret - ss << VARINT(targetCCid); - ss << targetSymbol; - ss << SerializeHash(payouts); - ss << rawproof); - return CTxOut(value, CScript() << OP_RETURN << opret); -} - -CTxOut MakeBurnOutput(CAmount value, uint32_t targetCCid, std::string targetSymbol, const std::vector payouts,std::vector rawproof, - uint256 bindtxid,std::vector publishers,std::vector txids,uint256 burntxid,int32_t height,int32_t burnvout,std::string rawburntx,CPubKey destpub, int64_t amount) -{ - std::vector opret; - opret = E_MARSHAL(ss << (uint8_t)EVAL_IMPORTCOIN; - ss << VARINT(targetCCid); - ss << targetSymbol; - ss << SerializeHash(payouts); - ss << rawproof; - ss << bindtxid; - ss << publishers; - ss << txids; - ss << burntxid; - ss << height; - ss << burnvout; - ss << rawburntx; - ss << destpub; - ss << amount); - - return CTxOut(value, CScript() << OP_RETURN << opret); -} - -CTxOut MakeBurnOutput(CAmount value, uint32_t targetCCid, std::string targetSymbol, const std::vector payouts,std::vector rawproof,std::string srcaddr, - std::string receipt) -{ - std::vector opret; - opret = E_MARSHAL(ss << (uint8_t)EVAL_IMPORTCOIN; - ss << VARINT(targetCCid); - ss << targetSymbol; - ss << SerializeHash(payouts); - ss << rawproof; - ss << srcaddr; - ss << receipt); - return CTxOut(value, CScript() << OP_RETURN << opret); -} - -CTxOut MakeBurnOutput(CAmount value,uint32_t targetCCid,std::string targetSymbol,const std::vector payouts,std::vector rawproof,uint256 pegstxid, - uint256 tokenid,CPubKey srcpub,int64_t amount,std::pair account) -{ - std::vector opret; - opret = E_MARSHAL(ss << (uint8_t)EVAL_IMPORTCOIN; - ss << VARINT(targetCCid); - ss << targetSymbol; - ss << SerializeHash(payouts); - ss << rawproof; - ss << pegstxid; - ss << tokenid; - ss << srcpub; - ss << amount; - ss << account); - return CTxOut(value, CScript() << OP_RETURN << opret); -} - - -bool UnmarshalImportTx(const CTransaction importTx, ImportProof &proof, CTransaction &burnTx, std::vector &payouts) -{ - if (importTx.vout.size() < 1) - return false; - - if ((!importTx.IsPegsImport() && importTx.vin.size() != 1) || importTx.vin[0].scriptSig != (CScript() << E_MARSHAL(ss << EVAL_IMPORTCOIN))) { - LOGSTREAM("importcoin", CCLOG_INFO, stream << "UnmarshalImportTx() incorrect import tx vin" << std::endl); - return false; - } - - std::vector vImportData; - GetOpReturnData(importTx.vout.back().scriptPubKey, vImportData); - if (vImportData.empty()) { - LOGSTREAM("importcoin", CCLOG_INFO, stream << "UnmarshalImportTx() no opret" << std::endl); - return false; - } - - if (vImportData.begin()[0] == EVAL_TOKENS) { // if it is tokens - // get import data after token opret: - std::vector> oprets; - std::vector vorigpubkey; - std::string name, desc; - - if (DecodeTokenCreateOpRet(importTx.vout.back().scriptPubKey, vorigpubkey, name, desc, oprets) == 0) { - LOGSTREAM("importcoin", CCLOG_INFO, stream << "UnmarshalImportTx() could not decode token opret" << std::endl); - return false; - } - - GetOpretBlob(oprets, OPRETID_IMPORTDATA, vImportData); // fetch import data after token opret - for (std::vector>::const_iterator i = oprets.begin(); i != oprets.end(); i++) - if ((*i).first == OPRETID_IMPORTDATA) { - oprets.erase(i); // remove import data from token opret to restore original payouts: - break; - } - - payouts = std::vector(importTx.vout.begin(), importTx.vout.end()-1); //exclude opret with import data - payouts.push_back(CTxOut(0, EncodeTokenCreateOpRet('c', vorigpubkey, name, desc, oprets))); // make original payouts token opret (without import data) - } - else { - //payouts = std::vector(importTx.vout.begin()+1, importTx.vout.end()); // see next - payouts = std::vector(importTx.vout.begin(), importTx.vout.end() - 1); // skip opret; and it is now in the back - } - - uint8_t evalCode; - bool retcode = E_UNMARSHAL(vImportData, ss >> evalCode; ss >> proof; ss >> burnTx); - if (!retcode) - LOGSTREAM("importcoin", CCLOG_INFO, stream << "UnmarshalImportTx() could not unmarshal import data" << std::endl); - return retcode; -} - - -bool UnmarshalBurnTx(const CTransaction burnTx, std::string &targetSymbol, uint32_t *targetCCid, uint256 &payoutsHash,std::vector&rawproof) -{ - std::vector vburnOpret; uint32_t ccid = 0; - uint8_t evalCode; - - if (burnTx.vout.size() == 0) - return false; - - GetOpReturnData(burnTx.vout.back().scriptPubKey, vburnOpret); - if (vburnOpret.empty()) { - LOGSTREAM("importcoin", CCLOG_INFO, stream << "UnmarshalBurnTx() cannot unmarshal burn tx: empty burn opret" << std::endl); - return false; - } - - if (vburnOpret.begin()[0] == EVAL_TOKENS) { //if it is tokens - std::vector> oprets; - uint256 tokenid; - uint8_t evalCodeInOpret; - std::vector voutTokenPubkeys; - - if (DecodeTokenOpRet(burnTx.vout.back().scriptPubKey, evalCodeInOpret, tokenid, voutTokenPubkeys, oprets) != 't') - return false; - - //skip token opret: - GetOpretBlob(oprets, OPRETID_BURNDATA, vburnOpret); // fetch burnOpret after token opret - if (vburnOpret.empty()) { - LOGSTREAM("importcoin", CCLOG_INFO, stream << "UnmarshalBurnTx() cannot unmarshal token burn tx: empty burn opret for tokenid=" << tokenid.GetHex() << std::endl); - return false; - } - } - - if (vburnOpret.begin()[0] == EVAL_IMPORTCOIN) { - uint8_t evalCode; - bool isEof = true; - return E_UNMARSHAL(vburnOpret, ss >> evalCode; - ss >> VARINT(*targetCCid); - ss >> targetSymbol; - ss >> payoutsHash; - ss >> rawproof; isEof = ss.eof();) || !isEof; // if isEof == false it means we have successfully read the vars upto 'rawproof' - // and it might be additional data further that we do not need here so we allow !isEof - } - else { - LOGSTREAM("importcoin", CCLOG_INFO, stream << "UnmarshalBurnTx() invalid eval code in opret" << std::endl); - return false; - } -} - -bool UnmarshalBurnTx(const CTransaction burnTx, std::string &srcaddr, std::string &receipt) -{ - std::vector burnOpret,rawproof; bool isEof=true; - std::string targetSymbol; uint32_t targetCCid; uint256 payoutsHash; - uint8_t evalCode; - - if (burnTx.vout.size() == 0) return false; - GetOpReturnData(burnTx.vout.back().scriptPubKey, burnOpret); - return (E_UNMARSHAL(burnOpret, ss >> evalCode; - ss >> VARINT(targetCCid); - ss >> targetSymbol; - ss >> payoutsHash; - ss >> rawproof; - ss >> srcaddr; - ss >> receipt)); -} - -bool UnmarshalBurnTx(const CTransaction burnTx,uint256 &bindtxid,std::vector &publishers,std::vector &txids,uint256& burntxid,int32_t &height,int32_t &burnvout,std::string &rawburntx,CPubKey &destpub, int64_t &amount) -{ - std::vector burnOpret,rawproof; bool isEof=true; - uint32_t targetCCid; uint256 payoutsHash; std::string targetSymbol; - uint8_t evalCode; - - if (burnTx.vout.size() == 0) return false; - GetOpReturnData(burnTx.vout.back().scriptPubKey, burnOpret); - return (E_UNMARSHAL(burnOpret, ss >> evalCode; - ss >> VARINT(targetCCid); - ss >> targetSymbol; - ss >> payoutsHash; - ss >> rawproof; - ss >> bindtxid; - ss >> publishers; - ss >> txids; - ss >> burntxid; - ss >> height; - ss >> burnvout; - ss >> rawburntx; - ss >> destpub; - ss >> amount)); -} - -bool UnmarshalBurnTx(const CTransaction burnTx,uint256 &pegstxid,uint256 &tokenid,CPubKey &srcpub, int64_t &amount,std::pair &account) -{ - std::vector burnOpret,rawproof; bool isEof=true; - uint32_t targetCCid; uint256 payoutsHash; std::string targetSymbol; - uint8_t evalCode; - - - if (burnTx.vout.size() == 0) return false; - GetOpReturnData(burnTx.vout.back().scriptPubKey, burnOpret); - return (E_UNMARSHAL(burnOpret, ss >> evalCode; - ss >> VARINT(targetCCid); - ss >> targetSymbol; - ss >> payoutsHash; - ss >> rawproof; - ss >> pegstxid; - ss >> tokenid; - ss >> srcpub; - ss >> amount; - ss >> account)); -} - -/* - * Required by main - */ -CAmount GetCoinImportValue(const CTransaction &tx) -{ - ImportProof proof; CTransaction burnTx; std::vector payouts; - bool isNewImportTx = false; - - if ((isNewImportTx = UnmarshalImportTx(tx, proof, burnTx, payouts))) { - if (burnTx.vout.size() > 0) { - vscript_t vburnOpret; - - GetOpReturnData(burnTx.vout.back().scriptPubKey, vburnOpret); - if (vburnOpret.empty()) { - LOGSTREAM("importcoin", CCLOG_INFO, stream << "GetCoinImportValue() empty burn opret" << std::endl); - return 0; - } - - if (isNewImportTx && vburnOpret.begin()[0] == EVAL_TOKENS) { //if it is tokens - - uint8_t evalCodeInOpret; - uint256 tokenid; - std::vector voutTokenPubkeys; - std::vector> oprets; - - if (DecodeTokenOpRet(tx.vout.back().scriptPubKey, evalCodeInOpret, tokenid, voutTokenPubkeys, oprets) == 0) - return 0; - - uint8_t nonfungibleEvalCode = EVAL_TOKENS; // init as if no non-fungibles - vscript_t vnonfungibleOpret; - GetOpretBlob(oprets, OPRETID_NONFUNGIBLEDATA, vnonfungibleOpret); - if (!vnonfungibleOpret.empty()) - nonfungibleEvalCode = vnonfungibleOpret.begin()[0]; - - // calc outputs for burn tx - int64_t ccBurnOutputs = 0; - for (auto v : burnTx.vout) - if (v.scriptPubKey.IsPayToCryptoCondition() && - CTxOut(v.nValue, v.scriptPubKey) == MakeTokensCC1vout(nonfungibleEvalCode, v.nValue, pubkey2pk(ParseHex(CC_BURNPUBKEY)))) // burned to dead pubkey - ccBurnOutputs += v.nValue; - - return ccBurnOutputs + burnTx.vout.back().nValue; // total token burned value - } - else - return burnTx.vout.back().nValue; // coin burned value - } - } - return 0; -} - - - -/* - * CoinImport is different enough from normal script execution that it's not worth - * making all the mods neccesary in the interpreter to do the dispatch correctly. - */ -bool VerifyCoinImport(const CScript& scriptSig, TransactionSignatureChecker& checker, CValidationState &state) -{ - auto pc = scriptSig.begin(); - opcodetype opcode; - std::vector evalScript; - - auto f = [&] () { - if (!scriptSig.GetOp(pc, opcode, evalScript)) - return false; - if (pc != scriptSig.end()) - return false; - if (evalScript.size() == 0) - return false; - if (evalScript.begin()[0] != EVAL_IMPORTCOIN) - return false; - // Ok, all looks good so far... - CC *cond = CCNewEval(evalScript); - bool out = checker.CheckEvalCondition(cond); - cc_free(cond); - return out; - }; - - return f() ? true : state.Invalid(false, 0, "invalid-coin-import"); -} - - -void AddImportTombstone(const CTransaction &importTx, CCoinsViewCache &inputs, int nHeight) -{ - uint256 burnHash = importTx.vin[0].prevout.hash; - //fprintf(stderr,"add tombstone.(%s)\n",burnHash.GetHex().c_str()); - CCoinsModifier modifier = inputs.ModifyCoins(burnHash); - modifier->nHeight = nHeight; - modifier->nVersion = 4;//1; - modifier->vout.push_back(CTxOut(0, CScript() << OP_0)); -} - - -void RemoveImportTombstone(const CTransaction &importTx, CCoinsViewCache &inputs) -{ - uint256 burnHash = importTx.vin[0].prevout.hash; - //fprintf(stderr,"remove tombstone.(%s)\n",burnHash.GetHex().c_str()); - inputs.ModifyCoins(burnHash)->Clear(); -} - - -int ExistsImportTombstone(const CTransaction &importTx, const CCoinsViewCache &inputs) -{ - uint256 burnHash = importTx.vin[0].prevout.hash; - //fprintf(stderr,"check tombstone.(%s) in %s\n",burnHash.GetHex().c_str(),importTx.GetHash().GetHex().c_str()); - return inputs.HaveCoins(burnHash); -} diff --git a/src/main.cpp b/src/main.cpp index 8cbb35efc..afb028115 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -21,7 +21,6 @@ #include "sodium.h" #include "addrman.h" #include "arith_uint256.h" -#include "importcoin.h" #include "chainparams.h" #include "checkpoints.h" #include "checkqueue.h" @@ -1850,11 +1849,12 @@ bool AcceptToMemoryPool(CTxMemPool& pool, CValidationState &state, const CTransa return state.Invalid(false, REJECT_DUPLICATE, "already have coins"); } - if (tx.IsCoinImport() || tx.IsPegsImport()) { - // Inverse of normal case; if input exists, it's been spent - if (ExistsImportTombstone(tx, view)) - return state.Invalid(false, REJECT_DUPLICATE, "import tombstone exists"); - } else { + //if (tx.IsCoinImport() || tx.IsPegsImport()) { + // // Inverse of normal case; if input exists, it's been spent + // if (ExistsImportTombstone(tx, view)) + // return state.Invalid(false, REJECT_DUPLICATE, "import tombstone exists"); + //} else + { // do all inputs exist? // Note that this does not check for the presence of actual outputs (see the next check for that), // and only helps with filling in pfMissingInputs (to determine missing vs spent). @@ -2599,10 +2599,10 @@ void UpdateCoins(const CTransaction& tx, CCoinsViewCache& inputs, CTxUndo &txund inputs.ModifyCoins(tx.GetHash())->FromTx(tx, nHeight); // add outputs // Unorthodox state - if (tx.IsCoinImport() || tx.IsPegsImport()) { - // add a tombstone for the burnTx - AddImportTombstone(tx, inputs, nHeight); - } + //if (tx.IsCoinImport() || tx.IsPegsImport()) { + // // add a tombstone for the burnTx + // AddImportTombstone(tx, inputs, nHeight); + //} } void UpdateCoins(const CTransaction& tx, CCoinsViewCache& inputs, int nHeight) @@ -2643,11 +2643,13 @@ namespace Consensus { CAmount nFees = 0; for (unsigned int i = 0; i < tx.vin.size(); i++) { + /* if (tx.IsPegsImport() && i==0) { nValueIn=GetCoinImportValue(tx); continue; } + */ const COutPoint &prevout = tx.vin[i].prevout; const CCoins *coins = inputs.AccessCoins(prevout.hash); assert(coins); @@ -2771,12 +2773,14 @@ bool ContextualCheckInputs( } } + /* if (tx.IsCoinImport() || tx.IsPegsImport()) { LOCK(cs_main); ServerTransactionSignatureChecker checker(&tx, 0, 0, false, txdata); return VerifyCoinImport(tx.vin[0].scriptSig, checker, state); } + */ return true; } @@ -3051,10 +3055,12 @@ bool DisconnectBlock(CBlock& block, CValidationState& state, CBlockIndex* pindex } } } + /* else if (tx.IsCoinImport() || tx.IsPegsImport()) { RemoveImportTombstone(tx, view); } + */ } // set the old best Sprout anchor back diff --git a/src/miner.cpp b/src/miner.cpp index e258d8d38..456c2637a 100644 --- a/src/miner.cpp +++ b/src/miner.cpp @@ -25,7 +25,6 @@ #include "amount.h" #include "chainparams.h" -#include "importcoin.h" #include "consensus/consensus.h" #include "consensus/upgrades.h" #include "consensus/validation.h" @@ -308,12 +307,13 @@ CBlockTemplate* CreateNewBlock(CPubKey _pk,const CScript& _scriptPubKeyIn, int32 bool fMissingInputs = false; bool fNotarization = false; std::vector TMP_NotarizationNotaries; - if (tx.IsCoinImport()) + //if (tx.IsCoinImport()) + //{ + // CAmount nValueIn = GetCoinImportValue(tx); // burn amount + // nTotalIn += nValueIn; + // dPriority += (double)nValueIn * 1000; // flat multiplier... max = 1e16. + //} else { - CAmount nValueIn = GetCoinImportValue(tx); // burn amount - nTotalIn += nValueIn; - dPriority += (double)nValueIn * 1000; // flat multiplier... max = 1e16. - } else { TMP_NotarizationNotaries.clear(); bool fToCryptoAddress = false; if ( numSN != 0 && notarypubkeys[0][0] != 0 && hush_is_notarytx(tx) == 1 ) @@ -321,6 +321,7 @@ CBlockTemplate* CreateNewBlock(CPubKey _pk,const CScript& _scriptPubKeyIn, int32 BOOST_FOREACH(const CTxIn& txin, tx.vin) { + /* if (tx.IsPegsImport() && txin.prevout.n==10e8) { CAmount nValueIn = GetCoinImportValue(tx); // burn amount @@ -328,6 +329,7 @@ CBlockTemplate* CreateNewBlock(CPubKey _pk,const CScript& _scriptPubKeyIn, int32 dPriority += (double)nValueIn * 1000; // flat multiplier... max = 1e16. continue; } + */ // Read prev transaction if (!view.HaveCoins(txin.prevout.hash)) { diff --git a/src/primitives/transaction.h b/src/primitives/transaction.h index 1da0d5301..f66836eb0 100644 --- a/src/primitives/transaction.h +++ b/src/primitives/transaction.h @@ -711,7 +711,8 @@ public: bool IsPegsImport() const { - return (ASSETCHAINS_SELFIMPORT=="PEGSCC" && vin[0].prevout.n == 10e8); + //return (ASSETCHAINS_SELFIMPORT=="PEGSCC" && vin[0].prevout.n == 10e8); + return false; } friend bool operator==(const CTransaction& a, const CTransaction& b) diff --git a/src/rpc/crosschain.cpp b/src/rpc/crosschain.cpp index 0a8c0b129..aad84151e 100644 --- a/src/rpc/crosschain.cpp +++ b/src/rpc/crosschain.cpp @@ -178,348 +178,6 @@ UniValue calc_MoM(const UniValue& params, bool fHelp, const CPubKey& mypk) } -UniValue migrate_converttoexport(const UniValue& params, bool fHelp, const CPubKey& mypk) -{ - std::vector rawproof; uint8_t *ptr; uint8_t i; uint32_t ccid = ASSETCHAINS_CC; uint64_t txfee = 10000; - if (fHelp || params.size() != 2) - throw runtime_error( - "migrate_converttoexport rawTx dest_symbol\n" - "\nConvert a raw transaction to a cross-chain export.\n" - "If neccesary, the transaction should be funded using fundrawtransaction.\n" - "Finally, the transaction should be signed using signrawtransaction\n" - "The finished export transaction, plus the payouts, should be passed to " - "the \"migrate_createimporttransaction\" method to get the corresponding " - "import transaction.\n" - ); - - if (ASSETCHAINS_CC < HUSH_FIRSTFUNGIBLEID) - throw runtime_error("-ac_cc < HUSH_FIRSTFUNGIBLEID"); - - if (SMART_CHAIN_SYMBOL[0] == 0) - throw runtime_error("Must be called on assetchain"); - - vector txData(ParseHexV(params[0], "argument 1")); - CMutableTransaction tx; - if (!E_UNMARSHAL(txData, ss >> tx)) - throw JSONRPCError(RPC_DESERIALIZATION_ERROR, "TX decode failed"); - - string targetSymbol = params[1].get_str(); - if (targetSymbol.size() == 0 || targetSymbol.size() > 32) - throw runtime_error("targetSymbol length must be >0 and <=32"); - - if (strcmp(SMART_CHAIN_SYMBOL,targetSymbol.c_str()) == 0) - throw runtime_error("cant send a coin to the same chain"); - - /// Tested 44 vins p2pkh inputs as working. Set this at 25, but its a tx size limit. - // likely with a single RPC you can limit it by the size of tx. - if (tx.vout.size() > 25) - throw JSONRPCError(RPC_TYPE_ERROR, "Cannot have more than 50 vins, transaction too large."); - - CAmount burnAmount = 0; - - for (int i=0; i 1000000LL*COIN) - throw JSONRPCError(RPC_TYPE_ERROR, "Cannot export more than 1 million coins per export."); - - /* note: we marshal to rawproof in a different way (to be able to add other objects) - rawproof.resize(strlen(SMART_CHAIN_SYMBOL)); - ptr = rawproof.data(); - for (i=0; i 32) - throw runtime_error("targetSymbol length must be >0 and <=32"); - - if (strcmp(SMART_CHAIN_SYMBOL, targetSymbol.c_str()) == 0) - throw runtime_error("cant send a coin to the same chain"); - - std::string dest_addr_or_pubkey = params[1].get_str(); - - CAmount burnAmount; - if(params.size() == 3) - burnAmount = (CAmount)( atof(params[2].get_str().c_str()) * COIN + 0.00000000499999 ); - else - burnAmount = atoll(params[2].get_str().c_str()); - - if (burnAmount <= 0) - throw JSONRPCError(RPC_TYPE_ERROR, "Cannot export a negative or zero value."); - if (burnAmount > 1000000LL * COIN) - throw JSONRPCError(RPC_TYPE_ERROR, "Cannot export more than 1 million coins per export."); - - uint256 tokenid = zeroid; - if( params.size() == 4 ) - tokenid = Parseuint256(params[3].get_str().c_str()); - - CPubKey myPubKey = Mypubkey(); - struct CCcontract_info *cpTokens, C; - cpTokens = CCinit(&C, EVAL_TOKENS); - - CMutableTransaction mtx = CreateNewContextualCMutableTransaction(Params().GetConsensus(), hush_nextheight()); - - const std::string chainSymbol(SMART_CHAIN_SYMBOL); - std::vector rawproof; //(chainSymbol.begin(), chainSymbol.end()); - - if (tokenid.IsNull()) { // coins - int64_t inputs; - if ((inputs = AddNormalinputs(mtx, myPubKey, burnAmount + txfee, 10)) == 0) { - throw runtime_error("not enough funds, or need to merge utxos first\n"); - } - - CTxDestination txdest = DecodeDestination(dest_addr_or_pubkey.c_str()); - CScript scriptPubKey = GetScriptForDestination(txdest); - if (!scriptPubKey.IsPayToPublicKeyHash()) { - throw JSONRPCError(RPC_TYPE_ERROR, "Incorrect destination addr."); - } - mtx.vout.push_back(CTxOut(burnAmount, scriptPubKey)); // 'model' vout - ret.push_back(Pair("payouts", HexStr(E_MARSHAL(ss << mtx.vout)))); // save 'model' vout - - rawproof = E_MARSHAL(ss << chainSymbol); // add src chain name - - CTxOut burnOut = MakeBurnOutput(burnAmount+txfee, ccid, targetSymbol, mtx.vout, rawproof); //make opret with burned amount - - mtx.vout.clear(); // remove 'model' vout - - int64_t change = inputs - (burnAmount+txfee); - if (change != 0) - mtx.vout.push_back(CTxOut(change, CScript() << ParseHex(HexStr(myPubKey)) << OP_CHECKSIG)); // make change here to prevent it from making in FinalizeCCtx - - mtx.vout.push_back(burnOut); // mtx now has only burned vout (that is, amount sent to OP_RETURN making it unspendable) - //std::string exportTxHex = FinalizeCCTx(0, cpTokens, mtx, myPubKey, txfee, CScript()); // no change no opret - - } - else { // tokens - CTransaction tokenbasetx; - uint256 hashBlock; - vscript_t vopretNonfungible; - vscript_t vopretBurnData; - std::vector vorigpubkey, vdestpubkey; - std::string name, description; - std::vector> oprets; - - if (!myGetTransaction(tokenid, tokenbasetx, hashBlock)) - throw runtime_error("Could not load token creation tx\n"); - - // check if it is non-fungible tx and get its second evalcode from non-fungible payload - if (tokenbasetx.vout.size() == 0) - throw runtime_error("No vouts in token tx\n"); - - if (DecodeTokenCreateOpRet(tokenbasetx.vout.back().scriptPubKey, vorigpubkey, name, description, oprets) != 'c') - throw runtime_error("Incorrect token creation tx\n"); - GetOpretBlob(oprets, OPRETID_NONFUNGIBLEDATA, vopretNonfungible); - /* allow fungible tokens: - if (vopretNonfungible.empty()) - throw runtime_error("No non-fungible token data\n"); */ - - uint8_t destEvalCode = EVAL_TOKENS; - if (!vopretNonfungible.empty()) - destEvalCode = vopretNonfungible.begin()[0]; - - // check non-fungible tokens amount - if (!vopretNonfungible.empty() && burnAmount != 1) - throw JSONRPCError(RPC_TYPE_ERROR, "For non-fungible tokens amount should be equal to 1."); - - vdestpubkey = ParseHex(dest_addr_or_pubkey); - CPubKey destPubKey = pubkey2pk(vdestpubkey); - if (!destPubKey.IsValid()) - throw runtime_error("Invalid destination pubkey\n"); - - int64_t inputs; - if ((inputs = AddNormalinputs(mtx, myPubKey, txfee, 1)) == 0) // for miners in dest chain - throw runtime_error("No normal input found for two txfee\n"); - - int64_t ccInputs; - if ((ccInputs = AddTokenCCInputs(cpTokens, mtx, myPubKey, tokenid, burnAmount, 4)) < burnAmount) - throw runtime_error("No token inputs found (please try to consolidate tokens)\n"); - - // make payouts (which will be in the import tx with token): - mtx.vout.push_back(MakeCC1vout(EVAL_TOKENS, txfee, GetUnspendable(cpTokens, NULL))); // new marker to token cc addr, burnable and validated, vout position now changed to 0 (from 1) - mtx.vout.push_back(MakeTokensCC1vout(destEvalCode, burnAmount, destPubKey)); - - std::vector> voprets; - if (!vopretNonfungible.empty()) - voprets.push_back(std::make_pair(OPRETID_NONFUNGIBLEDATA, vopretNonfungible)); // add additional opret with non-fungible data - - mtx.vout.push_back(CTxOut((CAmount)0, EncodeTokenCreateOpRet('c', vorigpubkey, name, description, voprets))); // make token import opret - ret.push_back(Pair("payouts", HexStr(E_MARSHAL(ss << mtx.vout)))); // save payouts for import tx - - rawproof = E_MARSHAL(ss << chainSymbol << tokenbasetx); // add src chain name and token creation tx - - CTxOut burnOut = MakeBurnOutput(0, ccid, targetSymbol, mtx.vout, rawproof); //make opret with amount=0 because tokens are burned, not coins (see next vout) - mtx.vout.clear(); // remove payouts - - // now make burn transaction: - mtx.vout.push_back(MakeTokensCC1vout(destEvalCode, burnAmount, pubkey2pk(ParseHex(CC_BURNPUBKEY)))); // burn tokens - - int64_t change = inputs - txfee; - if (change != 0) - mtx.vout.push_back(CTxOut(change, CScript() << ParseHex(HexStr(myPubKey)) << OP_CHECKSIG)); // make change here to prevent it from making in FinalizeCCtx - - std::vector voutTokenPubkeys; - voutTokenPubkeys.push_back(pubkey2pk(ParseHex(CC_BURNPUBKEY))); // maybe we do not need this because ccTokens has the const for burn pubkey - - int64_t ccChange = ccInputs - burnAmount; - if (ccChange != 0) - mtx.vout.push_back(MakeTokensCC1vout(destEvalCode, ccChange, myPubKey)); - - GetOpReturnData(burnOut.scriptPubKey, vopretBurnData); - mtx.vout.push_back(CTxOut(txfee, EncodeTokenOpRet(tokenid, voutTokenPubkeys, std::make_pair(OPRETID_BURNDATA, vopretBurnData)))); //burn txfee for miners in dest chain - } - - std::string burnTxHex = FinalizeCCTx(0, cpTokens, mtx, myPubKey, txfee, CScript()); //no change, no opret - ret.push_back(Pair("BurnTxHex", burnTxHex)); - return ret; -} - -// util func to check burn tx and source chain params -void CheckBurnTxSource(uint256 burntxid, UniValue &info) { - - CTransaction burnTx; - uint256 blockHash; - - if (!myGetTransaction(burntxid, burnTx, blockHash)) - throw std::runtime_error("Cannot find burn transaction"); - - if (blockHash.IsNull()) - throw std::runtime_error("Burn tx still in mempool"); - - uint256 payoutsHash; - std::string targetSymbol; - uint32_t targetCCid; - std::vector rawproof; - - if (!UnmarshalBurnTx(burnTx, targetSymbol, &targetCCid, payoutsHash, rawproof)) - throw std::runtime_error("Cannot unmarshal burn tx data"); - - vscript_t vopret; - std::string sourceSymbol; - CTransaction tokenbasetxStored; - uint256 tokenid = zeroid; - - if (burnTx.vout.size() > 0 && GetOpReturnData(burnTx.vout.back().scriptPubKey, vopret) && !vopret.empty()) { - if (vopret.begin()[0] == EVAL_TOKENS) { - if (!E_UNMARSHAL(rawproof, ss >> sourceSymbol; ss >> tokenbasetxStored)) - throw std::runtime_error("Cannot unmarshal rawproof for tokens"); - - uint8_t evalCode; - std::vector voutPubkeys; - std::vector> oprets; - if( DecodeTokenOpRet(burnTx.vout.back().scriptPubKey, evalCode, tokenid, voutPubkeys, oprets) == 0 ) - throw std::runtime_error("Cannot decode token opret in burn tx"); - - if( tokenid != tokenbasetxStored.GetHash() ) - throw std::runtime_error("Incorrect tokenbase in burn tx"); - - CTransaction tokenbasetx; - uint256 hashBlock; - if (!myGetTransaction(tokenid, tokenbasetx, hashBlock)) { - throw std::runtime_error("Could not load tokenbase tx"); - } - - // check if nonfungible data present - if (tokenbasetx.vout.size() > 0) { - std::vector origpubkey; - std::string name, description; - std::vector> oprets; - - vscript_t vopretNonfungible; - if (DecodeTokenCreateOpRet(tokenbasetx.vout.back().scriptPubKey, origpubkey, name, description, oprets) == 'c') { - GetOpretBlob(oprets, OPRETID_NONFUNGIBLEDATA, vopretNonfungible); - if (vopretNonfungible.empty()) - throw std::runtime_error("Could not migrate fungible tokens"); - } - else - throw std::runtime_error("Could not decode opreturn in tokenbase tx"); - } - else - throw std::runtime_error("Incorrect tokenbase tx: not opreturn"); - - - struct CCcontract_info *cpTokens, CCtokens_info; - cpTokens = CCinit(&CCtokens_info, EVAL_TOKENS); - int64_t ccInputs = 0, ccOutputs = 0; - if( !TokensExactAmounts(true, cpTokens, ccInputs, ccOutputs, NULL, burnTx, tokenid) ) - throw std::runtime_error("Incorrect token burn tx: cc inputs <> cc outputs"); - } - else if (vopret.begin()[0] == EVAL_IMPORTCOIN) { - if (!E_UNMARSHAL(rawproof, ss >> sourceSymbol)) - throw std::runtime_error("Cannot unmarshal rawproof for coins"); - } - else - throw std::runtime_error("Incorrect eval code in opreturn"); - } - else - throw std::runtime_error("No opreturn in burn tx"); - - - if (sourceSymbol != SMART_CHAIN_SYMBOL) - throw std::runtime_error("Incorrect source chain in rawproof"); - - if (targetCCid != ASSETCHAINS_CC) - throw std::runtime_error("Incorrect CCid in burn tx"); - - if (targetSymbol == SMART_CHAIN_SYMBOL) - throw std::runtime_error("Must not be called on the destination chain"); - - // fill info to return for the notary operator (if manual notarization) or user - info.push_back(Pair("SourceSymbol", sourceSymbol)); - info.push_back(Pair("TargetSymbol", targetSymbol)); - info.push_back(Pair("TargetCCid", std::to_string(targetCCid))); - if (!tokenid.IsNull()) - info.push_back(Pair("tokenid", tokenid.GetHex())); - -} - /* * The process to migrate funds from a chain to chain * @@ -537,590 +195,8 @@ void CheckBurnTxSource(uint256 burntxid, UniValue &info) { * 3. migrate_completeimporttransaction */ -UniValue migrate_createimporttransaction(const UniValue& params, bool fHelp, const CPubKey& mypk) -{ - if (fHelp || params.size() < 2) - throw runtime_error("migrate_createimporttransaction burnTx payouts [notarytxid-1]..[notarytxid-N]\n\n" - "Create an importTx given a burnTx and the corresponding payouts, hex encoded\n" - "optional notarytxids are txids of notary operator proofs of burn tx existense (from destination chain).\n" - "Do not make subsequent call to migrate_completeimporttransaction if notary txids are set"); - - if (ASSETCHAINS_CC < HUSH_FIRSTFUNGIBLEID) - throw runtime_error("-ac_cc < HUSH_FIRSTFUNGIBLEID"); - - if (SMART_CHAIN_SYMBOL[0] == 0) - throw runtime_error("Must be called on assetchain"); - - vector txData(ParseHexV(params[0], "argument 1")); - - CTransaction burnTx; - if (!E_UNMARSHAL(txData, ss >> burnTx)) - throw runtime_error("Couldn't parse burnTx"); - - if( burnTx.vin.size() == 0 ) - throw runtime_error("No vins in the burnTx"); - - if (burnTx.vout.size() == 0) - throw runtime_error("No vouts in the burnTx"); - - - vector payouts; - if (!E_UNMARSHAL(ParseHexV(params[1], "argument 2"), ss >> payouts)) - throw runtime_error("Couldn't parse payouts"); - - ImportProof importProof; - if (params.size() == 2) { // standard MoMoM based notarization - // get MoM import proof - importProof = ImportProof(GetAssetchainProof(burnTx.GetHash(), burnTx)); - } - else { // notarization by manual operators notary tx - UniValue info(UniValue::VOBJ); - CheckBurnTxSource(burnTx.GetHash(), info); - - // get notary import proof - std::vector notaryTxids; - for (int i = 2; i < params.size(); i++) { - uint256 txid = Parseuint256(params[i].get_str().c_str()); - if (txid.IsNull()) - throw runtime_error("Incorrect notary approval txid"); - notaryTxids.push_back(txid); - } - importProof = ImportProof(notaryTxids); - } - - CTransaction importTx = MakeImportCoinTransaction(importProof, burnTx, payouts); - - std::string importTxHex = HexStr(E_MARSHAL(ss << importTx)); - UniValue ret(UniValue::VOBJ); - ret.push_back(Pair("ImportTxHex", importTxHex)); - return ret; -} - -UniValue migrate_completeimporttransaction(const UniValue& params, bool fHelp, const CPubKey& mypk) -{ - if (fHelp || params.size() < 1 || params.size() > 2) - throw runtime_error("migrate_completeimporttransaction importTx [offset]\n\n" - "Takes a cross chain import tx with proof generated on assetchain " - "and extends proof to target chain proof root\n" - "offset is optional, use it to increase the used HUSH height, use when import fails."); - - if (SMART_CHAIN_SYMBOL[0] != 0) - throw runtime_error("Must be called on HUSH"); - - CTransaction importTx; - if (!E_UNMARSHAL(ParseHexV(params[0], "argument 1"), ss >> importTx)) - throw runtime_error("Couldn't parse importTx"); - - int32_t offset = 0; - if ( params.size() == 2 ) - offset = params[1].get_int(); - - CompleteImportTransaction(importTx, offset); - - std::string importTxHex = HexStr(E_MARSHAL(ss << importTx)); - UniValue ret(UniValue::VOBJ); - ret.push_back(Pair("ImportTxHex", importTxHex)); - return ret; -} - -/* -* Alternate coin migration solution if MoMoM migration has failed -* -* The workflow: -* On the source chain user calls migrate_createburntransaction, sends the burn tx to the chain and sends its txid and the source chain name to the notary operators (off-chain) -* the notary operators call migrate_checkburntransactionsource on the source chain -* on the destination chain the notary operators call migrate_createnotaryapprovaltransaction and pass the burn txid and txoutproof received from the previous call, -* the notary operators send the approval transactions to the chain and send their txids to the user (off-chain) -* on the source chain the user calls migrate_createimporttransaction and passes to it notary txids as additional parameters -* then the user sends the import transaction to the destination chain (where the notary approvals will be validated) -*/ - -// checks if burn tx exists and params stored in the burn tx match to the source chain -// returns txproof -// run it on the source chain -UniValue migrate_checkburntransactionsource(const UniValue& params, bool fHelp, const CPubKey& mypk) -{ - if (fHelp || params.size() != 1) - throw runtime_error("migrate_checkburntransactionsource burntxid\n\n" - "checks if params stored in the burn tx match to its tx chain"); - - if (SMART_CHAIN_SYMBOL[0] == 0) - throw runtime_error("Must be called on asset chain"); - - uint256 burntxid = Parseuint256(params[0].get_str().c_str()); - UniValue result(UniValue::VOBJ); - CheckBurnTxSource(burntxid, result); // check and get burn tx data - - // get tx proof for burn tx - UniValue nextparams(UniValue::VARR); - UniValue txids(UniValue::VARR); - txids.push_back(burntxid.GetHex()); - nextparams.push_back(txids); - result.push_back(Pair("TxOutProof", gettxoutproof(nextparams, false, mypk))); // get txoutproof - result.push_back(Pair("result", "success")); // get txoutproof - - return result; -} - -// creates a tx for the dest chain with txproof -// used as a momom-backup manual import solution -// run it on the dest chain -UniValue migrate_createnotaryapprovaltransaction(const UniValue& params, bool fHelp, const CPubKey& mypk) -{ - if (fHelp || params.size() != 2) - throw runtime_error("migrate_createnotaryapprovaltransaction burntxid txoutproof\n\n" - "Creates a tx for destination chain with burn tx proof\n" - "txoutproof should be retrieved by hush-cli migrate_checkburntransactionsource call on the source chain\n" ); - - if (SMART_CHAIN_SYMBOL[0] == 0) - throw runtime_error("Must be called on asset chain"); - - uint256 burntxid = Parseuint256(params[0].get_str().c_str()); - if (burntxid.IsNull()) - throw runtime_error("Couldn't parse burntxid or it is null"); - - std::vector proofData = ParseHex(params[1].get_str()); - CMerkleBlock merkleBlock; - std::vector prooftxids; - if (!E_UNMARSHAL(proofData, ss >> merkleBlock)) - throw runtime_error("Couldn't parse txoutproof"); - - merkleBlock.txn.ExtractMatches(prooftxids); - if (std::find(prooftxids.begin(), prooftxids.end(), burntxid) == prooftxids.end()) - throw runtime_error("No burntxid in txoutproof"); - - const int64_t txfee = 10000; - struct CCcontract_info *cpDummy, C; - cpDummy = CCinit(&C, EVAL_TOKENS); // just for FinalizeCCtx to work - - // creating a tx with proof: - CMutableTransaction mtx = CreateNewContextualCMutableTransaction(Params().GetConsensus(), hush_nextheight()); - if (AddNormalinputs(mtx, Mypubkey(), txfee*2, 4) == 0) - throw runtime_error("Cannot find normal inputs\n"); - - mtx.vout.push_back(CTxOut(txfee, CScript() << ParseHex(HexStr(Mypubkey())) << OP_CHECKSIG)); - std::string notaryTxHex = FinalizeCCTx(0, cpDummy, mtx, Mypubkey(), txfee, CScript() << OP_RETURN << E_MARSHAL(ss << proofData;)); - - UniValue result(UniValue::VOBJ); - result.push_back(Pair("NotaryTxHex", notaryTxHex)); - return result; -} - -// creates a source 'quasi-burn' tx for AC_PUBKEY -// run it on the same asset chain -UniValue selfimport(const UniValue& params, bool fHelp, const CPubKey& mypk) -{ - UniValue result(UniValue::VOBJ); - std::string destaddr; - std::string source; - std::string sourceTxHex; - std::string importTxHex; - CTransaction burnTx; - CTxOut burnOut; - uint64_t burnAmount; - uint256 sourcetxid, blockHash; - std::vector vouts; - std::vector rawproof; - - if ( ASSETCHAINS_SELFIMPORT.size() == 0 ) - throw runtime_error("selfimport only works on -ac_import chains"); - - if (fHelp || params.size() != 2) - throw runtime_error("selfimport destaddr amount\n" - //TODO: "or selfimport rawburntx burntxid {nvout|\"find\"} rawproof source bindtxid height} \n" - "\ncreates self import coin transaction"); - - destaddr = params[0].get_str(); - burnAmount = atof(params[1].get_str().c_str()) * COIN + 0.00000000499999; - - source = ASSETCHAINS_SELFIMPORT; //defaults to -ac_import=... param - - if (source == "BEAM") - { - if (ASSETCHAINS_BEAMPORT == 0) - return(-1); - // confirm via ASSETCHAINS_BEAMPORT that burnTx/hash is a valid BEAM burn - // return(0); - return -1; - } - else if (source == "CODA") - { - if (ASSETCHAINS_CODAPORT == 0) - return(-1); - // confirm via ASSETCHAINS_CODAPORT that burnTx/hash is a valid CODA burn - // return(0); - return -1; - } - else if (source == "PEGSCC") - { - return -1; - } - else if (source == "PUBKEY") - { - ImportProof proofNull; - CTxDestination dest = DecodeDestination(destaddr.c_str()); - CMutableTransaction sourceMtx = MakeSelfImportSourceTx(dest, burnAmount); // make self-import source tx - vscript_t rawProofEmpty; - - CMutableTransaction templateMtx; - // prepare self-import 'quasi-burn' tx and also create vout for import tx (in mtx.vout): - if (GetSelfimportProof(sourceMtx, templateMtx, proofNull) < 0) - throw std::runtime_error("Failed creating selfimport template tx"); - - vouts = templateMtx.vout; - burnOut = MakeBurnOutput(burnAmount, 0xffffffff, ASSETCHAINS_SELFIMPORT, vouts, rawProofEmpty); - templateMtx.vout.clear(); - templateMtx.vout.push_back(burnOut); // burn tx has only opret with vouts and optional proof - - burnTx = templateMtx; // complete the creation of 'quasi-burn' tx - - sourceTxHex = HexStr(E_MARSHAL(ss << sourceMtx)); - importTxHex = HexStr(E_MARSHAL(ss << MakeImportCoinTransaction(proofNull, burnTx, vouts))); - - result.push_back(Pair("SourceTxHex", sourceTxHex)); - result.push_back(Pair("ImportTxHex", importTxHex)); - - return result; - } - else if (source == ASSETCHAINS_SELFIMPORT) - { - return -1; - } - return result; -} - bool GetNotarizationNotaries(uint8_t notarypubkeys[64][33], int8_t &numNN, const std::vector &vin, std::vector &NotarizationNotaries); - -UniValue importdual(const UniValue& params, bool fHelp, const CPubKey& mypk) -{ - UniValue result(UniValue::VOBJ); - CMutableTransaction mtx; - std::string hex,source,sourceaddr,destaddr,burntxid; uint64_t burnAmount; - CPubKey destpub; std::vector vouts; - - if ( ASSETCHAINS_SELFIMPORT.size() == 0 ) - throw runtime_error("importdual only works on -ac_import chains"); - - if (fHelp || params.size() < 4) - throw runtime_error("burntxid source_addr dest_pubkey amount\n"); - - CCerror = ""; - - burntxid = params[0].get_str(); - sourceaddr = params[1].get_str(); - destaddr = params[2].get_str(); - burnAmount = atof(params[3].get_str().c_str()) * COIN + 0.00000000499999; - - source = ASSETCHAINS_SELFIMPORT; //defaults to -ac_import=... param - - CTxDestination dest = DecodeDestination(destaddr.c_str()); - CScript scriptPubKey = GetScriptForDestination(dest); - vouts.push_back(CTxOut(burnAmount,scriptPubKey)); - - if (source == "BEAM") - { - if (ASSETCHAINS_BEAMPORT == 0) - return(-1); - // confirm via ASSETCHAINS_BEAMPORT that burnTx/hash is a valid BEAM burn - // return(0); - return -1; - } - else if (source == "CODA") - { - if (ASSETCHAINS_CODAPORT == 0) - return(-1); - hex=MakeCodaImportTx(0,burntxid,sourceaddr,vouts); - // confirm via ASSETCHAINS_CODAPORT that burnTx/hash is a valid CODA burn - // return(0); - } - else if (source == "PEGSCC") - { - return -1; - } - RETURN_IF_ERROR(CCerror); - if ( hex.size() > 0 ) - { - result.push_back(Pair("result", "success")); - result.push_back(Pair("hex", hex)); - } else ERR_RESULT("couldnt importdual"); - return result; -} - -UniValue importgatewayinfo(const UniValue& params, bool fHelp, const CPubKey& mypk) -{ - uint256 txid; - - if ( ASSETCHAINS_SELFIMPORT.size() == 0 ) - throw runtime_error("importgatewaybind only works on -ac_import chains"); - if ( fHelp || params.size() != 1 ) - throw runtime_error("importgatewayinfo bindtxid\n"); - txid = Parseuint256(params[0].get_str().c_str()); - return(ImportGatewayInfo(txid)); -} - - -UniValue importgatewaybind(const UniValue& params, bool fHelp, const CPubKey& mypk) -{ - UniValue result(UniValue::VOBJ); - CMutableTransaction mtx; std::vector pubkey; - std::string hex,coin; int32_t i,M,N; std::vector pubkeys; - uint256 oracletxid; uint8_t p1,p2,p3,p4; - - if ( ASSETCHAINS_SELFIMPORT.size() == 0 ) - throw runtime_error("importgatewaybind only works on -ac_import chains"); - if ( fHelp || params.size() != 8) - throw runtime_error("use \'importgatewaybind coin orcletxid M N pubkeys pubtype p2shtype wiftype [taddr]\' to bind an import gateway\n"); - if ( ensure_CCrequirements(EVAL_IMPORTGATEWAY) < 0 ) - throw runtime_error(CC_REQUIREMENTS_MSG); - CCerror = ""; - coin = params[0].get_str(); - oracletxid = Parseuint256(params[1].get_str().c_str()); - M = atoi(params[2].get_str().c_str()); - N = atoi(params[3].get_str().c_str()); - if ( M > N || N == 0 || N > 15 ) - throw runtime_error("illegal M or N > 15\n"); - if ( params.size() < 4+N+3 ) - throw runtime_error("not enough parameters for N pubkeys\n"); - for (i=0; i 0 ) - { - result.push_back(Pair("result", "success")); - result.push_back(Pair("hex", hex)); - } else ERR_RESULT("couldnt importgatewaybind"); - return result; -} - -UniValue importgatewaydeposit(const UniValue& params, bool fHelp, const CPubKey& mypk) -{ - UniValue result(UniValue::VOBJ); - CMutableTransaction mtx; std::vector rawproof; - std::string hex,coin,rawburntx; int32_t height,burnvout; int64_t amount; - CPubKey destpub; std::vector vouts; uint256 bindtxid,burntxid; - - if ( ASSETCHAINS_SELFIMPORT.size() == 0 ) - throw runtime_error("importgatewaydeposit only works on -ac_import chains"); - if ( fHelp || params.size() != 9) - throw runtime_error("use \'importgatewaydeposit bindtxid height coin burntxid nvout rawburntx rawproof destpub amount\' to import deposited coins\n"); - if ( ensure_CCrequirements(EVAL_IMPORTGATEWAY) < 0 ) - throw runtime_error(CC_REQUIREMENTS_MSG); - CCerror = ""; - bindtxid = Parseuint256(params[0].get_str().c_str()); - height = atoi(params[1].get_str().c_str()); - coin = params[2].get_str(); - burntxid = Parseuint256(params[3].get_str().c_str()); - burnvout = atoi(params[4].get_str().c_str()); - rawburntx = params[5].get_str(); - rawproof = ParseHex(params[6].get_str()); - destpub = ParseHex(params[7].get_str()); - amount = atof(params[8].get_str().c_str()) * COIN + 0.00000000499999; - if (coin == "BEAM" || coin == "CODA") - { - ERR_RESULT("for BEAM and CODA import use importdual RPC"); - return result; - } - else if (coin != ASSETCHAINS_SELFIMPORT) - { - ERR_RESULT("source coin not equal to ac_import name"); - return result; - } - hex = ImportGatewayDeposit(0, bindtxid, height, coin, burntxid, burnvout, rawburntx, rawproof, destpub, amount); - RETURN_IF_ERROR(CCerror); - if ( hex.size() > 0 ) - { - result.push_back(Pair("result", "success")); - result.push_back(Pair("hex", hex)); - } else ERR_RESULT("couldnt importgatewaydeposit"); - return result; -} - -UniValue importgatewaywithdraw(const UniValue& params, bool fHelp, const CPubKey& mypk) -{ - UniValue result(UniValue::VOBJ); - CMutableTransaction mtx; std::vector rawproof; - std::string hex,coin,rawburntx; int64_t amount; int32_t height,burnvout; - CPubKey destpub; std::vector vouts; uint256 bindtxid,burntxid; - - if ( ASSETCHAINS_SELFIMPORT.size() == 0 ) - throw runtime_error("importgatewaywithdraw only works on -ac_import chains"); - if ( fHelp || params.size() != 4) - throw runtime_error("use \'importgatewaywithdraw bindtxid coin withdrawpub amount\' to burn imported coins and withdraw them on external chain\n"); - if ( ensure_CCrequirements(EVAL_IMPORTGATEWAY) < 0 ) - throw runtime_error(CC_REQUIREMENTS_MSG); - CCerror = ""; - bindtxid = Parseuint256(params[0].get_str().c_str()); - coin = params[1].get_str(); - destpub = ParseHex(params[2].get_str()); - amount = atof((char *)params[3].get_str().c_str()) * COIN + 0.00000000499999; - if (coin == "BEAM" || coin == "CODA") - { - ERR_RESULT("for BEAM and CODA import use importdual RPC"); - return result; - } - else if (coin != ASSETCHAINS_SELFIMPORT) - { - ERR_RESULT("source coin not equal to ac_import name"); - return result; - } - hex = ImportGatewayWithdraw(0, bindtxid, coin, destpub, amount); - RETURN_IF_ERROR(CCerror); - if ( hex.size() > 0 ) - { - result.push_back(Pair("result", "success")); - result.push_back(Pair("hex", hex)); - } else ERR_RESULT("couldnt importgatewaywithdraw"); - return result; -} - -UniValue importgatewaypartialsign(const UniValue& params, bool fHelp, const CPubKey& mypk) -{ - UniValue result(UniValue::VOBJ); std::string coin,parthex,hex; uint256 txid; - - if ( ASSETCHAINS_SELFIMPORT.size() == 0 ) - throw runtime_error("importgatewayspartialsign only works on -ac_import chains"); - if ( fHelp || params.size() != 3 ) - throw runtime_error("importgatewayspartialsign txidaddr refcoin hex\n"); - if ( ensure_CCrequirements(EVAL_IMPORTGATEWAY) < 0 ) - throw runtime_error(CC_REQUIREMENTS_MSG); - txid = Parseuint256((char *)params[0].get_str().c_str()); - coin = params[1].get_str(); - parthex = params[2].get_str(); - hex = ImportGatewayPartialSign(0,txid,coin,parthex); - RETURN_IF_ERROR(CCerror); - if ( hex.size() > 0 ) - { - result.push_back(Pair("result", "success")); - result.push_back(Pair("hex",hex)); - } else ERR_RESULT("couldnt importgatewayspartialsign"); - return(result); -} - -UniValue importgatewaycompletesigning(const UniValue& params, bool fHelp, const CPubKey& mypk) -{ - UniValue result(UniValue::VOBJ); uint256 withdrawtxid; std::string txhex,hex,coin; - - if ( ASSETCHAINS_SELFIMPORT.size() == 0 ) - throw runtime_error("importgatewaycompletesigning only works on -ac_import chains"); - if ( fHelp || params.size() != 3 ) - throw runtime_error("importgatewaycompletesigning withdrawtxid coin hex\n"); - if ( ensure_CCrequirements(EVAL_IMPORTGATEWAY) < 0 ) - throw runtime_error(CC_REQUIREMENTS_MSG); - withdrawtxid = Parseuint256((char *)params[0].get_str().c_str()); - coin = params[1].get_str(); - txhex = params[2].get_str(); - hex = ImportGatewayCompleteSigning(0,withdrawtxid,coin,txhex); - RETURN_IF_ERROR(CCerror); - if ( hex.size() > 0 ) - { - result.push_back(Pair("result", "success")); - result.push_back(Pair("hex", hex)); - } else ERR_RESULT("couldnt importgatewaycompletesigning"); - return(result); -} - -UniValue importgatewaymarkdone(const UniValue& params, bool fHelp, const CPubKey& mypk) -{ - UniValue result(UniValue::VOBJ); uint256 completetxid; std::string hex,coin; - if ( fHelp || params.size() != 2 ) - throw runtime_error("importgatewaymarkdone completesigningtx coin\n"); - if ( ensure_CCrequirements(EVAL_IMPORTGATEWAY) < 0 ) - throw runtime_error(CC_REQUIREMENTS_MSG); - completetxid = Parseuint256((char *)params[0].get_str().c_str()); - coin = params[1].get_str(); - hex = ImportGatewayMarkDone(0,completetxid,coin); - RETURN_IF_ERROR(CCerror); - if ( hex.size() > 0 ) - { - result.push_back(Pair("result", "success")); - result.push_back(Pair("hex", hex)); - } else ERR_RESULT("couldnt importgatewaymarkdone"); - return(result); -} - -UniValue importgatewaypendingwithdraws(const UniValue& params, bool fHelp, const CPubKey& mypk) -{ - uint256 bindtxid; std::string coin; - if ( fHelp || params.size() != 2 ) - throw runtime_error("importgatewaypendingwithdraws bindtxid coin\n"); - if ( ensure_CCrequirements(EVAL_IMPORTGATEWAY) < 0 ) - throw runtime_error(CC_REQUIREMENTS_MSG); - bindtxid = Parseuint256((char *)params[0].get_str().c_str()); - coin = params[1].get_str(); - return(ImportGatewayPendingWithdraws(bindtxid,coin)); -} - -UniValue importgatewayprocessed(const UniValue& params, bool fHelp, const CPubKey& mypk) -{ - uint256 bindtxid; std::string coin; - if ( fHelp || params.size() != 2 ) - throw runtime_error("importgatewayprocessed bindtxid coin\n"); - if ( ensure_CCrequirements(EVAL_IMPORTGATEWAY) < 0 ) - throw runtime_error(CC_REQUIREMENTS_MSG); - bindtxid = Parseuint256((char *)params[0].get_str().c_str()); - coin = params[1].get_str(); - return(ImportGatewayProcessedWithdraws(bindtxid,coin)); -} - -UniValue importgatewayexternaladdress(const UniValue& params, bool fHelp, const CPubKey& mypk) -{ - uint256 bindtxid; CPubKey pubkey; - - if ( fHelp || params.size() != 2) - throw runtime_error("importgatewayexternaladdress bindtxid pubkey\n"); - if ( ensure_CCrequirements(EVAL_IMPORTGATEWAY) < 0 ) - throw runtime_error(CC_REQUIREMENTS_MSG); - bindtxid = Parseuint256((char *)params[0].get_str().c_str()); - pubkey = ParseHex(params[1].get_str().c_str()); - return(ImportGatewayExternalAddress(bindtxid,pubkey)); -} - -UniValue importgatewaydumpprivkey(const UniValue& params, bool fHelp, const CPubKey& mypk) -{ - uint256 bindtxid; - - if ( fHelp || params.size() != 2) - throw runtime_error("importgatewaydumpprivkey bindtxid address\n"); - if ( ensure_CCrequirements(EVAL_IMPORTGATEWAY) < 0 ) - throw runtime_error(CC_REQUIREMENTS_MSG); - bindtxid = Parseuint256((char *)params[0].get_str().c_str()); - std::string strAddress = params[1].get_str(); - CTxDestination dest = DecodeDestination(strAddress); - if (!IsValidDestination(dest)) { - throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, "Invalid transparent address"); - } - const CKeyID *keyID = boost::get(&dest); - if (!keyID) { - throw JSONRPCError(RPC_TYPE_ERROR, "Address does not refer to a key"); - } - CKey vchSecret; - // if (!pwalletMain->GetKey(*keyID, vchSecret)) { - // throw JSONRPCError(RPC_WALLET_ERROR, "Private key for address " + strAddress + " is not known"); - //} - return(ImportGatewayDumpPrivKey(bindtxid,vchSecret)); -} - UniValue getNotarizationsForBlock(const UniValue& params, bool fHelp, const CPubKey& mypk) { // TODO take timestamp as param, and loop blockindex to get starting/finish height. @@ -1195,264 +271,3 @@ UniValue scanNotarizationsDB(const UniValue& params, bool fHelp, const CPubKey& out.pushKV("opreturn", HexStr(E_MARSHAL(ss << nota.second))); return out; } - -UniValue getimports(const UniValue& params, bool fHelp, const CPubKey& mypk) -{ - if (fHelp || params.size() != 1) - throw runtime_error( - "getimports \"hash|height\"\n" - "\n\n" - "\nResult:\n" - "{\n" - " \"imports\" : [ (json array)\n" - " \"transactionid\" : { (json object)\n" - " \"value\" : (numeric)\n" - " \"address\" : (string)\n" - " \"export\" { (json object)\n" - " \"txid\" : (string)\n" - " \"value\" : (numeric)\n" - " \"chain\" : (string)\n" - " }\n" - " }" - " ]\n" - " \"TotalImported\" : (numeric)\n" - " \"time\" : (numeric)\n" - "}\n" - "\nExamples:\n" - + HelpExampleCli("getimports", "\"00000000febc373a1da2bd9f887b105ad79ddc26ac26c2b28652d64e5207c5b5\"") - + HelpExampleRpc("getimports", "\"00000000febc373a1da2bd9f887b105ad79ddc26ac26c2b28652d64e5207c5b5\"") - + HelpExampleCli("getimports", "12800") - + HelpExampleRpc("getimports", "12800") - ); - - LOCK(cs_main); - - std::string strHash = params[0].get_str(); - - // If height is supplied, find the hash - if (strHash.size() < (2 * sizeof(uint256))) { - // std::stoi allows characters, whereas we want to be strict - regex r("[[:digit:]]+"); - if (!regex_match(strHash, r)) { - throw JSONRPCError(RPC_INVALID_PARAMETER, "Invalid block height parameter"); - } - - int nHeight = -1; - try { - nHeight = std::stoi(strHash); - } - catch (const std::exception &e) { - throw JSONRPCError(RPC_INVALID_PARAMETER, "Invalid block height parameter"); - } - - if (nHeight < 0 || nHeight > chainActive.Height()) { - throw JSONRPCError(RPC_INVALID_PARAMETER, "Block height out of range"); - } - strHash = chainActive[nHeight]->GetBlockHash().GetHex(); - } - - uint256 hash(uint256S(strHash)); - - if (mapBlockIndex.count(hash) == 0) - throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, "Block not found"); - - CBlock block; - CBlockIndex* pblockindex = mapBlockIndex[hash]; - - if (fHavePruned && !(pblockindex->nStatus & BLOCK_HAVE_DATA) && pblockindex->nTx > 0) - throw JSONRPCError(RPC_INTERNAL_ERROR, "Block not available (pruned data)"); - - if(!ReadBlockFromDisk(block, pblockindex,1)) - throw JSONRPCError(RPC_INTERNAL_ERROR, "Can't read block from disk"); - - UniValue result(UniValue::VOBJ); - CAmount TotalImported = 0; - UniValue imports(UniValue::VARR); - BOOST_FOREACH(const CTransaction&tx, block.vtx) - { - if(tx.IsCoinImport()) - { - UniValue objTx(UniValue::VOBJ); - objTx.push_back(Pair("txid",tx.GetHash().ToString())); - ImportProof proof; CTransaction burnTx; std::vector payouts; CTxDestination importaddress; - TotalImported += tx.vout[0].nValue; // were vouts swapped? - objTx.push_back(Pair("amount", ValueFromAmount(tx.vout[1].nValue))); - if (ExtractDestination(tx.vout[1].scriptPubKey, importaddress)) - { - objTx.push_back(Pair("address", CBitcoinAddress(importaddress).ToString())); - } - UniValue objBurnTx(UniValue::VOBJ); - CPubKey vinPubkey; - if (UnmarshalImportTx(tx, proof, burnTx, payouts)) - { - if (burnTx.vout.size() == 0) - continue; - objBurnTx.push_back(Pair("txid", burnTx.GetHash().ToString())); - objBurnTx.push_back(Pair("amount", ValueFromAmount(burnTx.vout.back().nValue))); - // extract op_return to get burn source chain. - std::vector burnOpret; std::string targetSymbol; uint32_t targetCCid; uint256 payoutsHash; std::vectorrawproof; - if (UnmarshalBurnTx(burnTx, targetSymbol, &targetCCid, payoutsHash, rawproof)) - { - if (rawproof.size() > 0) - { - std::string sourceSymbol; - CTransaction tokenbasetx; - E_UNMARSHAL(rawproof, ss >> sourceSymbol; - if (!ss.eof()) - ss >> tokenbasetx ); - objBurnTx.push_back(Pair("source", sourceSymbol)); - if( !tokenbasetx.IsNull() ) - objBurnTx.push_back(Pair("tokenid", tokenbasetx.GetHash().GetHex())); - } - } - } - objTx.push_back(Pair("export", objBurnTx)); - imports.push_back(objTx); - } - } - result.push_back(Pair("imports", imports)); - result.push_back(Pair("TotalImported", TotalImported > 0 ? ValueFromAmount(TotalImported) : 0 )); - result.push_back(Pair("time", block.GetBlockTime())); - return result; -} - - -// outputs burn transactions in the wallet -UniValue getwalletburntransactions(const UniValue& params, bool fHelp, const CPubKey& mypk) -{ - if (fHelp || params.size() > 1) - throw runtime_error( - "getwalletburntransactions \"count\"\n\n" - "Lists most recent wallet burn transactions up to \'count\' parameter\n" - "parameter \'count\' is optional. If omitted, defaults to 10 burn transactions" - "\n\n" - "\nResult:\n" - "[\n" - " {\n" - " \"txid\": (string)\n" - " \"burnedAmount\" : (numeric)\n" - " \"targetSymbol\" : (string)\n" - " \"targetCCid\" : (numeric)\n" - " }\n" - "]\n" - "\nExamples:\n" - + HelpExampleCli("getwalletburntransactions", "100") - + HelpExampleRpc("getwalletburntransactions", "100") - + HelpExampleCli("getwalletburntransactions", "") - + HelpExampleRpc("getwalletburntransactions", "") - ); - - if (!EnsureWalletIsAvailable(fHelp)) - return NullUniValue; - - LOCK2(cs_main, pwalletMain->cs_wallet); - - string strAccount = "*"; - isminefilter filter = ISMINE_SPENDABLE; - int nCount = 10; - - if (params.size() == 1) - nCount = atoi(params[0].get_str()); - if (nCount < 0) - throw JSONRPCError(RPC_INVALID_PARAMETER, "Negative count"); - - UniValue ret(UniValue::VARR); - - std::list acentries; - CWallet::TxItems txOrdered = pwalletMain->OrderedTxItems(acentries, strAccount); - - // iterate backwards until we have nCount items to return: - for (CWallet::TxItems::reverse_iterator it = txOrdered.rbegin(); it != txOrdered.rend(); ++it) - { - CWalletTx *const pwtx = (*it).second.first; - if (pwtx != 0) - { - LOGSTREAM("importcoin", CCLOG_DEBUG2, stream << "pwtx iterpos=" << (int32_t)pwtx->nOrderPos << " txid=" << pwtx->GetHash().GetHex() << std::endl); - vscript_t vopret; - std::string targetSymbol; - uint32_t targetCCid; uint256 payoutsHash; - std::vector rawproof; - - if (pwtx->vout.size() > 0 && GetOpReturnData(pwtx->vout.back().scriptPubKey, vopret) && !vopret.empty() && - UnmarshalBurnTx(*pwtx, targetSymbol, &targetCCid, payoutsHash, rawproof)) { - UniValue entry(UniValue::VOBJ); - entry.push_back(Pair("txid", pwtx->GetHash().GetHex())); - - if (vopret.begin()[0] == EVAL_TOKENS) { - // get burned token value - std::vector> oprets; - uint256 tokenid; - uint8_t evalCodeInOpret; - std::vector voutTokenPubkeys; - - //skip token opret: - if (DecodeTokenOpRet(pwtx->vout.back().scriptPubKey, evalCodeInOpret, tokenid, voutTokenPubkeys, oprets) != 0) { - CTransaction tokenbasetx; - uint256 hashBlock; - - if (myGetTransaction(tokenid, tokenbasetx, hashBlock)) { - std::vector vorigpubkey; - std::string name, description; - std::vector> oprets; - - if (tokenbasetx.vout.size() > 0 && - DecodeTokenCreateOpRet(tokenbasetx.vout.back().scriptPubKey, vorigpubkey, name, description, oprets) == 'c') - { - uint8_t destEvalCode = EVAL_TOKENS; // init set to fungible token: - vscript_t vopretNonfungible; - GetOpretBlob(oprets, OPRETID_NONFUNGIBLEDATA, vopretNonfungible); - if (!vopretNonfungible.empty()) - destEvalCode = vopretNonfungible.begin()[0]; - - int64_t burnAmount = 0; - for (auto v : pwtx->vout) - if (v.scriptPubKey.IsPayToCryptoCondition() && - CTxOut(v.nValue, v.scriptPubKey) == MakeTokensCC1vout(destEvalCode ? destEvalCode : EVAL_TOKENS, v.nValue, pubkey2pk(ParseHex(CC_BURNPUBKEY)))) // burned to dead pubkey - burnAmount += v.nValue; - - entry.push_back(Pair("burnedAmount", ValueFromAmount(burnAmount))); - entry.push_back(Pair("tokenid", tokenid.GetHex())); - } - } - } - } - else - entry.push_back(Pair("burnedAmount", ValueFromAmount(pwtx->vout.back().nValue))); // coins - - // check for corrupted strings (look for non-printable chars) from some older versions - // which caused "couldn't parse reply from server" error on client: - if (std::find_if(targetSymbol.begin(), targetSymbol.end(), [](int c) {return !std::isprint(c);}) != targetSymbol.end()) - targetSymbol = ""; - - entry.push_back(Pair("targetSymbol", targetSymbol)); - entry.push_back(Pair("targetCCid", std::to_string(targetCCid))); - if (mytxid_inmempool(pwtx->GetHash())) - entry.push_back(Pair("inMempool", "yes")); - ret.push_back(entry); - } - } //else fprintf(stderr,"null pwtx\n - if ((int)ret.size() >= (nCount)) - break; - } - // ret is newest to oldest - - if (nCount > (int)ret.size()) - nCount = ret.size(); - - vector arrTmp = ret.getValues(); - - vector::iterator first = arrTmp.begin(); - vector::iterator last = arrTmp.begin(); - std::advance(last, nCount); - - if (last != arrTmp.end()) arrTmp.erase(last, arrTmp.end()); - if (first != arrTmp.begin()) arrTmp.erase(arrTmp.begin(), first); - - std::reverse(arrTmp.begin(), arrTmp.end()); // Return oldest to newest - - ret.clear(); - ret.setArray(); - ret.push_backV(arrTmp); - - return ret; -} diff --git a/src/rpc/rawtransaction.cpp b/src/rpc/rawtransaction.cpp index a9a27ad8d..23890479f 100644 --- a/src/rpc/rawtransaction.cpp +++ b/src/rpc/rawtransaction.cpp @@ -144,9 +144,10 @@ void TxToJSONExpanded(const CTransaction& tx, const uint256 hashBlock, UniValue& UniValue vin(UniValue::VARR); BOOST_FOREACH(const CTxIn& txin, tx.vin) { UniValue in(UniValue::VOBJ); - if (tx.IsCoinBase()) + if (tx.IsCoinBase()) { in.push_back(Pair("coinbase", HexStr(txin.scriptSig.begin(), txin.scriptSig.end()))); - else if (tx.IsCoinImport() && txin.prevout.n==10e8) { + } + /* else if (tx.IsCoinImport() && txin.prevout.n==10e8) { in.push_back(Pair("is_import", "1")); ImportProof proof; CTransaction burnTx; std::vector payouts; CTxDestination importaddress; if (UnmarshalImportTx(tx, proof, burnTx, payouts)) @@ -168,7 +169,7 @@ void TxToJSONExpanded(const CTransaction& tx, const uint256 hashBlock, UniValue& } } } - } + } */ else { in.push_back(Pair("txid", txin.prevout.hash.GetHex())); in.push_back(Pair("vout", (int64_t)txin.prevout.n)); @@ -216,6 +217,7 @@ void TxToJSONExpanded(const CTransaction& tx, const uint256 hashBlock, UniValue& out.push_back(Pair("n", (int64_t)i)); UniValue o(UniValue::VOBJ); ScriptPubKeyToJSON(txout.scriptPubKey, o, true); + /* if (txout.scriptPubKey.IsOpReturn() && txout.nValue != 0) { std::vector burnOpret; std::string targetSymbol; uint32_t targetCCid; uint256 payoutsHash; std::vectorrawproof; @@ -224,6 +226,7 @@ void TxToJSONExpanded(const CTransaction& tx, const uint256 hashBlock, UniValue& out.push_back(Pair("target", "EXPORT->" + targetSymbol)); } } + */ out.push_back(Pair("scriptPubKey", o)); // Add spent information if spentindex is enabled diff --git a/src/rpc/server.cpp b/src/rpc/server.cpp index bde315159..25d64a288 100644 --- a/src/rpc/server.cpp +++ b/src/rpc/server.cpp @@ -346,16 +346,6 @@ static const CRPCCommand vRPCCommands[] = { "crosschain", "crosschainproof", &crosschainproof, true }, { "crosschain", "getNotarizationsForBlock", &getNotarizationsForBlock, true }, { "crosschain", "scanNotarizationsDB", &scanNotarizationsDB, true }, - { "crosschain", "getimports", &getimports, true }, - { "crosschain", "getwalletburntransactions", &getwalletburntransactions, true }, - { "crosschain", "migrate_converttoexport", &migrate_converttoexport, true }, - { "crosschain", "migrate_createburntransaction", &migrate_createburntransaction, true }, - { "crosschain", "migrate_createimporttransaction", &migrate_createimporttransaction, true }, - { "crosschain", "migrate_completeimporttransaction", &migrate_completeimporttransaction, true }, - { "crosschain", "migrate_checkburntransactionsource", &migrate_checkburntransactionsource, true }, - { "crosschain", "migrate_createnotaryapprovaltransaction", &migrate_createnotaryapprovaltransaction, true }, - { "crosschain", "selfimport", &selfimport, true }, - { "crosschain", "importdual", &importdual, true }, /* Mining */ { "mining", "getblocktemplate", &getblocktemplate, true }, @@ -443,26 +433,6 @@ static const CRPCCommand vRPCCommands[] = { "CClib", "cclibinfo", &cclibinfo, true }, { "CClib", "cclib", &cclib, true }, - // tokens & assets - { "tokens", "assetsaddress", &assetsaddress, true }, - { "tokens", "tokeninfo", &tokeninfo, true }, - { "tokens", "tokenlist", &tokenlist, true }, - { "tokens", "tokenorders", &tokenorders, true }, - { "tokens", "mytokenorders", &mytokenorders, true }, - { "tokens", "tokenaddress", &tokenaddress, true }, - { "tokens", "tokenbalance", &tokenbalance, true }, - { "tokens", "tokencreate", &tokencreate, true }, - { "tokens", "tokentransfer", &tokentransfer, true }, - { "tokens", "tokenbid", &tokenbid, true }, - { "tokens", "tokencancelbid", &tokencancelbid, true }, - { "tokens", "tokenfillbid", &tokenfillbid, true }, - { "tokens", "tokenask", &tokenask, true }, - //{ "tokens", "tokenswapask", &tokenswapask, true }, - { "tokens", "tokencancelask", &tokencancelask, true }, - { "tokens", "tokenfillask", &tokenfillask, true }, - //{ "tokens", "tokenfillswap", &tokenfillswap, true }, - { "tokens", "tokenconvert", &tokenconvert, true }, - /* Address index */ { "addressindex", "getaddressmempool", &getaddressmempool, true }, { "addressindex", "getaddressutxos", &getaddressutxos, false }, diff --git a/src/rpc/server.h b/src/rpc/server.h index fc83515c1..22a33fa8b 100644 --- a/src/rpc/server.h +++ b/src/rpc/server.h @@ -237,22 +237,7 @@ extern UniValue submitblock(const UniValue& params, bool fHelp, const CPubKey& m extern UniValue estimatefee(const UniValue& params, bool fHelp, const CPubKey& mypk); extern UniValue estimatepriority(const UniValue& params, bool fHelp, const CPubKey& mypk); extern UniValue coinsupply(const UniValue& params, bool fHelp, const CPubKey& mypk); -extern UniValue tokeninfo(const UniValue& params, bool fHelp, const CPubKey& mypk); -extern UniValue tokenlist(const UniValue& params, bool fHelp, const CPubKey& mypk); -extern UniValue tokenorders(const UniValue& params, bool fHelp, const CPubKey& mypk); -extern UniValue mytokenorders(const UniValue& params, bool fHelp, const CPubKey& mypk); -extern UniValue tokenbalance(const UniValue& params, bool fHelp, const CPubKey& mypk); extern UniValue assetsaddress(const UniValue& params, bool fHelp, const CPubKey& mypk); -extern UniValue tokenaddress(const UniValue& params, bool fHelp, const CPubKey& mypk); -extern UniValue tokencreate(const UniValue& params, bool fHelp, const CPubKey& mypk); -extern UniValue tokentransfer(const UniValue& params, bool fHelp, const CPubKey& mypk); -extern UniValue tokenbid(const UniValue& params, bool fHelp, const CPubKey& mypk); -extern UniValue tokencancelbid(const UniValue& params, bool fHelp, const CPubKey& mypk); -extern UniValue tokenfillbid(const UniValue& params, bool fHelp, const CPubKey& mypk); -extern UniValue tokenask(const UniValue& params, bool fHelp, const CPubKey& mypk); -extern UniValue tokencancelask(const UniValue& params, bool fHelp, const CPubKey& mypk); -extern UniValue tokenfillask(const UniValue& params, bool fHelp, const CPubKey& mypk); -extern UniValue tokenconvert(const UniValue& params, bool fHelp, const CPubKey& mypk); extern UniValue heiraddress(const UniValue& params, bool fHelp, const CPubKey& mypk); extern UniValue heirfund(const UniValue& params, bool fHelp, const CPubKey& mypk); extern UniValue heiradd(const UniValue& params, bool fHelp, const CPubKey& mypk); @@ -280,8 +265,6 @@ extern UniValue channelsopen(const UniValue& params, bool fHelp, const CPubKey& extern UniValue channelspayment(const UniValue& params, bool fHelp, const CPubKey& mypk); extern UniValue channelsclose(const UniValue& params, bool fHelp, const CPubKey& mypk); extern UniValue channelsrefund(const UniValue& params, bool fHelp, const CPubKey& mypk); -//extern UniValue tokenswapask(const UniValue& params, bool fHelp, const CPubKey& mypk); -//extern UniValue tokenfillswap(const UniValue& params, bool fHelp, const CPubKey& mypk); extern UniValue faucetfund(const UniValue& params, bool fHelp, const CPubKey& mypk); extern UniValue faucetget(const UniValue& params, bool fHelp, const CPubKey& mypk); extern UniValue faucetaddress(const UniValue& params, bool fHelp, const CPubKey& mypk); diff --git a/src/test-hush/test_coinimport.cpp b/src/test-hush/test_coinimport.cpp deleted file mode 100644 index 346c25c81..000000000 --- a/src/test-hush/test_coinimport.cpp +++ /dev/null @@ -1,260 +0,0 @@ -// Copyright (c) 2016-2023 The Hush developers -// Distributed under the GPLv3 software license, see the accompanying -// file COPYING or https://www.gnu.org/licenses/gpl-3.0.en.html - -#include -#include - -#include "cc/eval.h" -#include "importcoin.h" -#include "base58.h" -#include "core_io.h" -#include "key.h" -#include "main.h" -#include "primitives/transaction.h" -#include "script/cc.h" -#include "script/interpreter.h" -#include "script/serverchecker.h" -#include "txmempool.h" - -#include "testutils.h" - - -extern Eval* EVAL_TEST; - -namespace TestCoinImport { - - -static uint8_t testNum = 0; - -class TestCoinImport : public ::testing::Test, public Eval { -public: - CMutableTransaction burnTx; std::vector rawproof; - std::vector payouts; - TxProof proof; - uint256 MoMoM; - CMutableTransaction importTx; - uint32_t testCcid = 2; - std::string testSymbol = "PIZZA"; - CAmount amount = 100; - - void SetImportTx() { - burnTx.vout.resize(0); - burnTx.vout.push_back(MakeBurnOutput(amount, testCcid, testSymbol, payouts,rawproof)); - importTx = CMutableTransaction(MakeImportCoinTransaction(proof, CTransaction(burnTx), payouts)); - MoMoM = burnTx.GetHash(); // TODO: an actual branch - } - - uint32_t GetAssetchainsCC() const { return testCcid; } - std::string GetAssetchainsSymbol() const { return testSymbol; } - - bool GetProofRoot(uint256 hash, uint256 &momom) const - { - if (MoMoM.IsNull()) return false; - momom = MoMoM; - return true; - } - - -protected: - static void SetUpTestCase() { setupChain(); } - virtual void SetUp() { - ASSETCHAINS_CC = 1; - EVAL_TEST = this; - - std::vector fakepk; - fakepk.resize(33); - fakepk.begin()[0] = testNum++; - payouts.push_back(CTxOut(amount, CScript() << fakepk << OP_CHECKSIG)); - SetImportTx(); - } - - - void TestRunCCEval(CMutableTransaction mtx) - { - CTransaction importTx(mtx); - PrecomputedTransactionData txdata(importTx); - ServerTransactionSignatureChecker checker(&importTx, 0, 0, false, txdata); - CValidationState verifystate; - if (!VerifyCoinImport(importTx.vin[0].scriptSig, checker, verifystate)) - printf("TestRunCCEval: %s\n", verifystate.GetRejectReason().data()); - } -}; - - -TEST_F(TestCoinImport, testProcessImportThroughPipeline) -{ - CValidationState mainstate; - CTransaction tx(importTx); - - // first should work - acceptTxFail(tx); - - // should fail in mempool - ASSERT_FALSE(acceptTx(tx, mainstate)); - EXPECT_EQ("already in mempool", mainstate.GetRejectReason()); - - // should be in persisted UTXO set - generateBlock(); - ASSERT_FALSE(acceptTx(tx, mainstate)); - EXPECT_EQ("already have coins", mainstate.GetRejectReason()); - ASSERT_TRUE(pcoinsTip->HaveCoins(tx.GetHash())); - - // Now disconnect the block - CValidationState invalstate; - if (!InvalidateBlock(invalstate, chainActive.Tip())) { - FAIL() << invalstate.GetRejectReason(); - } - ASSERT_FALSE(pcoinsTip->HaveCoins(tx.GetHash())); - - // should be back in mempool - ASSERT_FALSE(acceptTx(tx, mainstate)); - EXPECT_EQ("already in mempool", mainstate.GetRejectReason()); -} - - -TEST_F(TestCoinImport, testImportTombstone) -{ - CValidationState mainstate; - // By setting an unspendable output, there will be no addition to UTXO - // Nonetheless, we dont want to be able to import twice - payouts[0].scriptPubKey = CScript() << OP_RETURN; - SetImportTx(); - MoMoM = burnTx.GetHash(); // TODO: an actual branch - CTransaction tx(importTx); - - // first should work - acceptTxFail(tx); - - // should be in persisted UTXO set - generateBlock(); - ASSERT_FALSE(acceptTx(tx, mainstate)); - EXPECT_EQ("import tombstone exists", mainstate.GetRejectReason()); - ASSERT_TRUE(pcoinsTip->HaveCoins(burnTx.GetHash())); - - // Now disconnect the block - CValidationState invalstate; - if (!InvalidateBlock(invalstate, chainActive.Tip())) { - FAIL() << invalstate.GetRejectReason(); - } - // Tombstone should be gone from utxo set - ASSERT_FALSE(pcoinsTip->HaveCoins(burnTx.GetHash())); - - // should be back in mempool - ASSERT_FALSE(acceptTx(tx, mainstate)); - EXPECT_EQ("already in mempool", mainstate.GetRejectReason()); -} - - -TEST_F(TestCoinImport, testNoVouts) -{ - importTx.vout.resize(0); - TestRunCCEval(importTx); - EXPECT_EQ("too-few-vouts", state.GetRejectReason()); -} - - -TEST_F(TestCoinImport, testInvalidParams) -{ - std::vector payload = E_MARSHAL(ss << EVAL_IMPORTCOIN; ss << 'a'); - importTx.vin[0].scriptSig = CScript() << payload; - TestRunCCEval(importTx); - EXPECT_EQ("invalid-params", state.GetRejectReason()); -} - - -TEST_F(TestCoinImport, testNonCanonical) -{ - importTx.nLockTime = 10; - TestRunCCEval(importTx); - EXPECT_EQ("non-canonical", state.GetRejectReason()); -} - - -TEST_F(TestCoinImport, testInvalidBurnOutputs) -{ - burnTx.vout.resize(0); - MoMoM = burnTx.GetHash(); // TODO: an actual branch - CTransaction tx = MakeImportCoinTransaction(proof, CTransaction(burnTx), payouts); - TestRunCCEval(tx); - EXPECT_EQ("invalid-burn-tx", state.GetRejectReason()); -} - - -TEST_F(TestCoinImport, testInvalidBurnParams) -{ - burnTx.vout.back().scriptPubKey = CScript() << OP_RETURN << E_MARSHAL(ss << VARINT(testCcid)); - MoMoM = burnTx.GetHash(); // TODO: an actual branch - CTransaction tx = MakeImportCoinTransaction(proof, CTransaction(burnTx), payouts); - TestRunCCEval(tx); - EXPECT_EQ("invalid-burn-tx", state.GetRejectReason()); -} - - -TEST_F(TestCoinImport, testWrongChainId) -{ - testCcid = 0; - TestRunCCEval(importTx); - EXPECT_EQ("importcoin-wrong-chain", state.GetRejectReason()); -} - - -TEST_F(TestCoinImport, testInvalidBurnAmount) -{ - burnTx.vout.back().nValue = 0; - MoMoM = burnTx.GetHash(); // TODO: an actual branch - CTransaction tx = MakeImportCoinTransaction(proof, CTransaction(burnTx), payouts); - TestRunCCEval(tx); - EXPECT_EQ("invalid-burn-amount", state.GetRejectReason()); -} - - -TEST_F(TestCoinImport, testPayoutTooHigh) -{ - importTx.vout[1].nValue = 101; - TestRunCCEval(importTx); - EXPECT_EQ("payout-too-high", state.GetRejectReason()); -} - - -TEST_F(TestCoinImport, testAmountInOpret) -{ - importTx.vout[0].nValue = 1; - TestRunCCEval(importTx); - EXPECT_EQ("non-canonical", state.GetRejectReason()); -} - - - -TEST_F(TestCoinImport, testInvalidPayouts) -{ - importTx.vout[1].nValue = 40; - importTx.vout.push_back(importTx.vout[0]); - TestRunCCEval(importTx); - EXPECT_EQ("wrong-payouts", state.GetRejectReason()); -} - - -TEST_F(TestCoinImport, testCouldntLoadMomom) -{ - MoMoM.SetNull(); - TestRunCCEval(importTx); - EXPECT_EQ("coudnt-load-momom", state.GetRejectReason()); -} - - -TEST_F(TestCoinImport, testMomomCheckFail) -{ - MoMoM.SetNull(); - MoMoM.begin()[0] = 1; - TestRunCCEval(importTx); - EXPECT_EQ("momom-check-fail", state.GetRejectReason()); -} - - -TEST_F(TestCoinImport, testGetCoinImportValue) -{ - ASSERT_EQ(100, GetCoinImportValue(importTx)); -} - -} /* namespace TestCoinImport */ diff --git a/src/wallet/rpcwallet.cpp b/src/wallet/rpcwallet.cpp index 9f0c6beb2..e5dcbb657 100644 --- a/src/wallet/rpcwallet.cpp +++ b/src/wallet/rpcwallet.cpp @@ -6403,19 +6403,6 @@ UniValue assetsaddress(const UniValue& params, bool fHelp, const CPubKey& mypk) return(CCaddress(cp, (char *)"Assets", pubkey)); } -UniValue tokenaddress(const UniValue& params, bool fHelp, const CPubKey& mypk) -{ - struct CCcontract_info *cp,C; std::vector pubkey; - cp = CCinit(&C,EVAL_TOKENS); - if ( fHelp || params.size() > 1 ) - throw runtime_error("tokenaddress [pubkey]\n"); - if ( ensure_CCrequirements(cp->evalcode) < 0 ) - throw runtime_error(CC_REQUIREMENTS_MSG); - if ( params.size() == 1 ) - pubkey = ParseHex(params[0].get_str().c_str()); - return(CCaddress(cp,(char *)"Tokens", pubkey)); -} - UniValue oracleslist(const UniValue& params, bool fHelp, const CPubKey& mypk) { if ( fHelp || params.size() > 0 ) @@ -6691,498 +6678,6 @@ UniValue faucetget(const UniValue& params, bool fHelp, const CPubKey& mypk) return(result); } -UniValue tokenlist(const UniValue& params, bool fHelp, const CPubKey& mypk) -{ - uint256 tokenid; - if ( fHelp || params.size() > 0 ) - throw runtime_error("tokenlist\n"); - if ( ensure_CCrequirements(EVAL_TOKENS) < 0 ) - throw runtime_error(CC_REQUIREMENTS_MSG); - return(TokenList()); -} - -UniValue tokeninfo(const UniValue& params, bool fHelp, const CPubKey& mypk) -{ - uint256 tokenid; - if ( fHelp || params.size() != 1 ) - throw runtime_error("tokeninfo tokenid\n"); - if ( ensure_CCrequirements(EVAL_TOKENS) < 0 ) - throw runtime_error(CC_REQUIREMENTS_MSG); - tokenid = Parseuint256((char *)params[0].get_str().c_str()); - return(TokenInfo(tokenid)); -} - -UniValue tokenorders(const UniValue& params, bool fHelp, const CPubKey& mypk) -{ - uint256 tokenid; - if ( fHelp || params.size() > 1 ) - throw runtime_error("tokenorders [tokenid]\n" - "returns token orders for the tokenid or all available token orders if tokenid is not set\n" - "(this rpc supports only fungible tokens)\n" "\n"); - if (ensure_CCrequirements(EVAL_ASSETS) < 0 || ensure_CCrequirements(EVAL_TOKENS) < 0) - throw runtime_error(CC_REQUIREMENTS_MSG); - if (params.size() == 1) { - tokenid = Parseuint256((char *)params[0].get_str().c_str()); - if (tokenid == zeroid) - throw runtime_error("incorrect tokenid\n"); - return AssetOrders(tokenid, CPubKey(), 0); - } - else { - // throw runtime_error("no tokenid\n"); - return AssetOrders(zeroid, CPubKey(), 0); - } -} - - -UniValue mytokenorders(const UniValue& params, bool fHelp, const CPubKey& mypk) -{ - uint256 tokenid; - if (fHelp || params.size() > 1) - throw runtime_error("mytokenorders [evalcode]\n" - "returns all the token orders for mypubkey\n" - "if evalcode is set then returns mypubkey token orders for non-fungible tokens with this evalcode\n" "\n"); - if (ensure_CCrequirements(EVAL_ASSETS) < 0 || ensure_CCrequirements(EVAL_TOKENS) < 0) - throw runtime_error(CC_REQUIREMENTS_MSG); - uint8_t additionalEvalCode = 0; - if (params.size() == 1) - additionalEvalCode = strtol(params[0].get_str().c_str(), NULL, 0); // supports also 0xEE-like values - - return AssetOrders(zeroid, Mypubkey(), additionalEvalCode); -} - -UniValue tokenbalance(const UniValue& params, bool fHelp, const CPubKey& mypk) -{ - UniValue result(UniValue::VOBJ); uint256 tokenid; uint64_t balance; std::vector pubkey; struct CCcontract_info *cp,C; - CCerror.clear(); - - if ( fHelp || params.size() > 2 ) - throw runtime_error("tokenbalance tokenid [pubkey]\n"); - if ( ensure_CCrequirements(EVAL_TOKENS) < 0 ) - throw runtime_error(CC_REQUIREMENTS_MSG); - - LOCK(cs_main); - - tokenid = Parseuint256((char *)params[0].get_str().c_str()); - if ( params.size() == 2 ) - pubkey = ParseHex(params[1].get_str().c_str()); - else - pubkey = Mypubkey(); - - balance = GetTokenBalance(pubkey2pk(pubkey),tokenid); - - if (CCerror.empty()) { - char destaddr[64]; - - result.push_back(Pair("result", "success")); - cp = CCinit(&C,EVAL_TOKENS); - if (GetCCaddress(cp, destaddr, pubkey2pk(pubkey)) != 0) - result.push_back(Pair("CCaddress", destaddr)); - - result.push_back(Pair("tokenid", params[0].get_str())); - result.push_back(Pair("balance", (int64_t)balance)); - } - else { - ERR_RESULT(CCerror); - } - - return(result); -} - -UniValue tokencreate(const UniValue& params, bool fHelp, const CPubKey& mypk) -{ - UniValue result(UniValue::VOBJ); - std::string name, description, hextx; - std::vector nonfungibleData; - int64_t supply; // changed from uin64_t to int64_t for this 'if ( supply <= 0 )' to work as expected - - CCerror.clear(); - - if ( fHelp || params.size() > 4 || params.size() < 2 ) - throw runtime_error("tokencreate name supply [description][data]\n"); - if ( ensure_CCrequirements(EVAL_TOKENS) < 0 ) - throw runtime_error(CC_REQUIREMENTS_MSG); - - const CKeyStore& keystore = *pwalletMain; - LOCK2(cs_main, pwalletMain->cs_wallet); - - name = params[0].get_str(); - if (name.size() == 0 || name.size() > 32) { - ERR_RESULT("Token name must not be empty and up to 32 characters"); - return(result); - } - - supply = atof(params[1].get_str().c_str()) * COIN + 0.00000000499999; // what for is this '+0.00000000499999'? it will be lost while converting double to int64_t (dimxy) - if (supply <= 0) { - ERR_RESULT("Token supply must be positive"); - return(result); - } - - if (params.size() >= 3) { - description = params[2].get_str(); - if (description.size() > 4096) { - ERR_RESULT("Token description must be <= 4096 characters"); - return(result); - } - } - - if (params.size() == 4) { - nonfungibleData = ParseHex(params[3].get_str()); - if (nonfungibleData.size() > DRAGON_MAXSCRIPTSIZE) // opret limit - { - ERR_RESULT("Non-fungible data size must be <= " + std::to_string(DRAGON_MAXSCRIPTSIZE)); - return(result); - } - if( nonfungibleData.empty() ) { - ERR_RESULT("Non-fungible data incorrect"); - return(result); - } - } - - hextx = CreateToken(0, supply, name, description, nonfungibleData); - if( hextx.size() > 0 ) { - result.push_back(Pair("result", "success")); - result.push_back(Pair("hex", hextx)); - } - else - ERR_RESULT(CCerror); - return(result); -} - -UniValue tokentransfer(const UniValue& params, bool fHelp, const CPubKey& mypk) -{ - UniValue result(UniValue::VOBJ); - std::string hex; - int64_t amount; - uint256 tokenid; - - CCerror.clear(); - - if ( fHelp || params.size() != 3) - throw runtime_error("tokentransfer tokenid destpubkey amount\n"); - if ( ensure_CCrequirements(EVAL_TOKENS) < 0 ) - throw runtime_error(CC_REQUIREMENTS_MSG); - - const CKeyStore& keystore = *pwalletMain; - LOCK2(cs_main, pwalletMain->cs_wallet); - - tokenid = Parseuint256((char *)params[0].get_str().c_str()); - std::vector pubkey(ParseHex(params[1].get_str().c_str())); - //amount = atol(params[2].get_str().c_str()); - amount = atoll(params[2].get_str().c_str()); // dimxy changed to prevent loss of significance - if( tokenid == zeroid ) { - ERR_RESULT("invalid tokenid"); - return(result); - } - if( amount <= 0 ) { - ERR_RESULT("amount must be positive"); - return(result); - } - - hex = TokenTransfer(0, tokenid, pubkey, amount); - - if( !CCerror.empty() ) { - ERR_RESULT(CCerror); - } - else { - result.push_back(Pair("result", "success")); - result.push_back(Pair("hex", hex)); - } - return(result); -} - -UniValue tokenconvert(const UniValue& params, bool fHelp, const CPubKey& mypk) -{ - UniValue result(UniValue::VOBJ); std::string hex; int32_t evalcode; int64_t amount; uint256 tokenid; - if ( fHelp || params.size() != 4 ) - throw runtime_error("tokenconvert evalcode tokenid pubkey amount\n"); - if ( ensure_CCrequirements(EVAL_ASSETS) < 0 ) - throw runtime_error(CC_REQUIREMENTS_MSG); - const CKeyStore& keystore = *pwalletMain; - LOCK2(cs_main, pwalletMain->cs_wallet); - evalcode = atoi(params[0].get_str().c_str()); - tokenid = Parseuint256((char *)params[1].get_str().c_str()); - std::vector pubkey(ParseHex(params[2].get_str().c_str())); - //amount = atol(params[3].get_str().c_str()); - amount = atoll(params[3].get_str().c_str()); // dimxy changed to prevent loss of significance - if ( tokenid == zeroid ) - { - ERR_RESULT("invalid tokenid"); - return(result); - } - if ( amount <= 0 ) - { - ERR_RESULT("amount must be positive"); - return(result); - } - - ERR_RESULT("deprecated"); - return(result); - -/* hex = AssetConvert(0,tokenid,pubkey,amount,evalcode); - if (amount > 0) { - if ( hex.size() > 0 ) - { - result.push_back(Pair("result", "success")); - result.push_back(Pair("hex", hex)); - } else ERR_RESULT("couldnt convert tokens"); - } else { - ERR_RESULT("amount must be positive"); - } - return(result); */ -} - -UniValue tokenbid(const UniValue& params, bool fHelp, const CPubKey& mypk) -{ - UniValue result(UniValue::VOBJ); int64_t bidamount,numtokens; std::string hex; double price; uint256 tokenid; - if ( fHelp || params.size() != 3 ) - throw runtime_error("tokenbid numtokens tokenid price\n"); - if (ensure_CCrequirements(EVAL_ASSETS) < 0 || ensure_CCrequirements(EVAL_TOKENS) < 0) - throw runtime_error(CC_REQUIREMENTS_MSG); - const CKeyStore& keystore = *pwalletMain; - LOCK2(cs_main, pwalletMain->cs_wallet); - //numtokens = atoi(params[0].get_str().c_str()); - numtokens = atoll(params[0].get_str().c_str()); // dimxy changed to prevent loss of significance - tokenid = Parseuint256((char *)params[1].get_str().c_str()); - price = atof(params[2].get_str().c_str()); - bidamount = (price * numtokens) * COIN + 0.0000000049999; - if ( price <= 0 ) - { - ERR_RESULT("price must be positive"); - return(result); - } - if ( tokenid == zeroid ) - { - ERR_RESULT("invalid tokenid"); - return(result); - } - if ( bidamount <= 0 ) - { - ERR_RESULT("bid amount must be positive"); - return(result); - } - hex = CreateBuyOffer(0,bidamount,tokenid,numtokens); - if (price > 0 && numtokens > 0) { - if ( hex.size() > 0 ) - { - result.push_back(Pair("result", "success")); - result.push_back(Pair("hex", hex)); - } else ERR_RESULT("couldnt create bid"); - } else { - ERR_RESULT("price and numtokens must be positive"); - } - return(result); -} - -UniValue tokencancelbid(const UniValue& params, bool fHelp, const CPubKey& mypk) -{ - UniValue result(UniValue::VOBJ); std::string hex; int32_t i; uint256 tokenid,bidtxid; - if ( fHelp || params.size() != 2 ) - throw runtime_error("tokencancelbid tokenid bidtxid\n"); - if (ensure_CCrequirements(EVAL_ASSETS) < 0 || ensure_CCrequirements(EVAL_TOKENS) < 0) - throw runtime_error(CC_REQUIREMENTS_MSG); - const CKeyStore& keystore = *pwalletMain; - LOCK2(cs_main, pwalletMain->cs_wallet); - tokenid = Parseuint256((char *)params[0].get_str().c_str()); - bidtxid = Parseuint256((char *)params[1].get_str().c_str()); - if ( tokenid == zeroid || bidtxid == zeroid ) - { - result.push_back(Pair("error", "invalid parameter")); - return(result); - } - hex = CancelBuyOffer(0,tokenid,bidtxid); - if ( hex.size() > 0 ) - { - result.push_back(Pair("result", "success")); - result.push_back(Pair("hex", hex)); - } else ERR_RESULT("couldnt cancel bid"); - return(result); -} - -UniValue tokenfillbid(const UniValue& params, bool fHelp, const CPubKey& mypk) -{ - UniValue result(UniValue::VOBJ); int64_t fillamount; std::string hex; uint256 tokenid,bidtxid; - if ( fHelp || params.size() != 3 ) - throw runtime_error("tokenfillbid tokenid bidtxid fillamount\n"); - if (ensure_CCrequirements(EVAL_ASSETS) < 0 || ensure_CCrequirements(EVAL_TOKENS) < 0) - throw runtime_error(CC_REQUIREMENTS_MSG); - const CKeyStore& keystore = *pwalletMain; - LOCK2(cs_main, pwalletMain->cs_wallet); - tokenid = Parseuint256((char *)params[0].get_str().c_str()); - bidtxid = Parseuint256((char *)params[1].get_str().c_str()); - // fillamount = atol(params[2].get_str().c_str()); - fillamount = atoll(params[2].get_str().c_str()); // dimxy changed to prevent loss of significance - if ( fillamount <= 0 ) - { - ERR_RESULT("fillamount must be positive"); - return(result); - } - if ( tokenid == zeroid || bidtxid == zeroid ) - { - ERR_RESULT("must provide tokenid and bidtxid"); - return(result); - } - hex = FillBuyOffer(0,tokenid,bidtxid,fillamount); - if ( hex.size() > 0 ) - { - result.push_back(Pair("result", "success")); - result.push_back(Pair("hex", hex)); - } else ERR_RESULT("couldnt fill bid"); - return(result); -} - -UniValue tokenask(const UniValue& params, bool fHelp, const CPubKey& mypk) -{ - UniValue result(UniValue::VOBJ); int64_t askamount,numtokens; std::string hex; double price; uint256 tokenid; - if ( fHelp || params.size() != 3 ) - throw runtime_error("tokenask numtokens tokenid price\n"); - if (ensure_CCrequirements(EVAL_ASSETS) < 0 || ensure_CCrequirements(EVAL_TOKENS) < 0) - throw runtime_error(CC_REQUIREMENTS_MSG); - const CKeyStore& keystore = *pwalletMain; - LOCK2(cs_main, pwalletMain->cs_wallet); - //numtokens = atoi(params[0].get_str().c_str()); - numtokens = atoll(params[0].get_str().c_str()); // dimxy changed to prevent loss of significance - tokenid = Parseuint256((char *)params[1].get_str().c_str()); - price = atof(params[2].get_str().c_str()); - askamount = (price * numtokens) * COIN + 0.0000000049999; - //std::cerr << std::boolalpha << "tokenask(): (tokenid == zeroid) is " << (tokenid == zeroid) << " (numtokens <= 0) is " << (numtokens <= 0) << " (price <= 0) is " << (price <= 0) << " (askamount <= 0) is " << (askamount <= 0) << std::endl; - if ( tokenid == zeroid || numtokens <= 0 || price <= 0 || askamount <= 0 ) - { - ERR_RESULT("invalid parameter"); - return(result); - } - hex = CreateSell(0,numtokens,tokenid,askamount); - if (price > 0 && numtokens > 0) { - if ( hex.size() > 0 ) - { - result.push_back(Pair("result", "success")); - result.push_back(Pair("hex", hex)); - } else ERR_RESULT("couldnt create ask"); - } else { - ERR_RESULT("price and numtokens must be positive"); - } - return(result); -} - -UniValue tokenswapask(const UniValue& params, bool fHelp, const CPubKey& mypk) -{ - static uint256 zeroid; - UniValue result(UniValue::VOBJ); int64_t askamount,numtokens; std::string hex; double price; uint256 tokenid,otherid; - if ( fHelp || params.size() != 4 ) - throw runtime_error("tokenswapask numtokens tokenid otherid price\n"); - if ( ensure_CCrequirements(EVAL_ASSETS) < 0 ) - throw runtime_error(CC_REQUIREMENTS_MSG); - const CKeyStore& keystore = *pwalletMain; - LOCK2(cs_main, pwalletMain->cs_wallet); - //numtokens = atoi(params[0].get_str().c_str()); - numtokens = atoll(params[0].get_str().c_str()); // dimxy changed to prevent loss of significance - tokenid = Parseuint256((char *)params[1].get_str().c_str()); - otherid = Parseuint256((char *)params[2].get_str().c_str()); - price = atof(params[3].get_str().c_str()); - askamount = (price * numtokens); - hex = CreateSwap(0,numtokens,tokenid,otherid,askamount); - if (price > 0 && numtokens > 0) { - if ( hex.size() > 0 ) - { - result.push_back(Pair("result", "success")); - result.push_back(Pair("hex", hex)); - } else ERR_RESULT("couldnt create swap"); - } else { - ERR_RESULT("price and numtokens must be positive"); - } - return(result); -} - -UniValue tokencancelask(const UniValue& params, bool fHelp, const CPubKey& mypk) -{ - UniValue result(UniValue::VOBJ); std::string hex; int32_t i; uint256 tokenid,asktxid; - if ( fHelp || params.size() != 2 ) - throw runtime_error("tokencancelask tokenid asktxid\n"); - if (ensure_CCrequirements(EVAL_ASSETS) < 0 || ensure_CCrequirements(EVAL_TOKENS) < 0) - throw runtime_error(CC_REQUIREMENTS_MSG); - const CKeyStore& keystore = *pwalletMain; - LOCK2(cs_main, pwalletMain->cs_wallet); - tokenid = Parseuint256((char *)params[0].get_str().c_str()); - asktxid = Parseuint256((char *)params[1].get_str().c_str()); - if ( tokenid == zeroid || asktxid == zeroid ) - { - result.push_back(Pair("error", "invalid parameter")); - return(result); - } - hex = CancelSell(0,tokenid,asktxid); - if ( hex.size() > 0 ) - { - result.push_back(Pair("result", "success")); - result.push_back(Pair("hex", hex)); - } else ERR_RESULT("couldnt cancel ask"); - return(result); -} - -UniValue tokenfillask(const UniValue& params, bool fHelp, const CPubKey& mypk) -{ - UniValue result(UniValue::VOBJ); int64_t fillunits; std::string hex; uint256 tokenid,asktxid; - if ( fHelp || params.size() != 3 ) - throw runtime_error("tokenfillask tokenid asktxid fillunits\n"); - if (ensure_CCrequirements(EVAL_ASSETS) < 0 || ensure_CCrequirements(EVAL_TOKENS) < 0) - throw runtime_error(CC_REQUIREMENTS_MSG); - const CKeyStore& keystore = *pwalletMain; - LOCK2(cs_main, pwalletMain->cs_wallet); - tokenid = Parseuint256((char *)params[0].get_str().c_str()); - asktxid = Parseuint256((char *)params[1].get_str().c_str()); - //fillunits = atol(params[2].get_str().c_str()); - fillunits = atoll(params[2].get_str().c_str()); // dimxy changed to prevent loss of significance - if ( fillunits <= 0 ) - { - ERR_RESULT("fillunits must be positive"); - return(result); - } - if ( tokenid == zeroid || asktxid == zeroid ) - { - result.push_back(Pair("error", "invalid parameter")); - return(result); - } - hex = FillSell(0,tokenid,zeroid,asktxid,fillunits); - if (fillunits > 0) { - if (CCerror != "") { - ERR_RESULT(CCerror); - } else if ( hex.size() > 0) { - result.push_back(Pair("result", "success")); - result.push_back(Pair("hex", hex)); - } else { - ERR_RESULT("couldnt fill ask"); - } - } else { - ERR_RESULT("fillunits must be positive"); - } - return(result); -} - -UniValue tokenfillswap(const UniValue& params, bool fHelp, const CPubKey& mypk) -{ - static uint256 zeroid; - UniValue result(UniValue::VOBJ); int64_t fillunits; std::string hex; uint256 tokenid,otherid,asktxid; - if ( fHelp || params.size() != 4 ) - throw runtime_error("tokenfillswap tokenid otherid asktxid fillunits\n"); - if ( ensure_CCrequirements(EVAL_ASSETS) < 0 ) - throw runtime_error(CC_REQUIREMENTS_MSG); - const CKeyStore& keystore = *pwalletMain; - LOCK2(cs_main, pwalletMain->cs_wallet); - tokenid = Parseuint256((char *)params[0].get_str().c_str()); - otherid = Parseuint256((char *)params[1].get_str().c_str()); - asktxid = Parseuint256((char *)params[2].get_str().c_str()); - //fillunits = atol(params[3].get_str().c_str()); - fillunits = atoll(params[3].get_str().c_str()); // dimxy changed to prevent loss of significance - hex = FillSell(0,tokenid,otherid,asktxid,fillunits); - if (fillunits > 0) { - if ( hex.size() > 0 ) { - result.push_back(Pair("result", "success")); - result.push_back(Pair("hex", hex)); - } else ERR_RESULT("couldnt fill bid"); - } else { - ERR_RESULT("fillunits must be positive"); - } - return(result); -} - UniValue getbalance64(const UniValue& params, bool fHelp, const CPubKey& mypk) { set setAddress; vector vecOutputs; From b0b9565d6aaeb2032eaee3c5c9a21479bd414edd Mon Sep 17 00:00:00 2001 From: Duke Date: Sun, 21 Jan 2024 15:32:23 -0500 Subject: [PATCH 029/108] Sapling and Overwinter network upgrades are always active --- src/main.cpp | 14 +++++++------- src/miner.cpp | 3 ++- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/src/main.cpp b/src/main.cpp index afb028115..ff708fbcf 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -931,8 +931,8 @@ unsigned int LimitOrphanTxSize(unsigned int nMaxOrphans) EXCLUSIVE_LOCKS_REQUIRE bool IsStandardTx(const CTransaction& tx, string& reason, const int nHeight) { - bool overwinterActive = NetworkUpgradeActive(nHeight, Params().GetConsensus(), Consensus::UPGRADE_OVERWINTER); - bool saplingActive = NetworkUpgradeActive(nHeight, Params().GetConsensus(), Consensus::UPGRADE_SAPLING); + bool overwinterActive = true; //NetworkUpgradeActive(nHeight, Params().GetConsensus(), Consensus::UPGRADE_OVERWINTER); + bool saplingActive = true; //NetworkUpgradeActive(nHeight, Params().GetConsensus(), Consensus::UPGRADE_SAPLING); if (saplingActive) { // Sapling standard rules apply @@ -1220,9 +1220,9 @@ bool ContextualCheckTransaction(int32_t slowflag,const CBlock *block, CBlockInde const int dosLevel, bool (*isInitBlockDownload)(),int32_t validateprices) { - bool overwinterActive = NetworkUpgradeActive(nHeight, Params().GetConsensus(), Consensus::UPGRADE_OVERWINTER); - bool saplingActive = NetworkUpgradeActive(nHeight, Params().GetConsensus(), Consensus::UPGRADE_SAPLING); - bool isSprout = !overwinterActive; + bool overwinterActive = true; //NetworkUpgradeActive(nHeight, Params().GetConsensus(), Consensus::UPGRADE_OVERWINTER); + bool saplingActive = true; //NetworkUpgradeActive(nHeight, Params().GetConsensus(), Consensus::UPGRADE_SAPLING); + bool isSprout = false; //!overwinterActive; // If Sprout rules apply, reject transactions which are intended for Overwinter and beyond if (isSprout && tx.fOverwintered) { @@ -5215,7 +5215,7 @@ bool ContextualCheckBlock(int32_t slowflag,const CBlock& block, CValidationState { const int nHeight = pindexPrev == NULL ? 0 : pindexPrev->GetHeight() + 1; const Consensus::Params& consensusParams = Params().GetConsensus(); - bool sapling = NetworkUpgradeActive(nHeight, consensusParams, Consensus::UPGRADE_SAPLING); + bool sapling = true; //NetworkUpgradeActive(nHeight, consensusParams, Consensus::UPGRADE_SAPLING); // Check that all transactions are finalized for (uint32_t i = 0; i < block.vtx.size(); i++) { @@ -8209,7 +8209,7 @@ CMutableTransaction CreateNewContextualCMutableTransaction(const Consensus::Para mtx.nVersionGroupId = SAPLING_VERSION_GROUP_ID; mtx.nVersion = SAPLING_TX_VERSION; } else { - bool isOverwintered = NetworkUpgradeActive(nHeight, consensusParams, Consensus::UPGRADE_OVERWINTER); + bool isOverwintered = true; //NetworkUpgradeActive(nHeight, consensusParams, Consensus::UPGRADE_OVERWINTER); if (isOverwintered) { mtx.fOverwintered = true; diff --git a/src/miner.cpp b/src/miner.cpp index 456c2637a..c7d6c500f 100644 --- a/src/miner.cpp +++ b/src/miner.cpp @@ -233,7 +233,8 @@ CBlockTemplate* CreateNewBlock(CPubKey _pk,const CScript& _scriptPubKeyIn, int32 const int nHeight = pindexPrev->GetHeight() + 1; const Consensus::Params &consensusParams = chainparams.GetConsensus(); uint32_t consensusBranchId = CurrentEpochBranchId(nHeight, consensusParams); - bool sapling = NetworkUpgradeActive(nHeight, consensusParams, Consensus::UPGRADE_SAPLING); + // Sapling NU is always active + bool sapling = true; //NetworkUpgradeActive(nHeight, consensusParams, Consensus::UPGRADE_SAPLING); const int64_t nMedianTimePast = pindexPrev->GetMedianTimePast(); uint32_t proposedTime = GetTime(); From 27db254d688c7cd4d09114de98a99c0d4d7b07fa Mon Sep 17 00:00:00 2001 From: Duke Date: Sun, 21 Jan 2024 16:34:53 -0500 Subject: [PATCH 030/108] Sapling and Overwinter network upgrades are always active These NU's are always active for Hush Arrakis Chains so this code only serves to slow down all operations by constantly being checked. So we disable them which will speed up syncing, mining and creating transactions. --- src/main.cpp | 27 +++++++++++-------- src/miner.cpp | 2 +- src/rpc/rawtransaction.cpp | 3 ++- src/validationinterface.cpp | 3 ++- .../asyncrpcoperation_mergetoaddress.cpp | 2 ++ src/wallet/asyncrpcoperation_sendmany.cpp | 4 ++- .../asyncrpcoperation_shieldcoinbase.cpp | 2 ++ src/wallet/rpcwallet.cpp | 9 ++++--- src/wallet/wallet.cpp | 20 +++++++++----- 9 files changed, 48 insertions(+), 24 deletions(-) diff --git a/src/main.cpp b/src/main.cpp index ff708fbcf..85c0556fc 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -931,8 +931,8 @@ unsigned int LimitOrphanTxSize(unsigned int nMaxOrphans) EXCLUSIVE_LOCKS_REQUIRE bool IsStandardTx(const CTransaction& tx, string& reason, const int nHeight) { - bool overwinterActive = true; //NetworkUpgradeActive(nHeight, Params().GetConsensus(), Consensus::UPGRADE_OVERWINTER); - bool saplingActive = true; //NetworkUpgradeActive(nHeight, Params().GetConsensus(), Consensus::UPGRADE_SAPLING); + const bool overwinterActive = true; //NetworkUpgradeActive(nHeight, Params().GetConsensus(), Consensus::UPGRADE_OVERWINTER); + const bool saplingActive = true; //NetworkUpgradeActive(nHeight, Params().GetConsensus(), Consensus::UPGRADE_SAPLING); if (saplingActive) { // Sapling standard rules apply @@ -1220,9 +1220,9 @@ bool ContextualCheckTransaction(int32_t slowflag,const CBlock *block, CBlockInde const int dosLevel, bool (*isInitBlockDownload)(),int32_t validateprices) { - bool overwinterActive = true; //NetworkUpgradeActive(nHeight, Params().GetConsensus(), Consensus::UPGRADE_OVERWINTER); - bool saplingActive = true; //NetworkUpgradeActive(nHeight, Params().GetConsensus(), Consensus::UPGRADE_SAPLING); - bool isSprout = false; //!overwinterActive; + const bool overwinterActive = true; //NetworkUpgradeActive(nHeight, Params().GetConsensus(), Consensus::UPGRADE_OVERWINTER); + const bool saplingActive = true; //NetworkUpgradeActive(nHeight, Params().GetConsensus(), Consensus::UPGRADE_SAPLING); + const bool isSprout = false; //!overwinterActive; // If Sprout rules apply, reject transactions which are intended for Overwinter and beyond if (isSprout && tx.fOverwintered) { @@ -1728,11 +1728,12 @@ bool AcceptToMemoryPool(CTxMemPool& pool, CValidationState &state, const CTransa if ( nextBlockHeight <= 1 || chainActive.LastTip() == 0 ) tiptime = (uint32_t)time(NULL); else tiptime = (uint32_t)chainActive.LastTip()->nTime; + + /* // Node operator can choose to reject tx by number of transparent inputs static_assert(std::numeric_limits::max() >= std::numeric_limits::max(), "size_t too small"); - size_t limit = (size_t) GetArg("-mempooltxinputlimit", 0); - - // Limit is ignored if Overwinter is active, which is the case on HUSH3 and all HSC's + const size_t limit = 0; //(size_t) GetArg("-mempooltxinputlimit", 0); + // Limit is ignored if Overwinter is active, which is the case on HUSH3 and all HAC's if (NetworkUpgradeActive(nextBlockHeight, Params().GetConsensus(), Consensus::UPGRADE_OVERWINTER)) { limit = 0; } @@ -1743,6 +1744,7 @@ bool AcceptToMemoryPool(CTxMemPool& pool, CValidationState &state, const CTransa return false; } } + */ auto verifier = libzcash::ProofVerifier::Strict(); if (!CheckTransaction(tiptime,tx, state, verifier, 0, 0)) @@ -3071,7 +3073,8 @@ bool DisconnectBlock(CBlock& block, CValidationState& state, CBlockIndex* pindex // However, this is only reliable if the last block was on or after // the Sapling activation height. Otherwise, the last anchor was the // empty root. - if (NetworkUpgradeActive(pindex->pprev->GetHeight(), Params().GetConsensus(), Consensus::UPGRADE_SAPLING)) { + const bool sapling = true; // NetworkUpgradeActive(pindex->pprev->GetHeight(), Params().GetConsensus(), Consensus::UPGRADE_SAPLING); + if (sapling) { view.PopAnchor(pindex->pprev->hashFinalSaplingRoot, SAPLING); } else { view.PopAnchor(SaplingMerkleTree::empty_root(), SAPLING); @@ -3489,7 +3492,8 @@ bool ConnectBlock(const CBlock& block, CValidationState& state, CBlockIndex* pin // If Sapling is active, block.hashFinalSaplingRoot must be the // same as the root of the Sapling tree - if (NetworkUpgradeActive(pindex->GetHeight(), chainparams.GetConsensus(), Consensus::UPGRADE_SAPLING)) { + const bool sapling = true; //NetworkUpgradeActive(pindex->GetHeight(), chainparams.GetConsensus(), Consensus::UPGRADE_SAPLING); + if (sapling) { if (block.hashFinalSaplingRoot != sapling_tree.root()) { return state.DoS(100, error("ConnectBlock(): block's hashFinalSaplingRoot is incorrect"), @@ -8214,7 +8218,8 @@ CMutableTransaction CreateNewContextualCMutableTransaction(const Consensus::Para { mtx.fOverwintered = true; mtx.nExpiryHeight = nHeight + expiryDelta; - if (NetworkUpgradeActive(nHeight, consensusParams, Consensus::UPGRADE_SAPLING)) + const bool sapling = true; + if (sapling) // NetworkUpgradeActive(nHeight, consensusParams, Consensus::UPGRADE_SAPLING)) { mtx.nVersionGroupId = SAPLING_VERSION_GROUP_ID; mtx.nVersion = SAPLING_TX_VERSION; diff --git a/src/miner.cpp b/src/miner.cpp index c7d6c500f..c3b7ccf44 100644 --- a/src/miner.cpp +++ b/src/miner.cpp @@ -234,7 +234,7 @@ CBlockTemplate* CreateNewBlock(CPubKey _pk,const CScript& _scriptPubKeyIn, int32 const Consensus::Params &consensusParams = chainparams.GetConsensus(); uint32_t consensusBranchId = CurrentEpochBranchId(nHeight, consensusParams); // Sapling NU is always active - bool sapling = true; //NetworkUpgradeActive(nHeight, consensusParams, Consensus::UPGRADE_SAPLING); + const bool sapling = true; //NetworkUpgradeActive(nHeight, consensusParams, Consensus::UPGRADE_SAPLING); const int64_t nMedianTimePast = pindexPrev->GetMedianTimePast(); uint32_t proposedTime = GetTime(); diff --git a/src/rpc/rawtransaction.cpp b/src/rpc/rawtransaction.cpp index 23890479f..b09f60c12 100644 --- a/src/rpc/rawtransaction.cpp +++ b/src/rpc/rawtransaction.cpp @@ -690,7 +690,8 @@ UniValue createrawtransaction(const UniValue& params, bool fHelp, const CPubKey& } if (params.size() > 3 && !params[3].isNull()) { - if (NetworkUpgradeActive(nextBlockHeight, Params().GetConsensus(), Consensus::UPGRADE_OVERWINTER)) { + const bool overwinter = true; + if (overwinter) { // NetworkUpgradeActive(nextBlockHeight, Params().GetConsensus(), Consensus::UPGRADE_OVERWINTER)) { int64_t nExpiryHeight = params[3].get_int64(); if (nExpiryHeight < 0 || nExpiryHeight >= TX_EXPIRY_HEIGHT_THRESHOLD) { throw JSONRPCError(RPC_INVALID_PARAMETER, strprintf("Invalid parameter, expiryheight must be nonnegative and less than %d.", TX_EXPIRY_HEIGHT_THRESHOLD)); diff --git a/src/validationinterface.cpp b/src/validationinterface.cpp index 62ba5ea80..5294f851b 100644 --- a/src/validationinterface.cpp +++ b/src/validationinterface.cpp @@ -149,7 +149,8 @@ void ThreadNotifyWallets(CBlockIndex *pindexLastTip) // the Sapling activation height. Otherwise, the last anchor was the // empty root. SaplingMerkleTree oldSaplingTree; - if (NetworkUpgradeActive(pindex->pprev->GetHeight(),Params().GetConsensus(), Consensus::UPGRADE_SAPLING)) { + const bool sapling = true; + if (sapling) { // NetworkUpgradeActive(pindex->pprev->GetHeight(),Params().GetConsensus(), Consensus::UPGRADE_SAPLING)) { assert(pcoinsTip->GetSaplingAnchorAt(pindex->pprev->hashFinalSaplingRoot, oldSaplingTree)); } else { assert(pcoinsTip->GetSaplingAnchorAt(SaplingMerkleTree::empty_root(), oldSaplingTree)); diff --git a/src/wallet/asyncrpcoperation_mergetoaddress.cpp b/src/wallet/asyncrpcoperation_mergetoaddress.cpp index fe1e14fb8..8777ad1bf 100644 --- a/src/wallet/asyncrpcoperation_mergetoaddress.cpp +++ b/src/wallet/asyncrpcoperation_mergetoaddress.cpp @@ -192,6 +192,7 @@ bool AsyncRPCOperation_mergetoaddress::main_impl() size_t numInputs = utxoInputs_.size(); + /* // Check mempooltxinputlimit to avoid creating a transaction which the local mempool rejects size_t limit = (size_t)GetArg("-mempooltxinputlimit", 0); { @@ -205,6 +206,7 @@ bool AsyncRPCOperation_mergetoaddress::main_impl() strprintf("Number of transparent inputs %d is greater than mempooltxinputlimit of %d", numInputs, limit)); } + */ CAmount t_inputs_total = 0; for (MergeToAddressInputUTXO& t : utxoInputs_) { diff --git a/src/wallet/asyncrpcoperation_sendmany.cpp b/src/wallet/asyncrpcoperation_sendmany.cpp index d1573e02f..bef59b556 100644 --- a/src/wallet/asyncrpcoperation_sendmany.cpp +++ b/src/wallet/asyncrpcoperation_sendmany.cpp @@ -309,8 +309,9 @@ bool AsyncRPCOperation_sendmany::main_impl() { t_inputs_ = selectedTInputs; t_inputs_total = selectedUTXOAmount; + /* // Check mempooltxinputlimit to avoid creating a transaction which the local mempool rejects - size_t limit = (size_t)GetArg("-mempooltxinputlimit", 0); + const size_t limit = (size_t)GetArg("-mempooltxinputlimit", 0); { LOCK(cs_main); if (NetworkUpgradeActive(chainActive.Height() + 1, Params().GetConsensus(), Consensus::UPGRADE_OVERWINTER)) { @@ -323,6 +324,7 @@ bool AsyncRPCOperation_sendmany::main_impl() { throw JSONRPCError(RPC_WALLET_ERROR, strprintf("Too many transparent inputs %zu > limit %zu", n, limit)); } } + */ // update the transaction with these inputs if (isUsingBuilder_) { diff --git a/src/wallet/asyncrpcoperation_shieldcoinbase.cpp b/src/wallet/asyncrpcoperation_shieldcoinbase.cpp index cc0cc0c99..6658a50d1 100644 --- a/src/wallet/asyncrpcoperation_shieldcoinbase.cpp +++ b/src/wallet/asyncrpcoperation_shieldcoinbase.cpp @@ -164,6 +164,7 @@ bool AsyncRPCOperation_shieldcoinbase::main_impl() { size_t numInputs = inputs_.size(); + /* // Check mempooltxinputlimit to avoid creating a transaction which the local mempool rejects size_t limit = (size_t)GetArg("-mempooltxinputlimit", 0); { @@ -177,6 +178,7 @@ bool AsyncRPCOperation_shieldcoinbase::main_impl() { strprintf("Number of inputs %d is greater than mempooltxinputlimit of %d", numInputs, limit)); } + */ CAmount targetAmount = 0; for (ShieldCoinbaseUTXO & utxo : inputs_) { diff --git a/src/wallet/rpcwallet.cpp b/src/wallet/rpcwallet.cpp index e5dcbb657..bf7bee794 100644 --- a/src/wallet/rpcwallet.cpp +++ b/src/wallet/rpcwallet.cpp @@ -5270,7 +5270,9 @@ UniValue z_sendmany(const UniValue& params, bool fHelp, const CPubKey& mypk) mtx.nVersionGroupId = SAPLING_VERSION_GROUP_ID; mtx.nVersion = SAPLING_TX_VERSION; unsigned int max_tx_size = MAX_TX_SIZE_AFTER_SAPLING; - if (!NetworkUpgradeActive(nextBlockHeight, Params().GetConsensus(), Consensus::UPGRADE_SAPLING)) { + /* + const bool sapling = true; //NetworkUpgradeActive(nextBlockHeight, Params().GetConsensus(), Consensus::UPGRADE_SAPLING)) { + if (!sapling) { if (NetworkUpgradeActive(nextBlockHeight, Params().GetConsensus(), Consensus::UPGRADE_OVERWINTER)) { mtx.nVersionGroupId = OVERWINTER_VERSION_GROUP_ID; mtx.nVersion = OVERWINTER_TX_VERSION; @@ -5279,6 +5281,7 @@ UniValue z_sendmany(const UniValue& params, bool fHelp, const CPubKey& mypk) mtx.nVersion = 2; } } + */ // As a sanity check, estimate and verify that the size of the transaction will be valid. // Depending on the input notes, the actual tx size may turn out to be larger and perhaps invalid. @@ -5462,7 +5465,7 @@ UniValue z_shieldcoinbase(const UniValue& params, bool fHelp, const CPubKey& myp } int nextBlockHeight = chainActive.Height() + 1; - bool overwinterActive = NetworkUpgradeActive(nextBlockHeight, Params().GetConsensus(), Consensus::UPGRADE_OVERWINTER); + bool overwinterActive = true; // NetworkUpgradeActive(nextBlockHeight, Params().GetConsensus(), Consensus::UPGRADE_OVERWINTER); unsigned int max_tx_size = MAX_TX_SIZE_AFTER_SAPLING; // Prepare to get coinbase utxos @@ -5709,7 +5712,7 @@ UniValue z_mergetoaddress(const UniValue& params, bool fHelp, const CPubKey& myp } const int nextBlockHeight = chainActive.Height() + 1; - const bool overwinterActive = NetworkUpgradeActive(nextBlockHeight, Params().GetConsensus(), Consensus::UPGRADE_OVERWINTER); + const bool overwinterActive = true; // NetworkUpgradeActive(nextBlockHeight, Params().GetConsensus(), Consensus::UPGRADE_OVERWINTER); // Validate the destination address auto destaddress = params[1].get_str(); diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp index 3071d46a7..4954ac505 100644 --- a/src/wallet/wallet.cpp +++ b/src/wallet/wallet.cpp @@ -2787,7 +2787,8 @@ int CWallet::ScanForWalletTransactions(CBlockIndex* pindexStart, bool fUpdate) // This should never fail: we should always be able to get the tree // state on the path to the tip of our chain if (pindex->pprev) { - if (NetworkUpgradeActive(pindex->pprev->GetHeight(), Params().GetConsensus(), Consensus::UPGRADE_SAPLING)) { + const bool sapling = true; + if (sapling) { // NetworkUpgradeActive(pindex->pprev->GetHeight(), Params().GetConsensus(), Consensus::UPGRADE_SAPLING)) { assert(pcoinsTip->GetSaplingAnchorAt(pindex->pprev->hashFinalSaplingRoot, saplingTree)); } } @@ -3687,7 +3688,8 @@ bool CWallet::CreateTransaction(const vector& vecSend, CWalletTx& wt txNew.nLockTime = (uint32_t)chainActive.Tip()->GetMedianTimePast(); // Activates after Overwinter network upgrade - if (NetworkUpgradeActive(nextBlockHeight, Params().GetConsensus(), Consensus::UPGRADE_OVERWINTER)) { + const bool overwinter = true; + if (overwinter) { // NetworkUpgradeActive(nextBlockHeight, Params().GetConsensus(), Consensus::UPGRADE_OVERWINTER)) { if (txNew.nExpiryHeight >= TX_EXPIRY_HEIGHT_THRESHOLD){ strFailReason = _("nExpiryHeight must be less than TX_EXPIRY_HEIGHT_THRESHOLD."); return false; @@ -3695,9 +3697,11 @@ bool CWallet::CreateTransaction(const vector& vecSend, CWalletTx& wt } unsigned int max_tx_size = MAX_TX_SIZE_AFTER_SAPLING; + /* Sapling is always active if (!NetworkUpgradeActive(nextBlockHeight, Params().GetConsensus(), Consensus::UPGRADE_SAPLING)) { max_tx_size = MAX_TX_SIZE_BEFORE_SAPLING; } + */ /* // Discourage fee sniping. // @@ -3891,14 +3895,17 @@ bool CWallet::CreateTransaction(const vector& vecSend, CWalletTx& wt txNew.vin.push_back(CTxIn(coin.first->GetHash(),coin.second,CScript(), std::numeric_limits::max()-1)); + // All Hush Arrakis Chains always have overwinter NU and so this option was never used // Check mempooltxinputlimit to avoid creating a transaction which the local mempool rejects - size_t limit = (size_t)GetArg("-mempooltxinputlimit", 0); + // const size_t limit = 0; // (size_t)GetArg("-mempooltxinputlimit", 0); { LOCK(cs_main); - if (NetworkUpgradeActive(chainActive.Height() + 1, Params().GetConsensus(), Consensus::UPGRADE_OVERWINTER)) { - limit = 0; - } + const bool overwinter = true; + //if (NetworkUpgradeActive(chainActive.Height() + 1, Params().GetConsensus(), Consensus::UPGRADE_OVERWINTER)) { + // limit = 0; + //} } + /* if (limit > 0) { size_t n = txNew.vin.size(); if (n > limit) { @@ -3906,6 +3913,7 @@ bool CWallet::CreateTransaction(const vector& vecSend, CWalletTx& wt return false; } } + */ // Grab the current consensus branch ID auto consensusBranchId = CurrentEpochBranchId(chainActive.Height() + 1, Params().GetConsensus()); From e49836b45ef06137f93b60bb6a727d37060ca0aa Mon Sep 17 00:00:00 2001 From: Duke Date: Sun, 21 Jan 2024 16:59:09 -0500 Subject: [PATCH 031/108] Enforce sapling activation at height=1 We used to have the -ac_sapling option which defaulted to one, now we enforce that it must always be one, it cannot be changed and is no longer a CLI option. --- src/hush_utils.h | 2 +- src/init.cpp | 7 ++++--- src/wallet-utility.cpp | 4 ++-- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/src/hush_utils.h b/src/hush_utils.h index de03f73ba..71858ba1f 100644 --- a/src/hush_utils.h +++ b/src/hush_utils.h @@ -2092,7 +2092,7 @@ void hush_args(char *argv0) } // HUSH will always be The First Pure Sapling Coin, no Sprout JoinSplits in our history! ;) - ASSETCHAINS_SAPLING = GetArg("-ac_sapling", 1); + ASSETCHAINS_SAPLING = 1; // GetArg("-ac_sapling", 1); if (ASSETCHAINS_SAPLING == -1) { ASSETCHAINS_OVERWINTER = GetArg("-ac_overwinter", -1); diff --git a/src/init.cpp b/src/init.cpp index 2fd970547..f793bef28 100644 --- a/src/init.cpp +++ b/src/init.cpp @@ -597,8 +597,8 @@ std::string HelpMessage(HelpMessageMode mode) strUsage += HelpMessageOpt("-stratumport=", strprintf(_("Listen for Stratum work requests on (default: %u or testnet: %u)"), BaseParams().StratumPort(), BaseParams().StratumPort())); strUsage += HelpMessageOpt("-stratumallowip=", _("Allow Stratum work requests from specified source. Valid for are a single IP (e.g. 1.2.3.4), a network/netmask (e.g. 1.2.3.4/255.255.255.0) or a network/CIDR (e.g. 1.2.3.4/24). This option can be specified multiple times")); - // "ac" stands for "affects consensus" - strUsage += HelpMessageGroup(_("Hush Smart Chain options:")); + // "ac" stands for "affects consensus" or Arrakis Chain + strUsage += HelpMessageGroup(_("Hush Arrakis Chain options:")); strUsage += HelpMessageOpt("-ac_algo", _("Choose PoW mining algorithm, either 'equihash' or 'randomx'. default is Equihash (200,9)")); strUsage += HelpMessageOpt("-ac_blocktime", _("Block time in seconds, default is 60")); strUsage += HelpMessageOpt("-ac_cc", _("Cryptoconditions, default 0")); @@ -621,7 +621,8 @@ std::string HelpMessage(HelpMessageMode mode) strUsage += HelpMessageOpt("-ac_randomx_interval", _("Controls how often the RandomX key block will change, default is 1024")); strUsage += HelpMessageOpt("-ac_randomx_lag", _("Sets the number of RandomX blocks to wait before updating the key block, default is 64")); strUsage += HelpMessageOpt("-ac_reward", _("Block reward in satoshis, default is 0")); - strUsage += HelpMessageOpt("-ac_sapling", _("Sapling activation block height")); + // All HAC's activate sapling at block height 1, other heights are not supported + //strUsage += HelpMessageOpt("-ac_sapling", _("Sapling activation block height")); strUsage += HelpMessageOpt("-ac_script", _("P2SH/multisig address to receive founders rewards")); strUsage += HelpMessageOpt("-ac_supply", _("Starting supply, default is 10")); strUsage += HelpMessageOpt("-ac_txpow", _("Enforce transaction-rate limit, default 0")); diff --git a/src/wallet-utility.cpp b/src/wallet-utility.cpp index 19d826c7e..953fa255b 100644 --- a/src/wallet-utility.cpp +++ b/src/wallet-utility.cpp @@ -20,8 +20,8 @@ uint32_t ASSETCHAINS_MAGIC = 2387029918; uint32_t ASSETCHAINS_EQUIHASH = 0; uint32_t ASSETCHAINS_ALGO = 0; int32_t ASSETCHAINS_LWMAPOS = 0; -int32_t ASSETCHAINS_OVERWINTER = 227520; -int32_t ASSETCHAINS_SAPLING = 227520; +int32_t ASSETCHAINS_OVERWINTER = 1; +int32_t ASSETCHAINS_SAPLING = 1; int32_t HUSH_TESTNODE = 0; unsigned int MAX_BLOCK_SIGOPS = 20000; From bc0af82ce68e6d625318e4b9193ea63868cf647d Mon Sep 17 00:00:00 2001 From: Duke Date: Wed, 24 Jan 2024 11:25:48 -0500 Subject: [PATCH 032/108] SMART_CHAIN_SYMBOL is always defined, no need to check which slows this hot path down --- src/miner.cpp | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/src/miner.cpp b/src/miner.cpp index c3b7ccf44..ed0b05c5c 100644 --- a/src/miner.cpp +++ b/src/miner.cpp @@ -663,7 +663,7 @@ CBlockTemplate* CreateNewBlock(CPubKey _pk,const CScript& _scriptPubKeyIn, int32 // Create a local variable instead of modifying the global ASSETCHAINS_SCRIPTPUB auto assetchains_scriptpub = devtax_scriptpub_for_height(nHeight); - if ( nHeight > 1 && SMART_CHAIN_SYMBOL[0] != 0 && (ASSETCHAINS_OVERRIDE_PUBKEY33[0] != 0 || assetchains_scriptpub.size() > 1) && (ASSETCHAINS_COMMISSION != 0 || ASSETCHAINS_FOUNDERS_REWARD != 0) && (commission= the_commission((CBlock*)&pblocktemplate->block,(int32_t)nHeight)) != 0 ) + if ( nHeight > 1 && (ASSETCHAINS_OVERRIDE_PUBKEY33[0] != 0 || assetchains_scriptpub.size() > 1) && (ASSETCHAINS_COMMISSION != 0 || ASSETCHAINS_FOUNDERS_REWARD != 0) && (commission= the_commission((CBlock*)&pblocktemplate->block,(int32_t)nHeight)) != 0 ) { int32_t i; uint8_t *ptr; txNew.vout.resize(2); @@ -749,13 +749,14 @@ CBlockTemplate* CreateNewBlock(CPubKey _pk,const CScript& _scriptPubKeyIn, int32 pblock->hashFinalSaplingRoot = sapling_tree.root(); // all PoS chains need this data in the block at all times - if ( ASSETCHAINS_LWMAPOS || SMART_CHAIN_SYMBOL[0] == 0 || ASSETCHAINS_STAKED == 0 || HUSH_MININGTHREADS > 0 ) + if ( ASSETCHAINS_LWMAPOS || ASSETCHAINS_STAKED == 0 || HUSH_MININGTHREADS > 0 ) { UpdateTime(pblock, Params().GetConsensus(), pindexPrev); pblock->nBits = GetNextWorkRequired(pindexPrev, pblock, Params().GetConsensus()); } pblock->nSolution.clear(); pblocktemplate->vTxSigOps[0] = GetLegacySigOpCount(pblock->vtx[0]); + /* if ( SMART_CHAIN_SYMBOL[0] == 0 && IS_HUSH_NOTARY != 0 && My_notaryid >= 0 ) { uint32_t r; CScript opret; void **ptr=0; @@ -792,14 +793,15 @@ CBlockTemplate* CreateNewBlock(CPubKey _pk,const CScript& _scriptPubKeyIn, int32 } return(0); } - } - else if ( ASSETCHAINS_CC == 0 && pindexPrev != 0 && ASSETCHAINS_STAKED == 0 && (SMART_CHAIN_SYMBOL[0] != 0 || IS_HUSH_NOTARY == 0 || My_notaryid < 0) ) + } else */ + + if ( ASSETCHAINS_CC == 0 && pindexPrev != 0 && ASSETCHAINS_STAKED == 0 && (SMART_CHAIN_SYMBOL[0] != 0 || IS_HUSH_NOTARY == 0 || My_notaryid < 0) ) { CValidationState state; //fprintf(stderr,"%s: check validity\n", __func__); if ( !TestBlockValidity(state, *pblock, pindexPrev, false, false)) // invokes CC checks { - if ( SMART_CHAIN_SYMBOL[0] == 0 || (SMART_CHAIN_SYMBOL[0] != 0 && !isStake) ) + if ( (SMART_CHAIN_SYMBOL[0] != 0 && !isStake) ) { LEAVE_CRITICAL_SECTION(cs_main); LEAVE_CRITICAL_SECTION(mempool.cs); @@ -811,7 +813,7 @@ CBlockTemplate* CreateNewBlock(CPubKey _pk,const CScript& _scriptPubKeyIn, int32 //fprintf(stderr,"valid\n"); } } - if ( SMART_CHAIN_SYMBOL[0] == 0 || (SMART_CHAIN_SYMBOL[0] != 0 && !isStake) ) + if ( (SMART_CHAIN_SYMBOL[0] != 0 && !isStake) ) { LEAVE_CRITICAL_SECTION(cs_main); LEAVE_CRITICAL_SECTION(mempool.cs); @@ -820,7 +822,6 @@ CBlockTemplate* CreateNewBlock(CPubKey _pk,const CScript& _scriptPubKeyIn, int32 return pblocktemplate.release(); } - // Internal miner #ifdef ENABLE_MINING From 1612ca4da7249f70ba79c10f609a46909a23097a Mon Sep 17 00:00:00 2001 From: Duke Date: Thu, 25 Jan 2024 08:56:47 -0800 Subject: [PATCH 033/108] Add some useful tips about gdb and testcoins to dev notes --- doc/developer-notes.md | 41 ++++++++++++++++++++++++++++++++++------- 1 file changed, 34 insertions(+), 7 deletions(-) diff --git a/doc/developer-notes.md b/doc/developer-notes.md index d8027f38e..a2d90a7d3 100644 --- a/doc/developer-notes.md +++ b/doc/developer-notes.md @@ -24,6 +24,34 @@ rm zindex.dat blocks chainstate database notarizations hushstate It's possible to confused hush if you ran old code, stop, restart, and then write out zindex.dat that is incorrect, which later hushds will load from disk and believe. +# Generating a backtrace from a coredump + +Sometimes the code coredumps, what are ya gonna do? Generate a backtrace, of course. + +Run `ulimit -c unlimited` to make sure your shell will generate coredumps and +then run the application which coredumps. In the Olden Times Linux would always +make the "core" file in the same dir as the binary that was run which created +it. But I have now seen that some new Linux distributions put them in weird +places, for instance Arch puts them in /var/lib/systemd/coredump . If there are +lots of coredumps and you don't know which one is the latest, sort them by +modification time `ls -lart` or just delete them all and run the code which +generates the core dump. Old coredumps are not very useful and take up lots of space. + +Once you have a coredump file (which is usually called "core" or "core.XYZ" +where XYZ is the PID that generated it) you can then type `gdb binary_name +core_filename` and then type bt to generate the backtrace. + +For this repo, it's likely this is the command you need: +``` +gdb src/hushd core +``` + +NOTE: Even if you are debugging a coredump on a HAC, such as DragonX, the file `src/dragonxd` +is just a shell script that calls `src/hushd` and you always want to give an actual executable +file as the first argument to `gdb`, not a bash script. + +This link about Advanced GDB is very useful: https://interrupt.memfault.com/blog/advanced-gdb + # Parsing RPC output with jq jq is a very useful tool to parse JSON output, install it with: @@ -182,15 +210,14 @@ error and debugging messages are written there. The -debug=... command-line option controls debugging; running with just -debug or -debug=1 will turn on all categories (and give you a very large debug.log file). -**testnet and regtest modes** +**test coins** -Run with the -testnet option to run with "play HUSH" on the test network, if you -are testing multi-machine code that needs to operate across the internet. You can -also make a Hush Smart Chain "testcoin" with a single command: `hushd -ac_name=COIN ...` +The main way to test new things is directly on mainnet or you can also make a +Hush Arrakis Chain "testcoin" with a single command: `hushd -ac_name=COIN ...` -If you are testing something that can run on one machine, run with the -regtest option. -In regression test mode, blocks can be created on-demand; see qa/rpc-tests/ for tests -that run in -regtest mode. +If you are testing something that can run on one machine you can use `-testnode=1` +which makes it so a single machine can create a new blockchain and mine blocks, i.e. +no peers are necessary. **DEBUG_LOCKORDER** From c54b3990d9be009bd4a9ecb9ac16ad8cace3c423 Mon Sep 17 00:00:00 2001 From: Duke Date: Thu, 25 Jan 2024 09:13:56 -0800 Subject: [PATCH 034/108] Compiling Hush basics --- doc/developer-notes.md | 50 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 50 insertions(+) diff --git a/doc/developer-notes.md b/doc/developer-notes.md index a2d90a7d3..df090cd05 100644 --- a/doc/developer-notes.md +++ b/doc/developer-notes.md @@ -1,3 +1,53 @@ +# Basics + +First the basics, how to compile code in this repo. + +First you will want to clone the code locally: + +``` +git clone https://git.hush.is/hush/hush3 +cd hush3 +``` + +If you want to compile a branch other than master (the default), such as +our development tip (the `dev` branch) you can switch to it: + +``` +git checkout dev +``` + +Then install needed dependencies. This is different on each OS as well as +older or newer systems. See https://git.hush.is/hush/hush3/src/branch/dev/INSTALL.md for +details on installing dependencies. If you are using a recent-ish Linux distro, this +is probably what you need: + +``` +# install build dependencies +sudo apt-get install build-essential pkg-config libc6-dev m4 g++-multilib \ + autoconf libtool ncurses-dev unzip git zlib1g-dev wget \ + bsdmainutils automake curl unzip nano libsodium-dev cmake +``` + +Finally to compile the software you use `./build.sh` . It is quite slow +to only use a single thread, so you can use multiple threads, for example 4, +like this: + +``` +./build.sh -j4 +``` + +Each `build.sh` thread will take ~2GB of RAM so beware of that. If you have +compiled before and just made a change to C++ code, you can probably use +`make` instead and use a high number of threads. For example, if your CPU +has 8 physical cores and 16 "virtual cores" then you can use `make -j16` and +things will compile much faster. Each `make` threads takes only about 200MB of RAM. +If `make` fails in a weird way complaining about Makefiles, you probably need to +run `build.sh`, which takes care of regenerating Makefiles and installing some +additional dependencies. + +Sometimes using multiple threads the build can fail, so if it does, try again +with a different number of threads or just one thread before reporting an issue. + # Fresh sync Many times, you will want to do a "fresh sync" test, to verify code works when syncing from the genesis block, which is a different code path than a "partial sync" which means you already have part of blockchain history and are "catching up" to get in sync. From 8e2715a73453c24f35c894562f31ef92e373bf08 Mon Sep 17 00:00:00 2001 From: Duke Leto Date: Mon, 29 Mar 2021 00:43:24 -0400 Subject: [PATCH 035/108] wolfssl 4.7.0 --- depends/packages/wolfssl.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/depends/packages/wolfssl.mk b/depends/packages/wolfssl.mk index d1e9ac08c..aabca3d71 100644 --- a/depends/packages/wolfssl.mk +++ b/depends/packages/wolfssl.mk @@ -1,9 +1,9 @@ package=wolfssl -$(package)_version=4.6.0 +$(package)_version=4.7.0 $(package)_download_path=https://github.com/wolfSSL/wolfssl/archive $(package)_download_file=v$($(package)_version)-stable.tar.gz $(package)_file_name=wolfssl-$($(package)_version).tar.gz -$(package)_sha256_hash=053aefbb02d0b06b27c5e2df6875b4b587318755b7db9d6aa8d72206b310a848 +$(package)_sha256_hash=b0e740b31d4d877d540ad50cc539a8873fc41af02bd3091c4357b403f7106e31 define $(package)_set_vars $(package)_config_env=AR="$($(package)_ar)" RANLIB="$($(package)_ranlib)" CC="$($(package)_cc)" From 874c3009cfa5865ee147b2962be4dda237699203 Mon Sep 17 00:00:00 2001 From: Duke Date: Sun, 28 Jan 2024 06:30:52 -0800 Subject: [PATCH 036/108] Only Hush + DragonX connect to these nodes by default #379 --- src/hush_utils.h | 22 ++++++++++++++++------ 1 file changed, 16 insertions(+), 6 deletions(-) diff --git a/src/hush_utils.h b/src/hush_utils.h index de03f73ba..d1a037e3b 100644 --- a/src/hush_utils.h +++ b/src/hush_utils.h @@ -1795,15 +1795,24 @@ void hush_args(char *argv0) name = GetArg("-ac_name","HUSH3"); fprintf(stderr,".oO Starting %s Full Node (Extreme Privacy!) with genproc=%d notary=%d\n",name.c_str(),HUSH_MININGTHREADS, IS_HUSH_NOTARY); - vector HUSH_nodes= {"node1.hush.is","node2.hush.is","node3.hush.is", - "node4.hush.is","node5.hush.is","node6.hush.is", - "node7.hush.is","node8.hush.is","node1.hush.land", "node2.hush.land", "node3.hush.land", "node4.hush.land", "node5.hush.land"}; + vector HUSH_nodes = {}; + // Only HUSH3 and DRAGONX connect to these by default, other HACs must opt-in via -connect/-addnode + if (ishush3 || isdragonx) { + HUSH_nodes = {"node1.hush.is","node2.hush.is","node3.hush.is", + "node4.hush.is","node5.hush.is","node6.hush.is", + "node7.hush.is","node8.hush.is","node1.hush.land", + "node2.hush.land", "node3.hush.land", + "node4.hush.land", "node5.hush.land"}; + } + vector more_nodes = mapMultiArgs["-addnode"]; if (more_nodes.size() > 0) { fprintf(stderr,"%s: Adding %lu more nodes via custom -addnode arguments\n", __func__, more_nodes.size() ); } - // Add default HUSH nodes after custom addnodes - more_nodes.insert( more_nodes.end(), HUSH_nodes.begin(), HUSH_nodes.end() ); + // Add default HUSH nodes after custom addnodes, if applicable + if(HUSH_nodes.size() > 0) { + more_nodes.insert( more_nodes.end(), HUSH_nodes.begin(), HUSH_nodes.end() ); + } mapMultiArgs["-addnode"] = more_nodes; HUSH_STOPAT = GetArg("-stopat",0); @@ -1878,7 +1887,8 @@ void hush_args(char *argv0) // Set our symbol from -ac_name value strncpy(SMART_CHAIN_SYMBOL,name.c_str(),sizeof(SMART_CHAIN_SYMBOL)-1); - bool ishush3 = strncmp(SMART_CHAIN_SYMBOL, "HUSH3",5) == 0 ? true : false; + const bool ishush3 = strncmp(SMART_CHAIN_SYMBOL, "HUSH3",5) == 0 ? true : false; + const bool isdragonx = strncmp(SMART_CHAIN_SYMBOL, "DRAGONX",7) == 0 ? true : false; ASSETCHAINS_LASTERA = GetArg("-ac_eras", 1); if(ishush3) { From 5e69ed0804074b961506c5e53bd3f0667be08bd8 Mon Sep 17 00:00:00 2001 From: Duke Date: Sun, 28 Jan 2024 09:52:24 -0500 Subject: [PATCH 037/108] Fix compile and const some stuff --- src/hush_utils.h | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/hush_utils.h b/src/hush_utils.h index d1a037e3b..f9c93d16e 100644 --- a/src/hush_utils.h +++ b/src/hush_utils.h @@ -1473,7 +1473,7 @@ uint32_t hush_smartmagic(char *symbol,uint64_t supply,uint8_t *extraptr,int32_t } //TODO: why is this needed? - bool ishush3 = strncmp(symbol, "HUSH3",5) == 0 ? true : false; + const bool ishush3 = strncmp(symbol, "HUSH3",5) == 0 ? true : false; if(ishush3) { return HUSH_MAGIC; } else { @@ -1619,7 +1619,7 @@ uint64_t hush_sc_block_subsidy(int nHeight) int64_t subsidyDifference; int32_t numhalvings = 0, curEra = 0, sign = 1; static uint64_t cached_subsidy; static int32_t cached_numhalvings; static int cached_era; - bool ishush3 = strncmp(SMART_CHAIN_SYMBOL, "HUSH3",5) == 0 ? true : false; + const bool ishush3 = strncmp(SMART_CHAIN_SYMBOL, "HUSH3",5) == 0 ? true : false; // fprintf(stderr,"%s: ht=%d ishush3=%d\n", __func__, nHeight, ishush3); // check for backwards compat, older chains with no explicit rewards had 0.0001 block reward @@ -1797,6 +1797,8 @@ void hush_args(char *argv0) vector HUSH_nodes = {}; // Only HUSH3 and DRAGONX connect to these by default, other HACs must opt-in via -connect/-addnode + const bool ishush3 = strncmp(SMART_CHAIN_SYMBOL, "HUSH3",5) == 0 ? true : false; + const bool isdragonx = strncmp(SMART_CHAIN_SYMBOL, "DRAGONX",7) == 0 ? true : false; if (ishush3 || isdragonx) { HUSH_nodes = {"node1.hush.is","node2.hush.is","node3.hush.is", "node4.hush.is","node5.hush.is","node6.hush.is", @@ -1888,7 +1890,6 @@ void hush_args(char *argv0) // Set our symbol from -ac_name value strncpy(SMART_CHAIN_SYMBOL,name.c_str(),sizeof(SMART_CHAIN_SYMBOL)-1); const bool ishush3 = strncmp(SMART_CHAIN_SYMBOL, "HUSH3",5) == 0 ? true : false; - const bool isdragonx = strncmp(SMART_CHAIN_SYMBOL, "DRAGONX",7) == 0 ? true : false; ASSETCHAINS_LASTERA = GetArg("-ac_eras", 1); if(ishush3) { From 86104c4ef7d41076e271ab835559dc73a242d0c4 Mon Sep 17 00:00:00 2001 From: Duke Date: Mon, 29 Jan 2024 12:04:59 -0500 Subject: [PATCH 038/108] Remove oracles RPCs --- src/rpc/server.cpp | 12 --- src/rpc/server.h | 10 --- src/wallet/rpcwallet.cpp | 155 --------------------------------------- 3 files changed, 177 deletions(-) diff --git a/src/rpc/server.cpp b/src/rpc/server.cpp index 25d64a288..81a908521 100644 --- a/src/rpc/server.cpp +++ b/src/rpc/server.cpp @@ -417,18 +417,6 @@ static const CRPCCommand vRPCCommands[] = { "heir", "heirinfo", &heirinfo, true }, { "heir", "heirlist", &heirlist, true }, - // Oracles - { "oracles", "oraclesaddress", &oraclesaddress, true }, - { "oracles", "oracleslist", &oracleslist, true }, - { "oracles", "oraclesinfo", &oraclesinfo, true }, - { "oracles", "oraclescreate", &oraclescreate, true }, - { "oracles", "oraclesfund", &oraclesfund, true }, - { "oracles", "oraclesregister", &oraclesregister, true }, - { "oracles", "oraclessubscribe", &oraclessubscribe, true }, - { "oracles", "oraclesdata", &oraclesdata, true }, - { "oracles", "oraclessample", &oraclessample, true }, - { "oracles", "oraclessamples", &oraclessamples, true }, - { "CClib", "cclibaddress", &cclibaddress, true }, { "CClib", "cclibinfo", &cclibinfo, true }, { "CClib", "cclib", &cclib, true }, diff --git a/src/rpc/server.h b/src/rpc/server.h index 22a33fa8b..6dcbb7d21 100644 --- a/src/rpc/server.h +++ b/src/rpc/server.h @@ -245,16 +245,6 @@ extern UniValue heirclaim(const UniValue& params, bool fHelp, const CPubKey& myp extern UniValue heirinfo(const UniValue& params, bool fHelp, const CPubKey& mypk); extern UniValue heirlist(const UniValue& params, bool fHelp, const CPubKey& mypk); extern UniValue channelsaddress(const UniValue& params, bool fHelp, const CPubKey& mypk); -extern UniValue oraclesaddress(const UniValue& params, bool fHelp, const CPubKey& mypk); -extern UniValue oracleslist(const UniValue& params, bool fHelp, const CPubKey& mypk); -extern UniValue oraclesinfo(const UniValue& params, bool fHelp, const CPubKey& mypk); -extern UniValue oraclescreate(const UniValue& params, bool fHelp, const CPubKey& mypk); -extern UniValue oraclesfund(const UniValue& params, bool fHelp, const CPubKey& mypk); -extern UniValue oraclesregister(const UniValue& params, bool fHelp, const CPubKey& mypk); -extern UniValue oraclessubscribe(const UniValue& params, bool fHelp, const CPubKey& mypk); -extern UniValue oraclesdata(const UniValue& params, bool fHelp, const CPubKey& mypk); -extern UniValue oraclessample(const UniValue& params, bool fHelp, const CPubKey& mypk); -extern UniValue oraclessamples(const UniValue& params, bool fHelp, const CPubKey& mypk); extern UniValue cclibaddress(const UniValue& params, bool fHelp, const CPubKey& mypk); extern UniValue cclibinfo(const UniValue& params, bool fHelp, const CPubKey& mypk); diff --git a/src/wallet/rpcwallet.cpp b/src/wallet/rpcwallet.cpp index bf7bee794..80acb22b1 100644 --- a/src/wallet/rpcwallet.cpp +++ b/src/wallet/rpcwallet.cpp @@ -6327,19 +6327,6 @@ UniValue cclib(const UniValue& params, bool fHelp, const CPubKey& mypk) return(CClib(cp,method,jsonstr)); } -UniValue oraclesaddress(const UniValue& params, bool fHelp, const CPubKey& mypk) -{ - struct CCcontract_info *cp,C; std::vector pubkey; - cp = CCinit(&C,EVAL_ORACLES); - if ( fHelp || params.size() > 1 ) - throw runtime_error("oraclesaddress [pubkey]\n"); - if ( ensure_CCrequirements(cp->evalcode) < 0 ) - throw runtime_error(CC_REQUIREMENTS_MSG); - if ( params.size() == 1 ) - pubkey = ParseHex(params[0].get_str().c_str()); - return(CCaddress(cp,(char *)"Oracles",pubkey)); -} - UniValue heiraddress(const UniValue& params, bool fHelp, const CPubKey& mypk) { struct CCcontract_info *cp,C; std::vector pubkey; @@ -6406,148 +6393,6 @@ UniValue assetsaddress(const UniValue& params, bool fHelp, const CPubKey& mypk) return(CCaddress(cp, (char *)"Assets", pubkey)); } -UniValue oracleslist(const UniValue& params, bool fHelp, const CPubKey& mypk) -{ - if ( fHelp || params.size() > 0 ) - throw runtime_error("oracleslist\n"); - if ( ensure_CCrequirements(EVAL_ORACLES) < 0 ) - throw runtime_error(CC_REQUIREMENTS_MSG); - return(OraclesList()); -} - -UniValue oraclesinfo(const UniValue& params, bool fHelp, const CPubKey& mypk) -{ - uint256 txid; - if ( fHelp || params.size() != 1 ) - throw runtime_error("oraclesinfo oracletxid\n"); - if ( ensure_CCrequirements(EVAL_ORACLES) < 0 ) - throw runtime_error(CC_REQUIREMENTS_MSG); - txid = Parseuint256((char *)params[0].get_str().c_str()); - return(OracleInfo(txid)); -} - -UniValue oraclesfund(const UniValue& params, bool fHelp, const CPubKey& mypk) -{ - UniValue result(UniValue::VOBJ); uint256 txid; - if ( fHelp || params.size() != 1 ) - throw runtime_error("oraclesfund oracletxid\n"); - if ( ensure_CCrequirements(EVAL_ORACLES) < 0 ) - throw runtime_error(CC_REQUIREMENTS_MSG); - Lock2NSPV(mypk); - txid = Parseuint256((char *)params[0].get_str().c_str()); - result = OracleFund(mypk,0,txid); - if ( result[JSON_HEXTX].getValStr().size() > 0 ) - { - result.push_back(Pair("result", "success")); - } - Unlock2NSPV(mypk); - return(result); -} - -UniValue oraclesregister(const UniValue& params, bool fHelp, const CPubKey& mypk) -{ - UniValue result(UniValue::VOBJ); uint256 txid; int64_t datafee; - if ( fHelp || params.size() != 2 ) - throw runtime_error("oraclesregister oracletxid datafee\n"); - if ( ensure_CCrequirements(EVAL_ORACLES) < 0 ) - throw runtime_error(CC_REQUIREMENTS_MSG); - Lock2NSPV(mypk); - txid = Parseuint256((char *)params[0].get_str().c_str()); - if ( (datafee= atol((char *)params[1].get_str().c_str())) == 0 ) - datafee = atof((char *)params[1].get_str().c_str()) * COIN + 0.00000000499999; - result = OracleRegister(mypk,0,txid,datafee); - if ( result[JSON_HEXTX].getValStr().size() > 0 ) - { - result.push_back(Pair("result", "success")); - } - Unlock2NSPV(mypk); - return(result); -} - -UniValue oraclessubscribe(const UniValue& params, bool fHelp, const CPubKey& mypk) -{ - UniValue result(UniValue::VOBJ); uint256 txid; int64_t amount; std::vector pubkey; - if ( fHelp || params.size() != 3 ) - throw runtime_error("oraclessubscribe oracletxid publisher amount\n"); - if ( ensure_CCrequirements(EVAL_ORACLES) < 0 ) - throw runtime_error(CC_REQUIREMENTS_MSG); - Lock2NSPV(mypk); - txid = Parseuint256((char *)params[0].get_str().c_str()); - pubkey = ParseHex(params[1].get_str().c_str()); - amount = atof((char *)params[2].get_str().c_str()) * COIN + 0.00000000499999; - result = OracleSubscribe(mypk,0,txid,pubkey2pk(pubkey),amount); - if ( result[JSON_HEXTX].getValStr().size() > 0 ) - { - result.push_back(Pair("result", "success")); - } - Unlock2NSPV(mypk); - return(result); -} - -UniValue oraclessample(const UniValue& params, bool fHelp, const CPubKey& mypk) -{ - UniValue result(UniValue::VOBJ); uint256 oracletxid,txid; int32_t num; char *batonaddr; - if ( fHelp || params.size() != 2 ) - throw runtime_error("oraclessample oracletxid txid\n"); - if ( ensure_CCrequirements(EVAL_ORACLES) < 0 ) - throw runtime_error(CC_REQUIREMENTS_MSG); - oracletxid = Parseuint256((char *)params[0].get_str().c_str()); - txid = Parseuint256((char *)params[1].get_str().c_str()); - return(OracleDataSample(oracletxid,txid)); -} - -UniValue oraclessamples(const UniValue& params, bool fHelp, const CPubKey& mypk) -{ - UniValue result(UniValue::VOBJ); uint256 txid; int32_t num; char *batonaddr; - if ( fHelp || params.size() != 3 ) - throw runtime_error("oraclessamples oracletxid batonaddress num\n"); - if ( ensure_CCrequirements(EVAL_ORACLES) < 0 ) - throw runtime_error(CC_REQUIREMENTS_MSG); - txid = Parseuint256((char *)params[0].get_str().c_str()); - batonaddr = (char *)params[1].get_str().c_str(); - num = atoi((char *)params[2].get_str().c_str()); - return(OracleDataSamples(txid,batonaddr,num)); -} - -UniValue oraclesdata(const UniValue& params, bool fHelp, const CPubKey& mypk) -{ - UniValue result(UniValue::VOBJ); uint256 txid; std::vector data; - if ( fHelp || params.size() != 2 ) - throw runtime_error("oraclesdata oracletxid hexstr\n"); - if ( ensure_CCrequirements(EVAL_ORACLES) < 0 ) - throw runtime_error(CC_REQUIREMENTS_MSG); - Lock2NSPV(mypk); - txid = Parseuint256((char *)params[0].get_str().c_str()); - data = ParseHex(params[1].get_str().c_str()); - result = OracleData(mypk,0,txid,data); - if ( result[JSON_HEXTX].getValStr().size() > 0 ) - { - result.push_back(Pair("result", "success")); - } - Unlock2NSPV(mypk); - return(result); -} - -UniValue oraclescreate(const UniValue& params, bool fHelp, const CPubKey& mypk) -{ - UniValue result(UniValue::VOBJ); std::string name,description,format; - if ( fHelp || params.size() != 3 ) - throw runtime_error("oraclescreate name description format\n"); - if ( ensure_CCrequirements(EVAL_ORACLES) < 0 ) - throw runtime_error(CC_REQUIREMENTS_MSG); - Lock2NSPV(mypk); - name = params[0].get_str(); - description = params[1].get_str(); - format = params[2].get_str(); - result = OracleCreate(mypk,0,name,description,format); - if ( result[JSON_HEXTX].getValStr().size() > 0 ) - { - result.push_back(Pair("result", "success")); - } - Unlock2NSPV(mypk); - return(result); -} - UniValue FSMcreate(const UniValue& params, bool fHelp, const CPubKey& mypk) { UniValue result(UniValue::VOBJ); std::string name,states,hex; From bb8a3c57a490fbfd71233c50c3dc80872cc961aa Mon Sep 17 00:00:00 2001 From: Duke Date: Tue, 30 Jan 2024 10:48:21 -0500 Subject: [PATCH 039/108] Delete auction/faucet/heir CC rpcs #381 --- src/rpc/server.cpp | 20 --- src/rpc/server.h | 11 -- src/wallet/rpcwallet.cpp | 275 --------------------------------------- 3 files changed, 306 deletions(-) diff --git a/src/rpc/server.cpp b/src/rpc/server.cpp index 81a908521..ee1826cdd 100644 --- a/src/rpc/server.cpp +++ b/src/rpc/server.cpp @@ -376,9 +376,6 @@ static const CRPCCommand vRPCCommands[] = { "rawtransactions", "fundrawtransaction", &fundrawtransaction, false }, #endif - // auction - { "auction", "auctionaddress", &auctionaddress, true }, - // fsm { "FSM", "FSMaddress", &FSMaddress, true }, { "FSM", "FSMcreate", &FSMcreate, true }, @@ -400,23 +397,6 @@ static const CRPCCommand vRPCCommands[] = { "nSPV", "nspv_logout", &nspv_logout, true }, { "nSPV", "nspv_listccmoduleunspent", &nspv_listccmoduleunspent, true }, - // faucet - { "faucet", "faucetinfo", &faucetinfo, true }, - { "faucet", "faucetfund", &faucetfund, true }, - { "faucet", "faucetget", &faucetget, true }, - { "faucet", "faucetaddress", &faucetaddress, true }, - - // Heir - { "heir", "heiraddress", &heiraddress, true }, - { "heir", "heirfund", &heirfund, true }, - { "heir", "heiradd", &heiradd, true }, - { "heir", "heirclaim", &heirclaim, true }, -/* { "heir", "heirfundtokens", &heirfundtokens, true }, - { "heir", "heiraddtokens", &heiraddtokens, true }, - { "heir", "heirclaimtokens", &heirclaimtokens, true },*/ - { "heir", "heirinfo", &heirinfo, true }, - { "heir", "heirlist", &heirlist, true }, - { "CClib", "cclibaddress", &cclibaddress, true }, { "CClib", "cclibinfo", &cclibinfo, true }, { "CClib", "cclib", &cclib, true }, diff --git a/src/rpc/server.h b/src/rpc/server.h index 6dcbb7d21..766957e9f 100644 --- a/src/rpc/server.h +++ b/src/rpc/server.h @@ -238,12 +238,6 @@ extern UniValue estimatefee(const UniValue& params, bool fHelp, const CPubKey& m extern UniValue estimatepriority(const UniValue& params, bool fHelp, const CPubKey& mypk); extern UniValue coinsupply(const UniValue& params, bool fHelp, const CPubKey& mypk); extern UniValue assetsaddress(const UniValue& params, bool fHelp, const CPubKey& mypk); -extern UniValue heiraddress(const UniValue& params, bool fHelp, const CPubKey& mypk); -extern UniValue heirfund(const UniValue& params, bool fHelp, const CPubKey& mypk); -extern UniValue heiradd(const UniValue& params, bool fHelp, const CPubKey& mypk); -extern UniValue heirclaim(const UniValue& params, bool fHelp, const CPubKey& mypk); -extern UniValue heirinfo(const UniValue& params, bool fHelp, const CPubKey& mypk); -extern UniValue heirlist(const UniValue& params, bool fHelp, const CPubKey& mypk); extern UniValue channelsaddress(const UniValue& params, bool fHelp, const CPubKey& mypk); extern UniValue cclibaddress(const UniValue& params, bool fHelp, const CPubKey& mypk); @@ -255,15 +249,10 @@ extern UniValue channelsopen(const UniValue& params, bool fHelp, const CPubKey& extern UniValue channelspayment(const UniValue& params, bool fHelp, const CPubKey& mypk); extern UniValue channelsclose(const UniValue& params, bool fHelp, const CPubKey& mypk); extern UniValue channelsrefund(const UniValue& params, bool fHelp, const CPubKey& mypk); -extern UniValue faucetfund(const UniValue& params, bool fHelp, const CPubKey& mypk); -extern UniValue faucetget(const UniValue& params, bool fHelp, const CPubKey& mypk); -extern UniValue faucetaddress(const UniValue& params, bool fHelp, const CPubKey& mypk); -extern UniValue faucetinfo(const UniValue& params, bool fHelp, const CPubKey& mypk); extern UniValue FSMaddress(const UniValue& params, bool fHelp, const CPubKey& mypk); extern UniValue FSMcreate(const UniValue& params, bool fHelp, const CPubKey& mypk); extern UniValue FSMlist(const UniValue& params, bool fHelp, const CPubKey& mypk); extern UniValue FSMinfo(const UniValue& params, bool fHelp, const CPubKey& mypk); -extern UniValue auctionaddress(const UniValue& params, bool fHelp, const CPubKey& mypk); extern UniValue getnewaddress(const UniValue& params, bool fHelp, const CPubKey& mypk); // in rpcwallet.cpp //extern UniValue getnewaddress64(const UniValue& params, bool fHelp, const CPubKey& mypk); // in rpcwallet.cpp diff --git a/src/wallet/rpcwallet.cpp b/src/wallet/rpcwallet.cpp index 80acb22b1..ede7fb87e 100644 --- a/src/wallet/rpcwallet.cpp +++ b/src/wallet/rpcwallet.cpp @@ -6092,13 +6092,8 @@ int32_t hush_notaryvin(CMutableTransaction &txNew,uint8_t *notarypub33, void *pT return(siglen); } -#include "../cc/CCfaucet.h" #include "../cc/CCassets.h" #include "../cc/CCfsm.h" -#include "../cc/CCauction.h" -#include "../cc/CCOracles.h" -#include "../cc/CCPrices.h" -#include "../cc/CCHeir.h" int32_t ensure_CCrequirements(uint8_t evalcode) { CCerror = ""; @@ -6327,18 +6322,6 @@ UniValue cclib(const UniValue& params, bool fHelp, const CPubKey& mypk) return(CClib(cp,method,jsonstr)); } -UniValue heiraddress(const UniValue& params, bool fHelp, const CPubKey& mypk) -{ - struct CCcontract_info *cp,C; std::vector pubkey; - cp = CCinit(&C,EVAL_HEIR); - if ( fHelp || params.size() > 1 ) - throw runtime_error("heiraddress pubkey\n"); - if ( ensure_CCrequirements(cp->evalcode) < 0 ) - throw runtime_error(CC_REQUIREMENTS_MSG); - pubkey = ParseHex(params[0].get_str().c_str()); - return(CCaddress(cp,(char *)"Heir",pubkey)); -} - UniValue FSMaddress(const UniValue& params, bool fHelp, const CPubKey& mypk) { struct CCcontract_info *cp,C; std::vector pubkey; @@ -6352,34 +6335,6 @@ UniValue FSMaddress(const UniValue& params, bool fHelp, const CPubKey& mypk) return(CCaddress(cp,(char *)"FSM",pubkey)); } -UniValue auctionaddress(const UniValue& params, bool fHelp, const CPubKey& mypk) -{ - struct CCcontract_info *cp,C; std::vector pubkey; - cp = CCinit(&C,EVAL_AUCTION); - if ( fHelp || params.size() > 1 ) - throw runtime_error("auctionaddress [pubkey]\n"); - if ( ensure_CCrequirements(cp->evalcode) < 0 ) - throw runtime_error(CC_REQUIREMENTS_MSG); - if ( params.size() == 1 ) - pubkey = ParseHex(params[0].get_str().c_str()); - return(CCaddress(cp,(char *)"Auction",pubkey)); -} - -UniValue faucetaddress(const UniValue& params, bool fHelp, const CPubKey& mypk) -{ - struct CCcontract_info *cp,C; std::vector pubkey; - int error; - cp = CCinit(&C,EVAL_FAUCET); - if ( fHelp || params.size() > 1 ) - throw runtime_error("faucetaddress [pubkey]\n"); - error = ensure_CCrequirements(cp->evalcode); - if ( error < 0 ) - throw runtime_error(strprintf("to use CC contracts, you need to launch daemon with valid -pubkey= for an address in your wallet. ERR=%d\n", error)); - if ( params.size() == 1 ) - pubkey = ParseHex(params[0].get_str().c_str()); - return(CCaddress(cp,(char *)"Faucet",pubkey)); -} - UniValue assetsaddress(const UniValue& params, bool fHelp, const CPubKey& mypk) { struct CCcontract_info *cp, C; std::vector pubkey; @@ -6434,98 +6389,6 @@ UniValue FSMinfo(const UniValue& params, bool fHelp, const CPubKey& mypk) return(FSMInfo(FSMtxid)); } -UniValue faucetinfo(const UniValue& params, bool fHelp, const CPubKey& mypk) -{ - uint256 fundingtxid; - if ( fHelp || params.size() != 0 ) - throw runtime_error("faucetinfo\n"); - if ( ensure_CCrequirements(EVAL_FAUCET) < 0 ) - throw runtime_error(CC_REQUIREMENTS_MSG); - return(FaucetInfo()); -} - -UniValue faucetfund(const UniValue& params, bool fHelp, const CPubKey& mypk) -{ - UniValue result(UniValue::VOBJ); int64_t funds; std::string hex; - if ( fHelp || params.size() != 1 ) - throw runtime_error("faucetfund amount\n"); - funds = atof(params[0].get_str().c_str()) * COIN + 0.00000000499999; - if ( (0) && HUSH_NSPV_SUPERLITE ) - { - char coinaddr[64]; struct CCcontract_info *cp,C; CTxOut v; - cp = CCinit(&C,EVAL_FAUCET); - v = MakeCC1vout(EVAL_FAUCET,funds,GetUnspendable(cp,0)); - Getscriptaddress(coinaddr,CScript() << ParseHex(HexStr(pubkey2pk(Mypubkey()))) << OP_CHECKSIG); - return(NSPV_spend(coinaddr,(char *)HexStr(v.scriptPubKey.begin()+1,v.scriptPubKey.end()-1).c_str(),funds)); - } - if ( ensure_CCrequirements(EVAL_FAUCET) < 0 ) - throw runtime_error(CC_REQUIREMENTS_MSG); - - //const CKeyStore& keystore = *pwalletMain; - //LOCK2(cs_main, pwalletMain->cs_wallet); - - bool lockWallet = false; - if (!mypk.IsValid()) // if mypk is not set then it is a local call, use local wallet in AddNormalInputs - lockWallet = true; - - if (funds > 0) - { - if (lockWallet) - { - ENTER_CRITICAL_SECTION(cs_main); - ENTER_CRITICAL_SECTION(pwalletMain->cs_wallet); - } - result = FaucetFund(mypk, 0,(uint64_t) funds); - if (lockWallet) - { - LEAVE_CRITICAL_SECTION(pwalletMain->cs_wallet); - LEAVE_CRITICAL_SECTION(cs_main); - } - - if ( result[JSON_HEXTX].getValStr().size() > 0 ) - { - result.push_back(Pair("result", "success")); - //result.push_back(Pair("hex", hex)); - } else ERR_RESULT("couldnt create faucet funding transaction"); - } else ERR_RESULT( "funding amount must be positive"); - return(result); -} - -UniValue faucetget(const UniValue& params, bool fHelp, const CPubKey& mypk) -{ - UniValue result(UniValue::VOBJ); std::string hex; - if ( fHelp || params.size() !=0 ) - throw runtime_error("faucetget\n"); - if ( ensure_CCrequirements(EVAL_FAUCET) < 0 ) - throw runtime_error(CC_REQUIREMENTS_MSG); - - bool lockWallet = false; - if (!mypk.IsValid()) // if mypk is not set then it is a local call, use wallet in AddNormalInputs (see check for this there) - lockWallet = true; - - //const CKeyStore& keystore = *pwalletMain; - //LOCK2(cs_main, pwalletMain->cs_wallet); - - if (lockWallet) - { - // use this instead LOCK2 because we need conditional wallet lock - ENTER_CRITICAL_SECTION(cs_main); - ENTER_CRITICAL_SECTION(pwalletMain->cs_wallet); - } - result = FaucetGet(mypk, 0); - if (lockWallet) - { - LEAVE_CRITICAL_SECTION(pwalletMain->cs_wallet); - LEAVE_CRITICAL_SECTION(cs_main); - } - - if (result[JSON_HEXTX].getValStr().size() > 0 ) { - result.push_back(Pair("result", "success")); - //result.push_back(Pair("hex", hex)); - } else ERR_RESULT("couldnt create faucet get transaction"); - return(result); -} - UniValue getbalance64(const UniValue& params, bool fHelp, const CPubKey& mypk) { set setAddress; vector vecOutputs; @@ -6569,144 +6432,6 @@ UniValue getbalance64(const UniValue& params, bool fHelp, const CPubKey& mypk) } -// heir contract functions for coins and tokens -UniValue heirfund(const UniValue& params, bool fHelp, const CPubKey& mypk) -{ - UniValue result(UniValue::VOBJ); - uint256 tokenid = zeroid; - int64_t amount; - int64_t inactivitytime; - std::string hex; - std::vector pubkey; - std::string name, memo; - - if (!EnsureWalletIsAvailable(fHelp)) - return NullUniValue; - - if (fHelp || params.size() != 5 && params.size() != 6) - throw runtime_error("heirfund funds heirname heirpubkey inactivitytime memo [tokenid]\n"); - if (ensure_CCrequirements(EVAL_HEIR) < 0) - throw runtime_error(CC_REQUIREMENTS_MSG); - - const CKeyStore& keystore = *pwalletMain; - LOCK2(cs_main, pwalletMain->cs_wallet); - - if (params.size() == 6) // tokens in satoshis: - amount = atoll(params[0].get_str().c_str()); - else { // coins: - amount = 0; - if (!ParseFixedPoint(params[0].get_str(), 8, &amount)) // using ParseFixedPoint instead atof to avoid small round errors - amount = -1; // set error - } - if (amount <= 0) { - result.push_back(Pair("result", "error")); - result.push_back(Pair("error", "incorrect amount")); - return result; - } - - name = params[1].get_str(); - - pubkey = ParseHex(params[2].get_str().c_str()); - if (!pubkey2pk(pubkey).IsValid()) { - result.push_back(Pair("result", "error")); - result.push_back(Pair("error", "incorrect pubkey")); - return result; - } - - inactivitytime = atoll(params[3].get_str().c_str()); - if (inactivitytime <= 0) { - result.push_back(Pair("result", "error")); - result.push_back(Pair("error", "incorrect inactivity time")); - return result; - } - - memo = params[4].get_str(); - - if (params.size() == 6) { - tokenid = Parseuint256((char*)params[5].get_str().c_str()); - if (tokenid == zeroid) { - result.push_back(Pair("result", "error")); - result.push_back(Pair("error", "incorrect tokenid")); - return result; - } - } - - if( tokenid == zeroid ) - result = HeirFundCoinCaller(0, amount, name, pubkey2pk(pubkey), inactivitytime, memo); - else - result = HeirFundTokenCaller(0, amount, name, pubkey2pk(pubkey), inactivitytime, memo, tokenid); - - return result; -} - -UniValue heiradd(const UniValue& params, bool fHelp, const CPubKey& mypk) -{ - UniValue result; - uint256 fundingtxid; - int64_t amount; - int64_t inactivitytime; - std::string hex; - std::vector pubkey; - std::string name; - - if (!EnsureWalletIsAvailable(fHelp)) - return NullUniValue; - - if (fHelp || params.size() != 2) - throw runtime_error("heiradd funds fundingtxid\n"); - if (ensure_CCrequirements(EVAL_HEIR) < 0) - throw runtime_error(CC_REQUIREMENTS_MSG); - - const CKeyStore& keystore = *pwalletMain; - LOCK2(cs_main, pwalletMain->cs_wallet); - - std::string strAmount = params[0].get_str(); - fundingtxid = Parseuint256((char*)params[1].get_str().c_str()); - - result = HeirAddCaller(fundingtxid, 0, strAmount); - return result; -} - -UniValue heirclaim(const UniValue& params, bool fHelp, const CPubKey& mypk) -{ - UniValue result; uint256 fundingtxid; - - if (!EnsureWalletIsAvailable(fHelp)) - return NullUniValue; - if (fHelp || params.size() != 2) - throw runtime_error("heirclaim funds fundingtxid\n"); - if (ensure_CCrequirements(EVAL_HEIR) < 0) - throw runtime_error(CC_REQUIREMENTS_MSG); - - const CKeyStore& keystore = *pwalletMain; - LOCK2(cs_main, pwalletMain->cs_wallet); - - std::string strAmount = params[0].get_str(); - fundingtxid = Parseuint256((char*)params[1].get_str().c_str()); - result = HeirClaimCaller(fundingtxid, 0, strAmount); - return result; -} - -UniValue heirinfo(const UniValue& params, bool fHelp, const CPubKey& mypk) -{ - uint256 fundingtxid; - if (fHelp || params.size() != 1) - throw runtime_error("heirinfo fundingtxid\n"); - if ( ensure_CCrequirements(EVAL_HEIR) < 0 ) - throw runtime_error(CC_REQUIREMENTS_MSG); - fundingtxid = Parseuint256((char*)params[0].get_str().c_str()); - return (HeirInfo(fundingtxid)); -} - -UniValue heirlist(const UniValue& params, bool fHelp, const CPubKey& mypk) -{ - if (fHelp || params.size() != 0) - throw runtime_error("heirlist\n"); - if ( ensure_CCrequirements(EVAL_HEIR) < 0 ) - throw runtime_error(CC_REQUIREMENTS_MSG); - return (HeirList()); -} - extern UniValue dumpprivkey(const UniValue& params, bool fHelp, const CPubKey& mypk); // in rpcdump.cpp extern UniValue convertpassphrase(const UniValue& params, bool fHelp, const CPubKey& mypk); extern UniValue importprivkey(const UniValue& params, bool fHelp, const CPubKey& mypk); From 9e0ac062fa1db5ba6d11349cac3289be3c804bd6 Mon Sep 17 00:00:00 2001 From: Duke Date: Tue, 30 Jan 2024 11:23:35 -0500 Subject: [PATCH 040/108] Delete a lot of CC stuff #381 --- src/Makefile.am | 7 - src/cc/CCcustom.cpp | 24 +- src/cc/CCutils.cpp | 40 -- src/cc/assets.cpp | 26 - src/cc/auction.cpp | 213 ------- src/cc/betprotocol.cpp | 305 --------- src/cc/faucet.cpp | 253 -------- src/cc/fsm.cpp | 192 ------ src/cc/heir.cpp | 1293 -------------------------------------- src/cc/oracles.cpp | 1233 ------------------------------------ src/rpc/server.cpp | 12 +- src/rpc/server.h | 10 - src/wallet/rpcwallet.cpp | 233 +------ 13 files changed, 16 insertions(+), 3825 deletions(-) delete mode 100644 src/cc/assets.cpp delete mode 100644 src/cc/auction.cpp delete mode 100644 src/cc/betprotocol.cpp delete mode 100644 src/cc/faucet.cpp delete mode 100644 src/cc/fsm.cpp delete mode 100644 src/cc/heir.cpp delete mode 100644 src/cc/oracles.cpp diff --git a/src/Makefile.am b/src/Makefile.am index 2e890ebd7..97ae53ae1 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -276,13 +276,6 @@ libbitcoin_server_a_SOURCES = \ cc/CCcustom.cpp \ cc/CCtx.cpp \ cc/CCutils.cpp \ - cc/assets.cpp \ - cc/faucet.cpp \ - cc/fsm.cpp \ - cc/heir.cpp \ - cc/oracles.cpp \ - cc/auction.cpp \ - cc/betprotocol.cpp \ chain.cpp \ checkpoints.cpp \ fs.cpp \ diff --git a/src/cc/CCcustom.cpp b/src/cc/CCcustom.cpp index 28e15b148..1e9653609 100644 --- a/src/cc/CCcustom.cpp +++ b/src/cc/CCcustom.cpp @@ -295,16 +295,16 @@ struct CCcontract_info *CCinit(struct CCcontract_info *cp, uint8_t evalcode) strcpy(cp->normaladdr,AssetsNormaladdr); strcpy(cp->CChexstr,AssetsCChexstr); memcpy(cp->CCpriv,AssetsCCpriv,32); - cp->validate = AssetsValidate; - cp->ismyvin = IsAssetsInput; + //cp->validate = AssetsValidate; + //cp->ismyvin = IsAssetsInput; break; case EVAL_FAUCET: strcpy(cp->unspendableCCaddr,FaucetCCaddr); strcpy(cp->normaladdr,FaucetNormaladdr); strcpy(cp->CChexstr,FaucetCChexstr); memcpy(cp->CCpriv,FaucetCCpriv,32); - cp->validate = FaucetValidate; - cp->ismyvin = IsFaucetInput; + //cp->validate = FaucetValidate; + //cp->ismyvin = IsFaucetInput; break; case EVAL_REWARDS: strcpy(cp->unspendableCCaddr,RewardsCCaddr); @@ -335,24 +335,24 @@ struct CCcontract_info *CCinit(struct CCcontract_info *cp, uint8_t evalcode) strcpy(cp->normaladdr,FSMNormaladdr); strcpy(cp->CChexstr,FSMCChexstr); memcpy(cp->CCpriv,FSMCCpriv,32); - cp->validate = FSMValidate; - cp->ismyvin = IsFSMInput; + //cp->validate = FSMValidate; + //cp->ismyvin = IsFSMInput; break; case EVAL_AUCTION: strcpy(cp->unspendableCCaddr,AuctionCCaddr); strcpy(cp->normaladdr,AuctionNormaladdr); strcpy(cp->CChexstr,AuctionCChexstr); memcpy(cp->CCpriv,AuctionCCpriv,32); - cp->validate = AuctionValidate; - cp->ismyvin = IsAuctionInput; + //cp->validate = AuctionValidate; + //cp->ismyvin = IsAuctionInput; break; case EVAL_HEIR: strcpy(cp->unspendableCCaddr,HeirCCaddr); strcpy(cp->normaladdr,HeirNormaladdr); strcpy(cp->CChexstr,HeirCChexstr); memcpy(cp->CCpriv,HeirCCpriv,32); - cp->validate = HeirValidate; - cp->ismyvin = IsHeirInput; + //cp->validate = HeirValidate; + //cp->ismyvin = IsHeirInput; break; case EVAL_CHANNELS: strcpy(cp->unspendableCCaddr,ChannelsCCaddr); @@ -367,8 +367,8 @@ struct CCcontract_info *CCinit(struct CCcontract_info *cp, uint8_t evalcode) strcpy(cp->normaladdr,OraclesNormaladdr); strcpy(cp->CChexstr,OraclesCChexstr); memcpy(cp->CCpriv,OraclesCCpriv,32); - cp->validate = OraclesValidate; - cp->ismyvin = IsOraclesInput; + //cp->validate = OraclesValidate; + //cp->ismyvin = IsOraclesInput; break; case EVAL_PRICES: strcpy(cp->unspendableCCaddr,PricesCCaddr); diff --git a/src/cc/CCutils.cpp b/src/cc/CCutils.cpp index d4a8aa6d8..0a320c461 100644 --- a/src/cc/CCutils.cpp +++ b/src/cc/CCutils.cpp @@ -546,46 +546,6 @@ int64_t CCduration(int32_t &numblocks,uint256 txid) return(duration); } -uint256 CCOraclesReverseScan(char const *logcategory,uint256 &txid,int32_t height,uint256 reforacletxid,uint256 batontxid) -{ - CTransaction tx; uint256 hash,mhash,bhash,hashBlock,oracletxid; int32_t len,len2,numvouts; - int64_t val,merkleht; CPubKey pk; std::vectordata; char str[65],str2[65]; - - txid = zeroid; - LogPrint(logcategory,"start reverse scan %s\n",uint256_str(str,batontxid)); - while ( myGetTransaction(batontxid,tx,hashBlock) != 0 && (numvouts= tx.vout.size()) > 0 ) - { - LogPrint(logcategory,"check %s\n",uint256_str(str,batontxid)); - if ( DecodeOraclesData(tx.vout[numvouts-1].scriptPubKey,oracletxid,bhash,pk,data) == 'D' && oracletxid == reforacletxid ) - { - LogPrint(logcategory,"decoded %s\n",uint256_str(str,batontxid)); - if ( oracle_format(&hash,&merkleht,0,'I',(uint8_t *)data.data(),0,(int32_t)data.size()) == sizeof(int32_t) && merkleht == height ) - { - len = oracle_format(&hash,&val,0,'h',(uint8_t *)data.data(),sizeof(int32_t),(int32_t)data.size()); - len2 = oracle_format(&mhash,&val,0,'h',(uint8_t *)data.data(),(int32_t)(sizeof(int32_t)+sizeof(uint256)),(int32_t)data.size()); - - LogPrint(logcategory,"found merkleht.%d len.%d len2.%d %s %s\n",(int32_t)merkleht,len,len2,uint256_str(str,hash),uint256_str(str2,mhash)); - if ( len == sizeof(hash)+sizeof(int32_t) && len2 == 2*sizeof(mhash)+sizeof(int32_t) && mhash != zeroid ) - { - txid = batontxid; - LogPrint(logcategory,"set txid\n"); - return(mhash); - } - else - { - LogPrint(logcategory,"missing hash\n"); - return(zeroid); - } - } - else LogPrint(logcategory,"height.%d vs search ht.%d\n",(int32_t)merkleht,(int32_t)height); - batontxid = bhash; - LogPrint(logcategory,"new hash %s\n",uint256_str(str,batontxid)); - } else break; - } - LogPrint(logcategory,"end of loop\n"); - return(zeroid); -} - int32_t NSPV_coinaddr_inmempool(char const *logcategory,char *coinaddr,uint8_t CCflag); int32_t myIs_coinaddr_inmempoolvout(char const *logcategory,char *coinaddr) diff --git a/src/cc/assets.cpp b/src/cc/assets.cpp deleted file mode 100644 index 32e3482d3..000000000 --- a/src/cc/assets.cpp +++ /dev/null @@ -1,26 +0,0 @@ -// Copyright (c) 2016-2023 The Hush developers -// Distributed under the GPLv3 software license, see the accompanying -// file COPYING or https://www.gnu.org/licenses/gpl-3.0.en.html -/****************************************************************************** - * Copyright © 2014-2019 The SuperNET Developers. * - * * - * See the AUTHORS, DEVELOPER-AGREEMENT and LICENSE files at * - * the top-level directory of this distribution for the individual copyright * - * holder information and the developer policies on copyright and licensing. * - * * - * Unless otherwise agreed in a custom licensing agreement, no part of the * - * SuperNET software, including this file may be copied, modified, propagated * - * or distributed except according to the terms contained in the LICENSE file * - * * - * Removal or modification of this copyright notice is prohibited. * - * * - ******************************************************************************/ - -#include "CCassets.h" -#include "CCtokens.h" - -// tx validation -bool AssetsValidate(struct CCcontract_info *cpAssets,Eval* eval,const CTransaction &tx, uint32_t nIn) -{ - return false; -} diff --git a/src/cc/auction.cpp b/src/cc/auction.cpp deleted file mode 100644 index ad4ac8f56..000000000 --- a/src/cc/auction.cpp +++ /dev/null @@ -1,213 +0,0 @@ -// Copyright (c) 2016-2023 The Hush developers -// Distributed under the GPLv3 software license, see the accompanying -// file COPYING or https://www.gnu.org/licenses/gpl-3.0.en.html -/****************************************************************************** - * Copyright © 2014-2019 The SuperNET Developers. * - * * - * See the AUTHORS, DEVELOPER-AGREEMENT and LICENSE files at * - * the top-level directory of this distribution for the individual copyright * - * holder information and the developer policies on copyright and licensing. * - * * - * Unless otherwise agreed in a custom licensing agreement, no part of the * - * SuperNET software, including this file may be copied, modified, propagated * - * or distributed except according to the terms contained in the LICENSE file * - * * - * Removal or modification of this copyright notice is prohibited. * - * * - ******************************************************************************/ - -#include "CCauction.h" -#include "../txmempool.h" - -/* -*/ - -// start of consensus code - -int64_t IsAuctionvout(struct CCcontract_info *cp,const CTransaction& tx,int32_t v) -{ - char destaddr[64]; - if ( tx.vout[v].scriptPubKey.IsPayToCryptoCondition() != 0 ) - { - if ( Getscriptaddress(destaddr,tx.vout[v].scriptPubKey) > 0 && strcmp(destaddr,cp->unspendableCCaddr) == 0 ) - return(tx.vout[v].nValue); - } - return(0); -} - -bool AuctionExactAmounts(struct CCcontract_info *cp,Eval* eval,const CTransaction &tx,int32_t minage,uint64_t txfee) -{ - static uint256 zerohash; - CTransaction vinTx; uint256 hashBlock,activehash; int32_t i,numvins,numvouts; int64_t inputs=0,outputs=0,assetoshis; - numvins = tx.vin.size(); - numvouts = tx.vout.size(); - for (i=0; iismyvin)(tx.vin[i].scriptSig) != 0 ) - { - //fprintf(stderr,"vini.%d check mempool\n",i); - if ( eval->GetTxUnconfirmed(tx.vin[i].prevout.hash,vinTx,hashBlock) == 0 ) - return eval->Invalid("cant find vinTx"); - else - { - //fprintf(stderr,"vini.%d check hash and vout\n",i); - if ( hashBlock == zerohash ) - return eval->Invalid("cant Auction from mempool"); - if ( (assetoshis= IsAuctionvout(cp,vinTx,tx.vin[i].prevout.n)) != 0 ) - inputs += assetoshis; - } - } - } - for (i=0; iInvalid("mismatched inputs != outputs + COIN + txfee"); - } - else return(true); -} - -bool AuctionValidate(struct CCcontract_info *cp,Eval* eval,const CTransaction &tx, uint32_t nIn) -{ - int32_t numvins,numvouts,preventCCvins,preventCCvouts,i; bool retval; - return eval->Invalid("no validation yet"); - numvins = tx.vin.size(); - numvouts = tx.vout.size(); - preventCCvins = preventCCvouts = -1; - if ( numvouts < 1 ) - return eval->Invalid("no vouts"); - else - { - //fprintf(stderr,"check vins\n"); - for (i=0; iInvalid("illegal normal vini"); - } - } - //fprintf(stderr,"check amounts\n"); - if ( AuctionExactAmounts(cp,eval,tx,1,10000) == false ) - { - fprintf(stderr,"Auctionget invalid amount\n"); - return false; - } - else - { - preventCCvouts = 1; - if ( IsAuctionvout(cp,tx,0) != 0 ) - { - preventCCvouts++; - i = 1; - } else i = 0; - if ( tx.vout[i].nValue != COIN ) - return eval->Invalid("invalid Auction output"); - retval = PreventCC(eval,tx,preventCCvins,numvins,preventCCvouts,numvouts); - if ( retval != 0 ) - fprintf(stderr,"Auctionget validated\n"); - else fprintf(stderr,"Auctionget invalid\n"); - return(retval); - } - } -} -// end of consensus code - -// helper functions for rpc calls in rpcwallet.cpp - -int64_t AddAuctionInputs(struct CCcontract_info *cp,CMutableTransaction &mtx,CPubKey pk,int64_t total,int32_t maxinputs) -{ - // add threshold check - char coinaddr[64]; int64_t nValue,price,totalinputs = 0; uint256 txid,hashBlock; std::vector origpubkey; CTransaction vintx; int32_t n = 0; - std::vector > unspentOutputs; - GetCCaddress(cp,coinaddr,pk); - SetCCunspents(unspentOutputs,coinaddr,true); - for (std::vector >::const_iterator it=unspentOutputs.begin(); it!=unspentOutputs.end(); it++) - { - txid = it->first.txhash; - // prevent dup - if ( it->second.satoshis < 1000000 ) - continue; - if ( myGetTransaction(txid,vintx,hashBlock) != 0 ) - { - if ( (nValue= IsAuctionvout(cp,vintx,(int32_t)it->first.index)) > 0 ) - { - if ( total != 0 && maxinputs != 0 ) - mtx.vin.push_back(CTxIn(txid,(int32_t)it->first.index,CScript())); - nValue = it->second.satoshis; - totalinputs += nValue; - n++; - if ( (total > 0 && totalinputs >= total) || (maxinputs > 0 && n >= maxinputs) ) - break; - } - } - } - return(totalinputs); -} - -std::string AuctionBid(uint64_t txfee,uint256 itemhash,int64_t amount) -{ - CMutableTransaction mtx = CreateNewContextualCMutableTransaction(Params().GetConsensus(), hush_nextheight()); - CPubKey mypk,Auctionpk; CScript opret; int64_t inputs,CCchange=0,nValue=COIN; struct CCcontract_info *cp,C; - cp = CCinit(&C,EVAL_AUCTION); - if ( txfee == 0 ) - txfee = 10000; - Auctionpk = GetUnspendable(cp,0); - mypk = pubkey2pk(Mypubkey()); - if ( (inputs= AddAuctionInputs(cp,mtx,Auctionpk,nValue+txfee,60)) > 0 ) - { - if ( inputs > nValue ) - CCchange = (inputs - nValue - txfee); - if ( CCchange != 0 ) - mtx.vout.push_back(MakeCC1vout(EVAL_AUCTION,CCchange,Auctionpk)); - mtx.vout.push_back(CTxOut(nValue,CScript() << ParseHex(HexStr(mypk)) << OP_CHECKSIG)); - return(FinalizeCCTx(-1LL,cp,mtx,mypk,txfee,opret)); - } else fprintf(stderr,"cant find Auction inputs\n"); - return(""); -} - -std::string AuctionDeliver(uint64_t txfee,uint256 itemhash,uint256 bidtxid) -{ - CMutableTransaction mtx = CreateNewContextualCMutableTransaction(Params().GetConsensus(), hush_nextheight()); - CPubKey mypk,Auctionpk; CScript opret; int64_t inputs,CCchange=0,nValue=COIN; struct CCcontract_info *cp,C; - cp = CCinit(&C,EVAL_AUCTION); - if ( txfee == 0 ) - txfee = 10000; - Auctionpk = GetUnspendable(cp,0); - mypk = pubkey2pk(Mypubkey()); - if ( (inputs= AddAuctionInputs(cp,mtx,Auctionpk,nValue+txfee,60)) > 0 ) - { - if ( inputs > nValue ) - CCchange = (inputs - nValue - txfee); - if ( CCchange != 0 ) - mtx.vout.push_back(MakeCC1vout(EVAL_AUCTION,CCchange,Auctionpk)); - mtx.vout.push_back(CTxOut(nValue,CScript() << ParseHex(HexStr(mypk)) << OP_CHECKSIG)); - return(FinalizeCCTx(-1LL,cp,mtx,mypk,txfee,opret)); - } else fprintf(stderr,"cant find Auction inputs\n"); - return(""); -} - -std::string AuctionPost(uint64_t txfee,uint256 itemhash,int64_t minbid,char *title,char *description) -{ - CMutableTransaction mtx = CreateNewContextualCMutableTransaction(Params().GetConsensus(), hush_nextheight()); - CPubKey mypk,Auctionpk; int64_t funds = 0; CScript opret; struct CCcontract_info *cp,C; - cp = CCinit(&C,EVAL_AUCTION); - if ( txfee == 0 ) - txfee = 10000; - mypk = pubkey2pk(Mypubkey()); - Auctionpk = GetUnspendable(cp,0); - if ( AddNormalinputs(mtx,mypk,txfee,64) > 0 ) - { - mtx.vout.push_back(MakeCC1vout(EVAL_AUCTION,funds,Auctionpk)); - return(FinalizeCCTx(0,cp,mtx,mypk,txfee,opret)); - } - return(""); -} - - diff --git a/src/cc/betprotocol.cpp b/src/cc/betprotocol.cpp deleted file mode 100644 index fc6b98dc3..000000000 --- a/src/cc/betprotocol.cpp +++ /dev/null @@ -1,305 +0,0 @@ -// Copyright (c) 2016-2023 The Hush developers -// Distributed under the GPLv3 software license, see the accompanying -// file COPYING or https://www.gnu.org/licenses/gpl-3.0.en.html -/****************************************************************************** - * Copyright © 2014-2019 The SuperNET Developers. * - * * - * See the AUTHORS, DEVELOPER-AGREEMENT and LICENSE files at * - * the top-level directory of this distribution for the individual copyright * - * holder information and the developer policies on copyright and licensing. * - * * - * Unless otherwise agreed in a custom licensing agreement, no part of the * - * SuperNET software, including this file may be copied, modified, propagated * - * or distributed except according to the terms contained in the LICENSE file * - * * - * Removal or modification of this copyright notice is prohibited. * - * * - ******************************************************************************/ - -#include - -#include "hash.h" -#include "main.h" -#include "chain.h" -#include "streams.h" -#include "script/cc.h" -#include "cc/betprotocol.h" -#include "cc/eval.h" -#include "cc/utils.h" -#include "primitives/transaction.h" - -int32_t hush_nextheight(); - -std::vector BetProtocol::PlayerConditions() -{ - std::vector subs; - for (int i=0; i result(vmResultHash.begin(), vmResultHash.begin()+32); - mtx.vout.push_back(CTxOut(0, CScript() << OP_RETURN << result)); - return mtx; -} - - -CMutableTransaction BetProtocol::MakePostEvidenceTx(uint256 signedSessionTxHash, - int playerIdx, std::vector state) -{ - CMutableTransaction mtx = CreateNewContextualCMutableTransaction(Params().GetConsensus(), hush_nextheight()); - - mtx.vin.push_back(CTxIn(signedSessionTxHash, playerIdx+1, CScript())); - mtx.vout.push_back(CTxOut(0, CScript() << OP_RETURN << state)); - - return mtx; -} - - -CC* BetProtocol::MakePayoutCond(uint256 signedSessionTxHash) -{ - // TODO: 2/3 majority - CC* agree = CCNewThreshold(players.size(), PlayerConditions()); - - CC *import; - { - CC *importEval = CCNewEval(E_MARSHAL( - ss << EVAL_IMPORTPAYOUT << signedSessionTxHash; - )); - - CC *oneof = CCNewThreshold(1, PlayerConditions()); - - import = CCNewThreshold(2, {oneof, importEval}); - } - - return CCNewThreshold(1, {agree, import}); -} - - -CMutableTransaction BetProtocol::MakeStakeTx(CAmount totalPayout, uint256 signedSessionTxHash) -{ - CMutableTransaction mtx = CreateNewContextualCMutableTransaction(Params().GetConsensus(), hush_nextheight()); - - CC *payoutCond = MakePayoutCond(signedSessionTxHash); - mtx.vout.push_back(CTxOut(totalPayout, CCPubKey(payoutCond))); - cc_free(payoutCond); - - return mtx; -} - - -CMutableTransaction BetProtocol::MakeAgreePayoutTx(std::vector payouts, - uint256 signedStakeTxHash) -{ - CMutableTransaction mtx = CreateNewContextualCMutableTransaction(Params().GetConsensus(), hush_nextheight()); - mtx.vin.push_back(CTxIn(signedStakeTxHash, 0, CScript())); - mtx.vout = payouts; - return mtx; -} - - -CMutableTransaction BetProtocol::MakeImportPayoutTx(std::vector payouts, - CTransaction signedDisputeTx, uint256 signedStakeTxHash, MoMProof momProof) -{ - CMutableTransaction mtx = CreateNewContextualCMutableTransaction(Params().GetConsensus(), hush_nextheight()); - mtx.vin.push_back(CTxIn(signedStakeTxHash, 0, CScript())); - mtx.vout = payouts; - CScript proofData; - proofData << OP_RETURN << E_MARSHAL(ss << momProof << signedDisputeTx); - mtx.vout.insert(mtx.vout.begin(), CTxOut(0, proofData)); - return mtx; -} - - -bool GetOpReturnHash(CScript script, uint256 &hash) -{ - std::vector vHash; - GetOpReturnData(script, vHash); - if (vHash.size() != 32) return false; - hash = uint256(vHash); - return true; -} - - -/* - * Crypto-Condition EVAL method that verifies a payout against a transaction - * notarized on another chain. - * - * IN: params - condition params - * IN: importTx - Payout transaction on value chain (HUSH) - * IN: nIn - index of input of stake - * - * importTx: Spends stakeTx with payouts from asset chain - * - * in 0: Spends Stake TX and contains ImportPayout CC - * out 0: OP_RETURN MomProof, disputeTx - * out 1-: arbitrary payouts - * - * disputeTx: Spends sessionTx.0 (opener on asset chain) - * - * in 0: spends sessionTx.0 - * in 1-: anything - * out 0: OP_RETURN hash of payouts - * out 1-: anything - */ -bool Eval::ImportPayout(const std::vector params, const CTransaction &importTx, unsigned int nIn) -{ - if (importTx.vout.size() == 0) return Invalid("no-vouts"); - - // load data from vout[0] - MoMProof proof; - CTransaction disputeTx; - { - std::vector vopret; - GetOpReturnData(importTx.vout[0].scriptPubKey, vopret); - if (!E_UNMARSHAL(vopret, ss >> proof; ss >> disputeTx)) - return Invalid("invalid-payload"); - } - - // Check disputeTx.0 shows correct payouts - { - uint256 givenPayoutsHash; - GetOpReturnHash(disputeTx.vout[0].scriptPubKey, givenPayoutsHash); - std::vector payouts(importTx.vout.begin() + 1, importTx.vout.end()); - if (givenPayoutsHash != SerializeHash(payouts)) - return Invalid("wrong-payouts"); - } - - // Check disputeTx spends sessionTx.0 - // condition ImportPayout params is session ID from other chain - { - uint256 sessionHash; - if (!E_UNMARSHAL(params, ss >> sessionHash)) - return Invalid("malformed-params"); - if (disputeTx.vin[0].prevout != COutPoint(sessionHash, 0)) - return Invalid("wrong-session"); - } - - // Check disputeTx solves momproof from vout[0] - { - NotarizationData data(0); - if (!GetNotarizationData(proof.notarizationHash, data)) - return Invalid("coudnt-load-mom"); - - if (data.MoM != proof.branch.Exec(disputeTx.GetHash())) - return Invalid("mom-check-fail"); - } - - return Valid(); -} - - -/* - * Crypto-Condition EVAL method that resolves a dispute of a session - * - * IN: vm - AppVM virtual machine to verify states - * IN: params - condition params - * IN: disputeTx - transaction attempting to resolve dispute - * IN: nIn - index of input of dispute tx - * - * disputeTx: attempt to resolve a dispute - * - * in 0: Spends Session TX first output, reveals DisputeHeader - * out 0: OP_RETURN hash of payouts - */ -bool Eval::DisputePayout(AppVM &vm, std::vector params, const CTransaction &disputeTx, unsigned int nIn) -{ - if (disputeTx.vout.size() == 0) return Invalid("no-vouts"); - - // get payouts hash - uint256 payoutHash; - if (!GetOpReturnHash(disputeTx.vout[0].scriptPubKey, payoutHash)) - return Invalid("invalid-payout-hash"); - - // load params - uint16_t waitBlocks; - std::vector vmParams; - if (!E_UNMARSHAL(params, ss >> VARINT(waitBlocks); ss >> vmParams)) - return Invalid("malformed-params"); - - // ensure that enough time has passed - { - CTransaction sessionTx; - CBlockIndex sessionBlock; - - // if unconformed its too soon - if (!GetTxConfirmed(disputeTx.vin[0].prevout.hash, sessionTx, sessionBlock)) - return Error("couldnt-get-parent"); - - if (GetCurrentHeight() < sessionBlock.GetHeight() + waitBlocks) - return Invalid("dispute-too-soon"); // Not yet - } - - // get spends - std::vector spends; - if (!GetSpendsConfirmed(disputeTx.vin[0].prevout.hash, spends)) - return Error("couldnt-get-spends"); - - // verify result from VM - int maxLength = -1; - uint256 bestPayout; - for (int i=1; i vmState; - if (spends[i].vout.size() == 0) continue; - if (!GetOpReturnData(spends[i].vout[0].scriptPubKey, vmState)) continue; - auto out = vm.evaluate(vmParams, vmState); - uint256 resultHash = SerializeHash(out.second); - if (out.first > maxLength) { - maxLength = out.first; - bestPayout = resultHash; - } - // The below means that if for any reason there is a draw, the first dispute wins - else if (out.first == maxLength) { - if (bestPayout != payoutHash) { - fprintf(stderr, "WARNING: VM has multiple solutions of same length\n"); - bestPayout = resultHash; - } - } - } - - if (maxLength == -1) return Invalid("no-evidence"); - - return bestPayout == payoutHash ? Valid() : Invalid("wrong-payout"); -} diff --git a/src/cc/faucet.cpp b/src/cc/faucet.cpp deleted file mode 100644 index 8142fc472..000000000 --- a/src/cc/faucet.cpp +++ /dev/null @@ -1,253 +0,0 @@ -// Copyright (c) 2016-2023 The Hush developers -// Distributed under the GPLv3 software license, see the accompanying -// file COPYING or https://www.gnu.org/licenses/gpl-3.0.en.html -/****************************************************************************** - * Copyright © 2014-2019 The SuperNET Developers. * - * * - * See the AUTHORS, DEVELOPER-AGREEMENT and LICENSE files at * - * the top-level directory of this distribution for the individual copyright * - * holder information and the developer policies on copyright and licensing. * - * * - * Unless otherwise agreed in a custom licensing agreement, no part of the * - * SuperNET software, including this file may be copied, modified, propagated * - * or distributed except according to the terms contained in the LICENSE file * - * * - * Removal or modification of this copyright notice is prohibited. * - * * - ******************************************************************************/ - -#include "CCfaucet.h" -#include "../txmempool.h" - -/* - This file implements a simple CC faucet as an example of how to make a new CC contract. It wont have any fancy sybil protection but will serve the purpose of a fully automated faucet. - - In order to implement a faucet, we need to have it funded. Once it is funded, anybody should be able to get some reasonable small amount. - - This leads to needing to lock the funding in a CC protected output. And to put a spending limit. We can do a per transaction spending limit quite easily with vout constraints. However, that would allow anybody to issue thousands of transactions per block, so we also need to add a rate limiter. - - To implement this, we can simply make any faucet vout fund the faucet. Then we can limit the number of confirmed utxo by combining faucet outputs and then only using utxo which are confirmed. This combined with a vout size limit will drastically limit the funds that can be withdrawn from the faucet. -*/ - -// start of consensus code - -int64_t IsFaucetvout(struct CCcontract_info *cp,const CTransaction& tx,int32_t v) -{ - char destaddr[64]; - if ( tx.vout[v].scriptPubKey.IsPayToCryptoCondition() != 0 ) - { - if ( Getscriptaddress(destaddr,tx.vout[v].scriptPubKey) > 0 && strcmp(destaddr,cp->unspendableCCaddr) == 0 ) - return(tx.vout[v].nValue); - //else fprintf(stderr,"dest.%s vs (%s)\n",destaddr,cp->unspendableCCaddr); - } - return(0); -} - -bool FaucetExactAmounts(struct CCcontract_info *cp,Eval* eval,const CTransaction &tx,int32_t minage,uint64_t txfee) -{ - static uint256 zerohash; - CTransaction vinTx; uint256 hashBlock,activehash; int32_t i,numvins,numvouts; int64_t inputs=0,outputs=0,assetoshis; - numvins = tx.vin.size(); - numvouts = tx.vout.size(); - for (i=0; iismyvin)(tx.vin[i].scriptSig) != 0 ) - { - //fprintf(stderr,"vini.%d check mempool\n",i); - if ( eval->GetTxUnconfirmed(tx.vin[i].prevout.hash,vinTx,hashBlock) == 0 ) - return eval->Invalid("cant find vinTx"); - else - { - //fprintf(stderr,"vini.%d check hash and vout\n",i); - if ( hashBlock == zerohash ) - return eval->Invalid("cant faucet from mempool"); - if ( (assetoshis= IsFaucetvout(cp,vinTx,tx.vin[i].prevout.n)) != 0 ) - inputs += assetoshis; - } - } - } - for (i=0; iInvalid("mismatched inputs != outputs + FAUCETSIZE + txfee"); - } - else return(true); -} - -bool FaucetValidate(struct CCcontract_info *cp,Eval* eval,const CTransaction &tx, uint32_t nIn) -{ - int32_t numvins,numvouts,preventCCvins,preventCCvouts,i,numblocks; bool retval; uint256 txid; uint8_t hash[32]; char str[65],destaddr[64]; - std::vector > txids; - numvins = tx.vin.size(); - numvouts = tx.vout.size(); - preventCCvins = preventCCvouts = -1; - if ( numvouts < 1 ) - return eval->Invalid("no vouts"); - else - { - for (i=0; iInvalid("illegal normal vini"); - } - } - //fprintf(stderr,"check amounts\n"); - if ( FaucetExactAmounts(cp,eval,tx,1,10000) == false ) - { - fprintf(stderr,"faucetget invalid amount\n"); - return false; - } - else - { - preventCCvouts = 1; - if ( IsFaucetvout(cp,tx,0) != 0 ) - { - preventCCvouts++; - i = 1; - } else i = 0; - txid = tx.GetHash(); - memcpy(hash,&txid,sizeof(hash)); - fprintf(stderr,"check faucetget txid %s %02x/%02x\n",uint256_str(str,txid),hash[0],hash[31]); - if ( tx.vout[i].nValue != FAUCETSIZE ) - return eval->Invalid("invalid faucet output"); - else if ( (hash[0] & 0xff) != 0 || (hash[31] & 0xff) != 0 ) - return eval->Invalid("invalid faucetget txid"); - Getscriptaddress(destaddr,tx.vout[i].scriptPubKey); - SetCCtxids(txids,destaddr,tx.vout[i].scriptPubKey.IsPayToCryptoCondition()); - for (std::vector >::const_iterator it=txids.begin(); it!=txids.end(); it++) - { - //int height = it->first.blockHeight; - if ( CCduration(numblocks,it->first.txhash) > 0 && numblocks > 3 ) - { - return eval->Invalid("faucet is only for brand new addresses"); - } - //fprintf(stderr,"txid %s numblocks.%d ago\n",uint256_str(str,it->first.txhash),numblocks); - } - retval = PreventCC(eval,tx,preventCCvins,numvins,preventCCvouts,numvouts); - if ( retval != 0 ) - fprintf(stderr,"faucetget validated\n"); - else fprintf(stderr,"faucetget invalid\n"); - return(retval); - } - } -} -// end of consensus code - -// helper functions for rpc calls in rpcwallet.cpp - -int64_t AddFaucetInputs(struct CCcontract_info *cp,CMutableTransaction &mtx,CPubKey pk,int64_t total,int32_t maxinputs) -{ - char coinaddr[64]; int64_t threshold,nValue,price,totalinputs = 0; uint256 txid,hashBlock; std::vector origpubkey; CTransaction vintx; int32_t vout,n = 0; - std::vector > unspentOutputs; - GetCCaddress(cp,coinaddr,pk); - SetCCunspents(unspentOutputs,coinaddr,true); - if ( maxinputs > CC_MAXVINS ) - maxinputs = CC_MAXVINS; - if ( maxinputs > 0 ) - threshold = total/maxinputs; - else threshold = total; - for (std::vector >::const_iterator it=unspentOutputs.begin(); it!=unspentOutputs.end(); it++) - { - txid = it->first.txhash; - vout = (int32_t)it->first.index; - if ( it->second.satoshis < threshold ) - continue; - //char str[65]; fprintf(stderr,"check %s/v%d %.8f`\n",uint256_str(str,txid),vout,(double)it->second.satoshis/COIN); - // no need to prevent dup - if ( myGetTransaction(txid,vintx,hashBlock) != 0 ) - { - if ( (nValue= IsFaucetvout(cp,vintx,vout)) > 1000000 && myIsutxo_spentinmempool(ignoretxid,ignorevin,txid,vout) == 0 ) - { - if ( total != 0 && maxinputs != 0 ) - mtx.vin.push_back(CTxIn(txid,vout,CScript())); - nValue = it->second.satoshis; - totalinputs += nValue; - n++; - if ( (total > 0 && totalinputs >= total) || (maxinputs > 0 && n >= maxinputs) ) - break; - } else fprintf(stderr,"vout.%d nValue %.8f too small or already spent in mempool\n",vout,(double)nValue/COIN); - } else fprintf(stderr,"couldn't get tx\n"); - } - return(totalinputs); -} - -UniValue FaucetGet(const CPubKey& pk, uint64_t txfee) -{ - CMutableTransaction tmpmtx,mtx = CreateNewContextualCMutableTransaction(Params().GetConsensus(), hush_nextheight()); - CPubKey faucetpk; int64_t inputs,CCchange=0,nValue=FAUCETSIZE; struct CCcontract_info *cp,C; std::string rawhex; uint32_t j; int32_t i,len; uint8_t buf[32768]; bits256 hash; - cp = CCinit(&C,EVAL_FAUCET); - if ( txfee == 0 ) - txfee = 10000; - faucetpk = GetUnspendable(cp,0); - CPubKey mypk = pk.IsValid()?pk:pubkey2pk(Mypubkey()); - if ( (inputs= AddFaucetInputs(cp,mtx,faucetpk,nValue+txfee,60)) > 0 ) - { - if ( inputs > nValue ) - CCchange = (inputs - nValue - txfee); - if ( CCchange != 0 ) - mtx.vout.push_back(MakeCC1vout(EVAL_FAUCET,CCchange,faucetpk)); - mtx.vout.push_back(CTxOut(nValue,CScript() << ParseHex(HexStr(mypk)) << OP_CHECKSIG)); - fprintf(stderr,"start at %u\n",(uint32_t)time(NULL)); - j = rand() & 0xfffffff; - for (i=0; i<1000000; i++,j++) - { - tmpmtx = mtx; - UniValue result = FinalizeCCTxExt(pk.IsValid (),-1LL,cp,tmpmtx,mypk,txfee,CScript() << OP_RETURN << E_MARSHAL(ss << (uint8_t)EVAL_FAUCET << (uint8_t)'G' << j)); - if ( (len= (int32_t)result[JSON_HEXTX].getValStr().size()) > 0 && len < 65536 ) - { - len >>= 1; - decode_hex(buf,len,(char *)result[JSON_HEXTX].getValStr().c_str()); - hash = bits256_doublesha256(0,buf,len); - if ( (hash.bytes[0] & 0xff) == 0 && (hash.bytes[31] & 0xff) == 0 ) - { - fprintf(stderr,"found valid txid after %d iterations %u\n",i,(uint32_t)time(NULL)); - return result; - } - //fprintf(stderr,"%02x%02x ",hash.bytes[0],hash.bytes[31]); - } - } - CCERR_RESULT("faucet",CCLOG_ERROR, stream << "couldn't generate valid txid " << (uint32_t)time(NULL)); - } else CCERR_RESULT("faucet",CCLOG_ERROR, stream << "can't find faucet inputs"); -} - -UniValue FaucetFund(const CPubKey& pk, uint64_t txfee,int64_t funds) -{ - CMutableTransaction mtx = CreateNewContextualCMutableTransaction(Params().GetConsensus(), hush_nextheight()); - CPubKey faucetpk; CScript opret; struct CCcontract_info *cp,C; - - cp = CCinit(&C,EVAL_FAUCET); - if ( txfee == 0 ) - txfee = 10000; - CPubKey mypk = pk.IsValid()?pk:pubkey2pk(Mypubkey()); - faucetpk = GetUnspendable(cp,0); - if ( AddNormalinputs(mtx,mypk,funds+txfee,64,pk.IsValid()) > 0 ) - { - mtx.vout.push_back(MakeCC1vout(EVAL_FAUCET,funds,faucetpk)); - return(FinalizeCCTxExt(pk.IsValid(),0,cp,mtx,mypk,txfee,opret)); - } - CCERR_RESULT("faucet",CCLOG_ERROR, stream << "can't find normal inputs"); -} - -UniValue FaucetInfo() -{ - UniValue result(UniValue::VOBJ); char numstr[64]; - CMutableTransaction mtx = CreateNewContextualCMutableTransaction(Params().GetConsensus(), hush_nextheight()); - CPubKey faucetpk; struct CCcontract_info *cp,C; int64_t funding; - result.push_back(Pair("result","success")); - result.push_back(Pair("name","Faucet")); - cp = CCinit(&C,EVAL_FAUCET); - faucetpk = GetUnspendable(cp,0); - funding = AddFaucetInputs(cp,mtx,faucetpk,0,0); - sprintf(numstr,"%.8f",(double)funding/COIN); - result.push_back(Pair("funding",numstr)); - return(result); -} diff --git a/src/cc/fsm.cpp b/src/cc/fsm.cpp deleted file mode 100644 index d2998a388..000000000 --- a/src/cc/fsm.cpp +++ /dev/null @@ -1,192 +0,0 @@ -// Copyright (c) 2016-2023 The Hush developers -// Distributed under the GPLv3 software license, see the accompanying -// file COPYING or https://www.gnu.org/licenses/gpl-3.0.en.html -/****************************************************************************** - * Copyright © 2014-2019 The SuperNET Developers. * - * * - * See the AUTHORS, DEVELOPER-AGREEMENT and LICENSE files at * - * the top-level directory of this distribution for the individual copyright * - * holder information and the developer policies on copyright and licensing. * - * * - * Unless otherwise agreed in a custom licensing agreement, no part of the * - * SuperNET software, including this file may be copied, modified, propagated * - * or distributed except according to the terms contained in the LICENSE file * - * * - * Removal or modification of this copyright notice is prohibited. * - * * - ******************************************************************************/ - -#include "CCfsm.h" -#include "../txmempool.h" - -/* - FSM CC is a highlevel CC contract that mostly uses other CC contracts. A finite state machine is defined, which combines triggers, payments and whatever other events/actions into a state machine - -*/ - -// start of consensus code - -int64_t IsFSMvout(struct CCcontract_info *cp,const CTransaction& tx,int32_t v) -{ - char destaddr[64]; - if ( tx.vout[v].scriptPubKey.IsPayToCryptoCondition() != 0 ) - { - if ( Getscriptaddress(destaddr,tx.vout[v].scriptPubKey) > 0 && strcmp(destaddr,cp->unspendableCCaddr) == 0 ) - return(tx.vout[v].nValue); - } - return(0); -} - -bool FSMExactAmounts(struct CCcontract_info *cp,Eval* eval,const CTransaction &tx,int32_t minage,uint64_t txfee) -{ - static uint256 zerohash; - CTransaction vinTx; uint256 hashBlock,activehash; int32_t i,numvins,numvouts; int64_t inputs=0,outputs=0,assetoshis; - numvins = tx.vin.size(); - numvouts = tx.vout.size(); - for (i=0; iismyvin)(tx.vin[i].scriptSig) != 0 ) - { - //fprintf(stderr,"vini.%d check mempool\n",i); - if ( eval->GetTxUnconfirmed(tx.vin[i].prevout.hash,vinTx,hashBlock) == 0 ) - return eval->Invalid("cant find vinTx"); - else - { - //fprintf(stderr,"vini.%d check hash and vout\n",i); - if ( hashBlock == zerohash ) - return eval->Invalid("cant FSM from mempool"); - if ( (assetoshis= IsFSMvout(cp,vinTx,tx.vin[i].prevout.n)) != 0 ) - inputs += assetoshis; - } - } - } - for (i=0; iInvalid("mismatched inputs != outputs + COIN + txfee"); - } - else return(true); -} - -bool FSMValidate(struct CCcontract_info *cp,Eval* eval,const CTransaction &tx, uint32_t nIn) -{ - int32_t numvins,numvouts,preventCCvins,preventCCvouts,i; bool retval; - return eval->Invalid("no validation yet"); - numvins = tx.vin.size(); - numvouts = tx.vout.size(); - preventCCvins = preventCCvouts = -1; - if ( numvouts < 1 ) - return eval->Invalid("no vouts"); - else - { - //fprintf(stderr,"check vins\n"); - for (i=0; iInvalid("illegal normal vini"); - } - } - //fprintf(stderr,"check amounts\n"); - if ( FSMExactAmounts(cp,eval,tx,1,10000) == false ) - { - fprintf(stderr,"fsmget invalid amount\n"); - return false; - } - else - { - preventCCvouts = 1; - if ( IsFSMvout(cp,tx,0) != 0 ) - { - preventCCvouts++; - i = 1; - } else i = 0; - if ( tx.vout[i].nValue != COIN ) - return eval->Invalid("invalid fsm output"); - retval = PreventCC(eval,tx,preventCCvins,numvins,preventCCvouts,numvouts); - if ( retval != 0 ) - fprintf(stderr,"fsmget validated\n"); - else fprintf(stderr,"fsmget invalid\n"); - return(retval); - } - } -} -// end of consensus code - -// helper functions for rpc calls in rpcwallet.cpp - -int64_t AddFSMInputs(struct CCcontract_info *cp,CMutableTransaction &mtx,CPubKey pk,int64_t total,int32_t maxinputs) -{ - // add threshold check - char coinaddr[64]; int64_t nValue,price,totalinputs = 0; uint256 txid,hashBlock; std::vector origpubkey; CTransaction vintx; int32_t n = 0; - std::vector > unspentOutputs; - GetCCaddress(cp,coinaddr,pk); - SetCCunspents(unspentOutputs,coinaddr,true); - for (std::vector >::const_iterator it=unspentOutputs.begin(); it!=unspentOutputs.end(); it++) - { - txid = it->first.txhash; - // prevent dup - if ( it->second.satoshis < 1000000 ) - continue; - if ( myGetTransaction(txid,vintx,hashBlock) != 0 ) - { - if ( (nValue= IsFSMvout(cp,vintx,(int32_t)it->first.index)) > 0 ) - { - if ( total != 0 && maxinputs != 0 ) - mtx.vin.push_back(CTxIn(txid,(int32_t)it->first.index,CScript())); - nValue = it->second.satoshis; - totalinputs += nValue; - n++; - if ( (total > 0 && totalinputs >= total) || (maxinputs > 0 && n >= maxinputs) ) - break; - } - } - } - return(totalinputs); -} - -std::string FSMList() -{ - return(""); -} - -std::string FSMCreate(uint64_t txfee,std::string name,std::string states) -{ - CMutableTransaction mtx = CreateNewContextualCMutableTransaction(Params().GetConsensus(), hush_nextheight()); - CPubKey mypk,fsmpk; CScript opret; int64_t inputs,CCchange=0,nValue=COIN; struct CCcontract_info *cp,C; - cp = CCinit(&C,EVAL_FSM); - if ( txfee == 0 ) - txfee = 10000; - fsmpk = GetUnspendable(cp,0); - mypk = pubkey2pk(Mypubkey()); - if ( (inputs= AddFSMInputs(cp,mtx,fsmpk,nValue+txfee,60)) > 0 ) - { - if ( inputs > nValue ) - CCchange = (inputs - nValue - txfee); - if ( CCchange != 0 ) - mtx.vout.push_back(MakeCC1vout(EVAL_FSM,CCchange,fsmpk)); - mtx.vout.push_back(CTxOut(nValue,CScript() << ParseHex(HexStr(mypk)) << OP_CHECKSIG)); - return(FinalizeCCTx(-1LL,cp,mtx,mypk,txfee,opret)); - } else fprintf(stderr,"cant find fsm inputs\n"); - return(""); -} - -std::string FSMInfo(uint256 fsmtxid) -{ - CMutableTransaction mtx = CreateNewContextualCMutableTransaction(Params().GetConsensus(), hush_nextheight()); - CPubKey mypk,fsmpk; int64_t funds = 0; CScript opret; struct CCcontract_info *cp,C; - cp = CCinit(&C,EVAL_FSM); - mypk = pubkey2pk(Mypubkey()); - fsmpk = GetUnspendable(cp,0); - return(""); -} - - diff --git a/src/cc/heir.cpp b/src/cc/heir.cpp deleted file mode 100644 index 859d28656..000000000 --- a/src/cc/heir.cpp +++ /dev/null @@ -1,1293 +0,0 @@ -// Copyright (c) 2016-2023 The Hush developers -// Distributed under the GPLv3 software license, see the accompanying -// file COPYING or https://www.gnu.org/licenses/gpl-3.0.en.html -/****************************************************************************** - * Copyright © 2014-2019 The SuperNET Developers. * - * * - * See the AUTHORS, DEVELOPER-AGREEMENT and LICENSE files at * - * the top-level directory of this distribution for the individual copyright * - * holder information and the developer policies on copyright and licensing. * - * * - * Unless otherwise agreed in a custom licensing agreement, no part of the * - * SuperNET software, including this file may be copied, modified, propagated * - * or distributed except according to the terms contained in the LICENSE file * - * * - * Removal or modification of this copyright notice is prohibited. * - * * - ******************************************************************************/ - -#include "CCHeir.h" -#include "heir_validate.h" -#include - -class CoinHelper; -class TokenHelper; - -/* - The idea of Heir CC is to allow crypto inheritance. - A special 1of2 CC address is created that is freely spendable by the creator (funds owner). - The owner may add additional funds to this 1of2 address. - The heir is only allowed to spend after "the specified amount of idle blocks" (changed to "the owner inactivityTime"). - The idea is that if the address doesnt spend any funds for a year (or whatever amount set), then it is time to allow the heir to spend. - "The design requires the heir to spend all the funds at once" (this requirement was changed to "after the inactivity time both the heir and owner may freely spend available funds") - After the first heir spending a flag is set that spending is allowed for the heir whether the owner adds more funds or spends them. - This Heir contract supports both coins and tokens. - */ - -// tx validation code - -// Plan validation runner, it may be called twice - for coins and tokens -// (sadly we cannot have yet 'templatized' lambdas, if we could we could capture all these params inside HeirValidation()...) -template bool RunValidationPlans(uint8_t funcId, struct CCcontract_info* cp, Eval* eval, const CTransaction& tx, uint256 latestTxid, CScript fundingOpretScript, uint8_t hasHeirSpendingBegun) -{ - int32_t numvins = tx.vin.size(); - int32_t numvouts = tx.vout.size(); - - // setup validation framework (please see its description in heir_validate.h): - // validation 'plans': - CInputValidationPlan vinPlan; - COutputValidationPlan voutPlan; - - // vin 'identifiers' - CNormalInputIdentifier normalInputIdentifier(cp); - CCCInputIdentifier ccInputIdentifier(cp); - - // vin and vout 'validators' - // not used, too strict for 2 pubkeys: CMyPubkeyVoutValidator normalInputValidator(cp, fundingOpretScript, true); // check normal input for this opret cause this is first tx - CCC1of2AddressValidator cc1of2ValidatorThis(cp, fundingOpretScript, "checking this tx opreturn:"); // 1of2add validator with pubkeys from this tx opreturn - CHeirSpendValidator heirSpendValidator(cp, fundingOpretScript, latestTxid, hasHeirSpendingBegun); // check if heir allowed to spend - - // only for tokens: - CMyPubkeyVoutValidator ownerCCaddrValidator(cp, fundingOpretScript, false); // check if this correct owner's cc user addr corresponding to opret - COpRetValidator opRetValidator(cp, fundingOpretScript); // compare opRets in this and last tx - CMarkerValidator markerValidator(cp); // initial tx marker spending protection - CNullValidator nullValidator(cp); - - switch (funcId) { - case 'F': // fund tokens (only for tokens) - // vin validation plan: - vinPlan.pushValidators((CInputIdentifierBase*)&normalInputIdentifier, &nullValidator); // txfee vin - vinPlan.pushValidators((CInputIdentifierBase*)&ccInputIdentifier, &markerValidator, &ownerCCaddrValidator); // check cc owner addr - - // vout validation plan: - voutPlan.pushValidators(0, &cc1of2ValidatorThis); // check 1of2 addr funding - // do not check change at this time - // no checking for opret yet - break; - - case 'A': // add tokens (only for tokens) - // vin validation plan: - vinPlan.pushValidators((CInputIdentifierBase*)&normalInputIdentifier, &nullValidator); // txfee vin - vinPlan.pushValidators((CInputIdentifierBase*)&ccInputIdentifier, &markerValidator, &ownerCCaddrValidator); // check cc owner addr - - // vout validation plan: - voutPlan.pushValidators(0, &cc1of2ValidatorThis); // check 1of2 addr funding - // do not check change at this time - voutPlan.pushValidators(numvouts - 1, &opRetValidator); // opreturn check, NOTE: only for C or A: - break; - - case 'C': // spend coins or tokens - // vin validation plan: - vinPlan.pushValidators((CInputIdentifierBase*)&normalInputIdentifier, &nullValidator); // txfee vin - vinPlan.pushValidators((CInputIdentifierBase*)&ccInputIdentifier, &markerValidator, &cc1of2ValidatorThis); // cc1of2 funding addr - - // vout validation plan: - voutPlan.pushValidators(0, &heirSpendValidator); // check if heir is allowed to spend - voutPlan.pushValidators(numvouts - 1, &opRetValidator); // opreturn check, NOTE: only for C or A - break; - } - - // call vin/vout validation - if (!vinPlan.validate(tx, eval)) - return false; - if (!voutPlan.validate(tx, eval)) - return false; - - return true; -} - -/** - * Tx validation entry function - */ -bool HeirValidate(struct CCcontract_info* cpHeir, Eval* eval, const CTransaction& tx, uint32_t nIn) -{ - int32_t numvins = tx.vin.size(); - int32_t numvouts = tx.vout.size(); - //int32_t preventCCvins = -1; - //int32_t preventCCvouts = -1; - - struct CCcontract_info *cpTokens, tokensC; - cpTokens = CCinit(&tokensC, EVAL_TOKENS); - - if (numvouts < 1) - return eval->Invalid("no vouts"); - - //if (chainActive.Height() < 741) - // return true; - - uint256 fundingTxidInOpret = zeroid, latestTxid = zeroid, dummyTokenid, tokenidThis, tokenid = zeroid; - - CScript fundingTxOpRetScript; - uint8_t hasHeirSpendingBegun = 0, hasHeirSpendingBegunDummy; - - CScript opret = (tx.vout.size() > 0) ? tx.vout[tx.vout.size() - 1].scriptPubKey : CScript(); // check boundary - uint8_t funcId = DecodeHeirEitherOpRet(opret, tokenidThis, fundingTxidInOpret, hasHeirSpendingBegunDummy, true); - if (funcId == 0) - return eval->Invalid("invalid opreturn format"); - - if (funcId != 'F') { - if (fundingTxidInOpret == zeroid) { - return eval->Invalid("incorrect tx opreturn: no fundingtxid present"); - } - latestTxid = FindLatestFundingTx(fundingTxidInOpret, tokenid, fundingTxOpRetScript, hasHeirSpendingBegun); - - if( tokenid != zeroid && tokenid != tokenidThis ) - return eval->Invalid("incorrect tx tokenid"); - - if (latestTxid == zeroid) { - return eval->Invalid("no fundingtx found"); - } - } - else { - fundingTxOpRetScript = opret; - } - - std::cerr << "HeirValidate funcid=" << (char)funcId << " evalcode=" << (int)cpHeir->evalcode << std::endl; - - //////////////// temp //////////////////////// - ///return true; - - switch (funcId) { - case 'F': - // fund coins: - // vins.*: normal inputs - // ----------------------------- - // vout.0: funding CC 1of2 addr for the owner and heir - // vout.1: txfee for CC addr used as a marker - // vout.2: normal change - // vout.n-1: opreturn 'F' ownerpk heirpk inactivitytime heirname - - // fund tokens: - // vin.0: normal inputs txfee - // vins.1+: user's CC addr inputs - // ----------------------- - // vout.0: funding heir CC 1of2 addr for the owner and heir - // vout.1: txfee for CC addr used as a marker - // vout.2: normal change - // vout.n-1: opreturn 't' tokenid 'F' ownerpk heirpk inactivitytime heirname tokenid - if (tokenid != zeroid) - return RunValidationPlans(funcId, cpTokens, eval, tx, latestTxid, fundingTxOpRetScript, hasHeirSpendingBegun); - else - return eval->Invalid("unexpected HeirValidate for heirfund"); - // break; - - case 'A': - // add funding coins: - // vins.*: normal inputs - // ------------------------ - // vout.0: funding CC 1of2 addr for the owner and heir - // vout.1: normal change - // vout.n-1: opreturn 'A' ownerpk heirpk inactivitytime fundingtx - - // add funding tokens: - // vins.0: normal inputs txfee - // vins.1+: user's CC addr inputs - // ------------------------ - // vout.0: funding CC 1of2 addr for the owner and heir - // vout.1: normal change - // vout.n-1: opreturn 't' tokenid 'A' ownerpk heirpk inactivitytime fundingtx - if (tokenid != zeroid) - return RunValidationPlans(funcId, cpTokens, eval, tx, latestTxid, fundingTxOpRetScript, hasHeirSpendingBegun); - else - return eval->Invalid("unexpected HeirValidate for heiradd"); - //break; - - case 'C': - // claim coins: - // vin.0: normal input txfee - // vin.1+: input from CC 1of2 addr - // ------------------------------------- - // vout.0: normal output to owner or heir address - // vout.1: change to CC 1of2 addr - // vout.2: change to user's addr from txfee input if any - // vout.n-1: opreturn 'C' ownerpk heirpk inactivitytime fundingtx - - // claim tokens: - // vin.0: normal input txfee - // vin.1+: input from CC 1of2 addr - // -------------------------------------------- - // vout.0: output to user's cc address - // vout.1: change to CC 1of2 addr - // vout.2: change to normal from txfee input if any - // vout.n-1: opreturn 't' tokenid 'C' ownerpk heirpk inactivitytime fundingtx - if (tokenid != zeroid) - return RunValidationPlans(funcId, cpTokens, eval, tx, latestTxid, fundingTxOpRetScript, hasHeirSpendingBegun); - else - return RunValidationPlans(funcId, cpHeir, eval, tx, latestTxid, fundingTxOpRetScript, hasHeirSpendingBegun); - // break; - - default: - std::cerr << "HeirValidate() illegal heir funcid=" << (char)funcId << std::endl; - return eval->Invalid("unexpected HeirValidate funcid"); - // break; - } - return eval->Invalid("unexpected"); // (PreventCC(eval, tx, preventCCvins, numvins, preventCCvouts, numvouts)); -} -// end of consensus code - - -// helper functions used in implementations of rpc calls (in rpcwallet.cpp) or validation code - -/** - * Checks if vout is to cryptocondition address - * @return vout value in satoshis - */ -template int64_t IsHeirFundingVout(struct CCcontract_info* cp, const CTransaction& tx, int32_t voutIndex, CPubKey ownerPubkey, CPubKey heirPubkey) -{ - char destaddr[65], heirFundingAddr[65]; - - Helper::GetCoinsOrTokensCCaddress1of2(cp, heirFundingAddr, ownerPubkey, heirPubkey); - if (tx.vout[voutIndex].scriptPubKey.IsPayToCryptoCondition() != 0) { - // NOTE: dimxy it was unsafe 'Getscriptaddress(destaddr,tx.vout[voutIndex].scriptPubKey) > 0' here: - if (Getscriptaddress(destaddr, tx.vout[voutIndex].scriptPubKey) && strcmp(destaddr, heirFundingAddr) == 0) - return (tx.vout[voutIndex].nValue); - else - std::cerr << "IsHeirFundingVout() heirFundingAddr=" << heirFundingAddr << " not equal to destaddr=" << destaddr << std::endl; - } - return (0); -} - -// makes coin initial tx opret -vscript_t EncodeHeirCreateOpRet(uint8_t funcid, CPubKey ownerPubkey, CPubKey heirPubkey, int64_t inactivityTimeSec, std::string heirName, std::string memo) -{ - uint8_t evalcode = EVAL_HEIR; - - return /*CScript() << OP_RETURN <<*/ E_MARSHAL(ss << evalcode << funcid << ownerPubkey << heirPubkey << inactivityTimeSec << heirName << memo); -} - -// makes coin additional tx opret -vscript_t EncodeHeirOpRet(uint8_t funcid, uint256 fundingtxid, uint8_t hasHeirSpendingBegun) -{ - uint8_t evalcode = EVAL_HEIR; - - fundingtxid = revuint256(fundingtxid); - return /*CScript() << OP_RETURN <<*/ E_MARSHAL(ss << evalcode << funcid << fundingtxid << hasHeirSpendingBegun); -} - - -// decode opret vout for Heir contract -uint8_t _DecodeHeirOpRet(vscript_t vopret, CPubKey& ownerPubkey, CPubKey& heirPubkey, int64_t& inactivityTime, std::string& heirName, std::string& memo, uint256& fundingTxidInOpret, uint8_t &hasHeirSpendingBegun, bool noLogging) -{ - uint8_t evalCodeInOpret = 0; - uint8_t heirFuncId = 0; - - fundingTxidInOpret = zeroid; //to init - - evalCodeInOpret = vopret.begin()[0]; - - if (vopret.size() > 1 && evalCodeInOpret == EVAL_HEIR) { - // NOTE: it unmarshals for all F, A and C - uint8_t heirFuncId = 0; - hasHeirSpendingBegun = 0; - - bool result = E_UNMARSHAL(vopret, { ss >> evalCodeInOpret; ss >> heirFuncId; - if (heirFuncId == 'F') { - ss >> ownerPubkey; ss >> heirPubkey; ss >> inactivityTime; ss >> heirName; ss >> memo; - } - else { - ss >> fundingTxidInOpret >> hasHeirSpendingBegun; - } - }); - - if (!result) { - if (!noLogging) std::cerr << "_DecodeHeirOpRet() could not unmarshal opret, evalCode=" << (int)evalCodeInOpret << std::endl; - return (uint8_t)0; - } - - /* std::cerr << "DecodeHeirOpRet()" - << " heirFuncId=" << (char)(heirFuncId ? heirFuncId : ' ') - << " ownerPubkey=" << HexStr(ownerPubkey) - << " heirPubkey=" << HexStr(heirPubkey) - << " heirName=" << heirName << " inactivityTime=" << inactivityTime - << " hasHeirSpendingBegun=" << (int)hasHeirSpendingBegun << std::endl; */ - - if (isMyFuncId(heirFuncId)) { - fundingTxidInOpret = revuint256(fundingTxidInOpret); - return heirFuncId; - } - else { - if(!noLogging) std::cerr << "_DecodeHeirOpRet() unexpected opret type, heirFuncId=" << (char)(heirFuncId ? heirFuncId : ' ') << std::endl; - } - } - else { - if (!noLogging) std::cerr << "_DecodeHeirOpRet() not a heir opret, vopretExtra.size() == 0 or not EVAL_HEIR evalcode=" << (int)evalCodeInOpret << std::endl; - } - return (uint8_t)0; -} - -// decode combined opret: -uint8_t _DecodeHeirEitherOpRet(CScript scriptPubKey, uint256 &tokenid, CPubKey& ownerPubkey, CPubKey& heirPubkey, int64_t& inactivityTime, std::string& heirName, std::string& memo, uint256& fundingTxidInOpret, uint8_t &hasHeirSpendingBegun, bool noLogging) -{ - uint8_t evalCodeTokens = 0; - std::vector voutPubkeysDummy; - std::vector> oprets; - vscript_t vopretExtra /*, vopretStripped*/; - - - if (DecodeTokenOpRet(scriptPubKey, evalCodeTokens, tokenid, voutPubkeysDummy, oprets) != 0 && GetOpretBlob(oprets, OPRETID_HEIRDATA, vopretExtra)) { - /* if (vopretExtra.size() > 1) { - // restore the second opret: - - /* unmarshalled in DecodeTokenOpRet: - if (!E_UNMARSHAL(vopretExtra, { ss >> vopretStripped; })) { //strip string size - if (!noLogging) std::cerr << "_DecodeHeirEitherOpret() could not unmarshal vopretStripped" << std::endl; - return (uint8_t)0; - } - } */ - if (vopretExtra.size() < 1) { - if (!noLogging) std::cerr << "_DecodeHeirEitherOpret() empty vopretExtra" << std::endl; - return (uint8_t)0; - } - } - else { - GetOpReturnData(scriptPubKey, vopretExtra); - } - - return _DecodeHeirOpRet(vopretExtra, ownerPubkey, heirPubkey, inactivityTime, heirName, memo, fundingTxidInOpret, hasHeirSpendingBegun, noLogging); -} - -// overload to decode opret in fundingtxid: -uint8_t DecodeHeirEitherOpRet(CScript scriptPubKey, uint256 &tokenid, CPubKey& ownerPubkey, CPubKey& heirPubkey, int64_t& inactivityTime, std::string& heirName, std::string& memo, bool noLogging) { - uint256 dummyFundingTxidInOpret; - uint8_t dummyHasHeirSpendingBegun; - - return _DecodeHeirEitherOpRet(scriptPubKey, tokenid, ownerPubkey, heirPubkey, inactivityTime, heirName, memo, dummyFundingTxidInOpret, dummyHasHeirSpendingBegun, noLogging); -} - -// overload to decode opret in A and C heir tx: -uint8_t DecodeHeirEitherOpRet(CScript scriptPubKey, uint256 &tokenid, uint256 &fundingTxidInOpret, uint8_t &hasHeirSpendingBegun, bool noLogging) { - CPubKey dummyOwnerPubkey, dummyHeirPubkey; - int64_t dummyInactivityTime; - std::string dummyHeirName, dummyMemo; - - return _DecodeHeirEitherOpRet(scriptPubKey, tokenid, dummyOwnerPubkey, dummyHeirPubkey, dummyInactivityTime, dummyHeirName, dummyMemo, fundingTxidInOpret, hasHeirSpendingBegun, noLogging); -} - -// check if pubkey is in vins -void CheckVinPubkey(std::vector vins, CPubKey pubkey, bool &hasPubkey, bool &hasOtherPubkey) { - - hasPubkey = false; - hasOtherPubkey = false; - - for (auto vin : vins) { - CPubKey vinPubkey = check_signing_pubkey(vin.scriptSig); - if (vinPubkey.IsValid()) { - if (vinPubkey == pubkey) - hasPubkey = true; - if (vinPubkey != pubkey) - hasOtherPubkey = true; - } - } -} - -/** - * find the latest funding tx: it may be the first F tx or one of A or C tx's - * Note: this function is also called from validation code (use non-locking calls) - */ -uint256 _FindLatestFundingTx(uint256 fundingtxid, uint8_t& funcId, uint256 &tokenid, CPubKey& ownerPubkey, CPubKey& heirPubkey, int64_t& inactivityTime, std::string& heirName, std::string& memo, CScript& fundingOpretScript, uint8_t &hasHeirSpendingBegun) -{ - CTransaction fundingtx; - uint256 hashBlock; - const bool allowSlow = false; - - //char markeraddr[64]; - //CCtxidaddr(markeraddr, fundingtxid); - //SetCCunspents(unspentOutputs, markeraddr,true); - - hasHeirSpendingBegun = 0; - funcId = 0; - - // get initial funding tx and set it as initial lasttx: - if (myGetTransaction(fundingtxid, fundingtx, hashBlock) && fundingtx.vout.size()) { - - CScript heirScript = (fundingtx.vout.size() > 0) ? fundingtx.vout[fundingtx.vout.size() - 1].scriptPubKey : CScript(); - uint8_t funcId = DecodeHeirEitherOpRet(heirScript, tokenid, ownerPubkey, heirPubkey, inactivityTime, heirName, memo, true); - if (funcId != 0) { - // found at least funding tx! - //std::cerr << "FindLatestFundingTx() lasttx currently is fundingtx, txid=" << fundingtxid.GetHex() << " opreturn type=" << (char)funcId << '\n'; - fundingOpretScript = fundingtx.vout[fundingtx.vout.size() - 1].scriptPubKey; - } else { - std::cerr << "FindLatestFundingTx() could not decode opreturn for fundingtxid=" << fundingtxid.GetHex() << '\n'; - return zeroid; - } - } else { - std::cerr << "FindLatestFundingTx() could not find funding tx for fundingtxid=" << fundingtxid.GetHex() << '\n'; - return zeroid; - } - - // TODO: correct cc addr: - std::vector> unspentOutputs; - struct CCcontract_info *cp, C; - cp = CCinit(&C, EVAL_HEIR); - char coinaddr[64]; - GetCCaddress1of2(cp, coinaddr, ownerPubkey, heirPubkey); // get the address of cryptocondition '1 of 2 pubkeys' - - SetCCunspents(unspentOutputs, coinaddr,true); // get vector with tx's with unspent vouts of 1of2pubkey address: - //std::cerr << "FindLatestFundingTx() using 1of2address=" << coinaddr << " unspentOutputs.size()=" << unspentOutputs.size() << '\n'; - - int32_t maxBlockHeight = 0; // max block height - uint256 latesttxid = fundingtxid; - - // try to find the last funding or spending tx by checking fundingtxid in 'opreturn': - for (std::vector>::const_iterator it = unspentOutputs.begin(); it != unspentOutputs.end(); it++) { - CTransaction regtx; - uint256 hash; - - uint256 txid = it->first.txhash; - //std::cerr << "FindLatestFundingTx() checking unspents for txid=" << txid.GetHex() << '\n'; - - int32_t blockHeight = (int32_t)it->second.blockHeight; - - //NOTE: maybe called from validation code: - if (myGetTransaction(txid, regtx, hash)) { - //std::cerr << "FindLatestFundingTx() found tx for txid=" << txid.GetHex() << " blockHeight=" << blockHeight << " maxBlockHeight=" << maxBlockHeight << '\n'; - uint256 fundingTxidInOpret; - uint256 tokenidInOpret; // not to contaminate the tokenid from the params! - uint8_t tmpFuncId; - uint8_t hasHeirSpendingBegunInOpret; - - CScript heirScript = (regtx.vout.size() > 0) ? regtx.vout[regtx.vout.size() - 1].scriptPubKey : CScript(); - tmpFuncId = DecodeHeirEitherOpRet(heirScript, tokenidInOpret, fundingTxidInOpret, hasHeirSpendingBegunInOpret, true); - if (tmpFuncId != 0 && fundingtxid == fundingTxidInOpret && (tokenid == zeroid || tokenid == tokenidInOpret)) { // check tokenid also - - if (blockHeight > maxBlockHeight) { - - // check owner pubkey in vins - bool isOwner = false; - bool isNonOwner = false; - - CheckVinPubkey(regtx.vin, ownerPubkey, isOwner, isNonOwner); - - // we ignore 'donations' tx (with non-owner inputs) for calculating if heir is allowed to spend: - if (isOwner && !isNonOwner) { - hasHeirSpendingBegun = hasHeirSpendingBegunInOpret; - maxBlockHeight = blockHeight; - latesttxid = txid; - funcId = tmpFuncId; - } - - //std::cerr << "FindLatestFundingTx() txid=" << latesttxid.GetHex() << " at blockHeight=" << maxBlockHeight - // << " opreturn type=" << (char)(funcId ? funcId : ' ') << " hasHeirSpendingBegun=" << (int)hasHeirSpendingBegun << " - set as current lasttxid" << '\n'; - } - } - } - } - - return latesttxid; -} - -// overload for validation code -uint256 FindLatestFundingTx(uint256 fundingtxid, uint256 &tokenid, CScript& opRetScript, uint8_t &hasHeirSpendingBegun) -{ - uint8_t funcId; - CPubKey ownerPubkey; - CPubKey heirPubkey; - int64_t inactivityTime; - std::string heirName, memo; - - return _FindLatestFundingTx(fundingtxid, funcId, tokenid, ownerPubkey, heirPubkey, inactivityTime, heirName, memo, opRetScript, hasHeirSpendingBegun); -} - -// overload for transaction creation code -uint256 FindLatestFundingTx(uint256 fundingtxid, uint8_t& funcId, uint256 &tokenid, CPubKey& ownerPubkey, CPubKey& heirPubkey, int64_t& inactivityTime, std::string& heirName, std::string& memo, uint8_t &hasHeirSpendingBegun) -{ - CScript opRetScript; - - return _FindLatestFundingTx(fundingtxid, funcId, tokenid, ownerPubkey, heirPubkey, inactivityTime, heirName, memo, opRetScript, hasHeirSpendingBegun); -} - -// add inputs of 1 of 2 cc address -template int64_t Add1of2AddressInputs(struct CCcontract_info* cp, uint256 fundingtxid, CMutableTransaction& mtx, CPubKey ownerPubkey, CPubKey heirPubkey, int64_t total, int32_t maxinputs) -{ - // TODO: add threshold check - int64_t nValue, voutValue, totalinputs = 0; - CTransaction heirtx; - int32_t n = 0; - std::vector> unspentOutputs; - - char coinaddr[64]; - Helper::GetCoinsOrTokensCCaddress1of2(coinaddr, ownerPubkey, heirPubkey); // get address of cryptocondition '1 of 2 pubkeys' - SetCCunspents(unspentOutputs, coinaddr,true); - - // char markeraddr[64]; - // CCtxidaddr(markeraddr, fundingtxid); - // SetCCunspents(unspentOutputs, markeraddr,true); - - std::cerr << "Add1of2AddressInputs() using 1of2addr=" << coinaddr << " unspentOutputs.size()=" << unspentOutputs.size() << std::endl; - - for (std::vector>::const_iterator it = unspentOutputs.begin(); it != unspentOutputs.end(); it++) { - uint256 txid = it->first.txhash; - uint256 hashBlock; - int32_t voutIndex = (int32_t)it->first.index; - // no need to prevent dup - // dimxy: maybe it is good to put tx's in cache? - - //std::cerr << "Add1of2AddressInputs() txid=" << txid.GetHex() << std::endl; - - if (myGetTransaction(txid, heirtx, hashBlock) != 0) { - uint256 tokenid; - uint256 fundingTxidInOpret; - uint8_t hasHeirSpendingBegunDummy; - - CScript heirScript = (heirtx.vout.size() > 0) ? heirtx.vout[heirtx.vout.size() - 1].scriptPubKey : CScript(); // check boundary - uint8_t funcId = DecodeHeirEitherOpRet(heirScript, tokenid, fundingTxidInOpret, hasHeirSpendingBegunDummy, false); - - if ((txid == fundingtxid || fundingTxidInOpret == fundingtxid) && - funcId != 0 && - isMyFuncId(funcId) && - (typeid(Helper) != typeid(TokenHelper) ) && // token validation logic - //(voutValue = IsHeirFundingVout(cp, heirtx, voutIndex, ownerPubkey, heirPubkey)) > 0 && // heir contract vout validation logic - not used since we moved to 2-eval vouts - !myIsutxo_spentinmempool(ignoretxid,ignorevin,txid, voutIndex)) - { - std::cerr << "Add1of2AddressInputs() satoshis=" << it->second.satoshis << std::endl; - if (total != 0 && maxinputs != 0) - mtx.vin.push_back(CTxIn(txid, voutIndex, CScript())); - nValue = it->second.satoshis; - totalinputs += nValue; - n++; - if ((total > 0 && totalinputs >= total) || (maxinputs > 0 && n >= maxinputs)) - break; - } - } - } - return totalinputs; -} - -/** - * enumerate all tx's sending to CCHeir 1of2address and calc total lifetime funds - */ -template int64_t LifetimeHeirContractFunds(struct CCcontract_info* cp, uint256 fundingtxid, CPubKey ownerPubkey, CPubKey heirPubkey) -{ - char coinaddr[64]; - Helper::GetCoinsOrTokensCCaddress1of2(coinaddr, ownerPubkey, heirPubkey); // get the address of cryptocondition '1 of 2 pubkeys' - - std::vector> addressIndexes; - SetCCtxids(addressIndexes, coinaddr,true); - - //fprintf(stderr,"LifetimeHeirContractFunds() scan lifetime of %s\n",coinaddr); - int64_t total = 0; - for (std::vector>::const_iterator it = addressIndexes.begin(); it != addressIndexes.end(); it++) { - uint256 hashBlock; - uint256 txid = it->first.txhash; - CTransaction heirtx; - - // TODO: check all funding tx should contain unspendable markers - if (myGetTransaction(txid, heirtx, hashBlock) && heirtx.vout.size() > 0) { - uint256 tokenid; - uint256 fundingTxidInOpret; - uint8_t hasHeirSpendingBegunDummy; - const int32_t ivout = 0; - - CScript heirScript = (heirtx.vout.size() > 0) ? heirtx.vout[heirtx.vout.size() - 1].scriptPubKey : CScript(); // check boundary - uint8_t funcId = DecodeHeirEitherOpRet(heirScript, tokenid, fundingTxidInOpret, hasHeirSpendingBegunDummy, false); - - //std::cerr << "LifetimeHeirContractFunds() found tx=" << txid.GetHex() << " vout[0].nValue=" << subtx.vout[ccVoutIdx].nValue << " opreturn=" << (char)funcId << '\n'; - - if (funcId != 0 && - (txid == fundingtxid || fundingTxidInOpret == fundingtxid) && - isMyFuncId(funcId) && !isSpendingTx(funcId) && - (typeid(Helper) != typeid(TokenHelper) ) && - !myIsutxo_spentinmempool(ignoretxid,ignorevin,txid, ivout)) // exclude tx in mempool - { - total += it->second; // dont do this: tx.vout[ivout].nValue; // in vin[0] always is the pay to 1of2 addr (funding or change) - //std::cerr << "LifetimeHeirContractFunds() added tx=" << txid.GetHex() << " it->second=" << it->second << " vout[0].nValue=" << tx.vout[ivout].nValue << " opreturn=" << (char)funcId << '\n'; - } - } - } - return (total); -} - -/* rpc functions' implementation: */ - -/** - * heirfund rpc call implementation - * creates tx for initial funds deposit on cryptocondition address which locks funds for spending by either of address. - * and also for setting spending plan for the funds' owner and heir - * @return fundingtxid handle for subsequent references to this heir funding plan - */ -template UniValue _HeirFund(int64_t txfee, int64_t amount, std::string heirName, CPubKey heirPubkey, int64_t inactivityTimeSec, std::string memo, uint256 tokenid) -{ - UniValue result(UniValue::VOBJ); - CMutableTransaction mtx = CreateNewContextualCMutableTransaction(Params().GetConsensus(), hush_nextheight()); - struct CCcontract_info *cp, C; - - cp = CCinit(&C, Helper::getMyEval()); - if (txfee == 0) - txfee = 10000; - - int64_t markerfee = 10000; - - //std::cerr << "HeirFund() amount=" << amount << " txfee=" << txfee << " heirPubkey IsValid()=" << heirPubkey.IsValid() << " inactivityTime(sec)=" << inactivityTimeSec << " tokenid=" << tokenid.GetHex() << std::endl; - - CPubKey myPubkey = pubkey2pk(Mypubkey()); - - if (!tokenid.IsNull()) // add normals only for tokens - { - if (AddNormalinputs(mtx, myPubkey, txfee + markerfee, 4) < txfee + markerfee) - { - std::cerr << "HeirFund() could not find normal inputs for txfee" << std::endl; - result.push_back(Pair("result", "error")); - result.push_back(Pair("error", "could not find normal inputs for txfee")); - return result; - } - } - - int64_t inputs; - int64_t addAmount = tokenid.IsNull() ? (txfee + markerfee + amount) : amount; // for coins add txfee markerfee amount in one call - if ((inputs=Helper::addOwnerInputs(tokenid, mtx, myPubkey, addAmount, (int32_t)64)) >= addAmount) - { - mtx.vout.push_back(Helper::make1of2Vout(amount, myPubkey, heirPubkey)); - - // add a marker for finding all plans in HeirList() - // TODO: change marker either to cc or normal txidaddr unspendable - struct CCcontract_info *cpHeir, heirC; - cpHeir = CCinit(&heirC, EVAL_HEIR); - CPubKey heirUnspendablePubKey = GetUnspendable(cpHeir, 0); - // mtx.vout.push_back(CTxOut(txfee, CScript() << ParseHex(HexStr(heirUnspendablePubKey)) << OP_CHECKSIG)); <-- bad marker cause it was spendable by anyone - mtx.vout.push_back(MakeCC1vout(EVAL_HEIR, markerfee, heirUnspendablePubKey)); // this marker spending is disabled in the validation code - - if (!tokenid.IsNull()) - { - int64_t ccChange = 0; - // calc and add token change vout: - if (inputs > amount) - ccChange = (inputs - amount); // -txfee <-- txfee pays user - - //std::cerr << "HeirFund() inputs=" << inputs << " amount=" << amount << " txfee=" << txfee << " change=" << change << '\n'; - - if (ccChange != 0) - mtx.vout.push_back(Helper::makeUserVout(ccChange, myPubkey)); - } - - // check owner pubkey in vins - bool hasMypubkey = false; - bool hasNotMypubkey = false; - - CheckVinPubkey(mtx.vin, myPubkey, hasMypubkey, hasNotMypubkey); - - // for initial funding do not allow to sign by non-owner key: - if (hasNotMypubkey) { - result.push_back(Pair("result", "error")); - result.push_back(Pair("error", "using non-owner inputs not allowed")); - return result; - } - - // add 1of2 vout token validation pubkeys - used only for tokens - std::vector voutTokenPubkeys; - voutTokenPubkeys.push_back(myPubkey); - voutTokenPubkeys.push_back(heirPubkey); - - // add change for txfee and opreturn vouts and sign tx: - std::string rawhextx = FinalizeCCTx(0, cp, mtx, myPubkey, txfee, - Helper::makeCreateOpRet(tokenid, voutTokenPubkeys, myPubkey, heirPubkey, inactivityTimeSec, heirName, memo)); - if (!rawhextx.empty()) { - result.push_back(Pair("result", "success")); - result.push_back(Pair("hex", rawhextx)); - } - else { - std::cerr << "HeirAdd error in FinalizeCCtx" << std::endl; - result.push_back(Pair("result", "error")); - result.push_back(Pair("error", "sign error")); - } - } - else { // TODO: need result return unification with heiradd and claim - std::cerr << "HeirFund() could not find owner inputs for amount (normal inputs for coins, cc inputs for tokens)" << std::endl; - result.push_back(Pair("result", "error")); - result.push_back(Pair("error", "could not find owner inputs")); - } - return result; -} - -// if no these callers - it could not link -UniValue HeirFundCoinCaller(int64_t txfee, int64_t coins, std::string heirName, CPubKey heirPubkey, int64_t inactivityTimeSec, std::string memo){ - return _HeirFund(txfee, coins, heirName, heirPubkey, inactivityTimeSec, memo, zeroid); -} - -UniValue HeirFundTokenCaller(int64_t txfee, int64_t satoshis, std::string heirName, CPubKey heirPubkey, int64_t inactivityTimeSec, std::string memo, uint256 tokenid) { - return _HeirFund(txfee, satoshis, heirName, heirPubkey, inactivityTimeSec, memo, tokenid); -} - -/** - * heiradd rpc call implementation - * creates tx to add more funds to cryptocondition address for spending by either funds' owner or heir - * @return result object with raw tx or error text - */ -template UniValue _HeirAdd(uint256 fundingtxid, int64_t txfee, int64_t amount, uint256 latesttxid, uint8_t funcId, uint256 tokenid, CPubKey ownerPubkey, CPubKey heirPubkey, int64_t inactivityTimeSec, uint8_t hasHeirSpendingBegun) -{ - UniValue result(UniValue::VOBJ); - CMutableTransaction mtx = CreateNewContextualCMutableTransaction(Params().GetConsensus(), hush_nextheight()); - struct CCcontract_info *cp, C; - std::string rawhex; - - cp = CCinit(&C, Helper::getMyEval()); // for tokens shoud be EVAL_TOKENS to sign it correctly! - - if (txfee == 0) - txfee = 10000; - - int64_t markerfee = 10000; - - CPubKey myPubkey = pubkey2pk(Mypubkey()); - - // check if it is the owner - if (myPubkey != ownerPubkey) { - result.push_back(Pair("result", "error")); - result.push_back(Pair("error", "adding funds is only allowed for the owner of this contract")); - return result; - } - - if (!tokenid.IsNull()) // add normals only for tokens - { - if (AddNormalinputs(mtx, myPubkey, txfee + markerfee, 4) < txfee + markerfee) - { - std::cerr << "HeirFund() could not find normal inputs for txfee" << std::endl; - result.push_back(Pair("result", "error")); - result.push_back(Pair("error", "could not find normal inputs for txfee")); - return result; - } - } - - int64_t inputs; - int64_t addAmount = tokenid.IsNull() ? (txfee + markerfee + amount) : amount; // for coins add txfee markerfee amount in one call - if ((inputs = Helper::addOwnerInputs(tokenid, mtx, myPubkey, addAmount, 64)) >= addAmount) { // TODO: why 64 max inputs? - - // we do not use markers anymore - storing data in opreturn is better - // add marker vout: - /* char markeraddr[64]; - CPubKey markerpubkey = CCtxidaddr(markeraddr, fundingtxid); - mtx.vout.push_back(CTxOut(txfee, CScript() << ParseHex(HexStr(markerpubkey)) << OP_CHECKSIG)); // txfee 1, txfee 2 - for miners - std::cerr << "HeirAdd() adding markeraddr=" << markeraddr << '\n'; */ - - // add cryptocondition to spend this funded amount for either pk - mtx.vout.push_back(Helper::make1of2Vout(amount, ownerPubkey, heirPubkey)); - - char markeraddr[64]; - CPubKey markerPubkey = CCtxidaddr(markeraddr, fundingtxid); - mtx.vout.push_back(CTxOut(markerfee, CScript() << ParseHex(HexStr(markerPubkey)) << OP_CHECKSIG)); // marker to prevent archiving of the funds add vouts - - if (!tokenid.IsNull()) - { - int64_t ccChange = 0; - - if (inputs > amount) - ccChange = (inputs - amount); // -txfee <-- txfee pays user - //std::cerr << "HeirAdd() inputs=" << inputs << " amount=" << amount << " txfee=" << txfee << " change=" << change << '\n'; - - if (ccChange != 0) - mtx.vout.push_back(Helper::makeUserVout(ccChange, myPubkey)); - } - - // check owner pubkey in vins - bool hasMypubkey = false; - bool hasNotMypubkey = false; - - CheckVinPubkey(mtx.vin, myPubkey, hasMypubkey, hasNotMypubkey); - - // for additional funding do not allow to sign by both owner and non-owner keys (is this a donation or not?): - if (hasMypubkey && hasNotMypubkey) { - result.push_back(Pair("result", "error")); - result.push_back(Pair("error", "using both owner and non-owner inputs is not allowed")); - return result; - } - - // warn the user he's making a donation if this is all non-owner keys: - if (hasNotMypubkey) { - result.push_back(Pair("result", "warning")); - result.push_back(Pair("warning", "you are about to make a donation to heir fund")); - } - else { - result.push_back(Pair("result", "success")); - } - - // add 1of2 vout validation pubkeys - needed only for tokens: - std::vector voutTokenPubkeys; - voutTokenPubkeys.push_back(ownerPubkey); - voutTokenPubkeys.push_back(heirPubkey); - - // add opreturn 'A' and sign tx: - std::string rawhextx = (FinalizeCCTx(0, cp, mtx, myPubkey, txfee, - Helper::makeAddOpRet(tokenid, voutTokenPubkeys, fundingtxid, hasHeirSpendingBegun))); - - if (!rawhextx.empty()) { - result.push_back(Pair("hex", rawhextx)); - } - else { - std::cerr << "HeirAdd error in FinalizeCCtx" << std::endl; - result.clear(); - result.push_back(Pair("result", "error")); - result.push_back(Pair("error", "sign error")); - } - } - else { - std::cerr << "HeirAdd cannot find owner inputs for amount (normal inputs for coins, cc inputs for tokens)" << std::endl; - result.push_back(Pair("result", "error")); - result.push_back(Pair("error", "can't find owner inputs")); - } - return result; -} - - -UniValue HeirAddCaller(uint256 fundingtxid, int64_t txfee, std::string strAmount) { - - CPubKey ownerPubkey, heirPubkey; - int64_t inactivityTimeSec; - - uint256 latesttxid, tokenid = zeroid; - uint8_t funcId; - std::string heirName, memo; - uint8_t hasHeirSpendingBegun = 0; - - // get latest tx to see if it is a token or coin - if ((latesttxid = FindLatestFundingTx(fundingtxid, funcId, tokenid, ownerPubkey, heirPubkey, inactivityTimeSec, heirName, memo, hasHeirSpendingBegun)) != zeroid) - { - if (tokenid == zeroid) { - int64_t amount = 0; - if (!ParseFixedPoint(strAmount, 8, &amount) || amount <= 0 ) { - UniValue result(UniValue::VOBJ); - result.push_back(Pair("result", "error")); - result.push_back(Pair("error", "invalid amount")); - return result; - } - return _HeirAdd(fundingtxid, txfee, amount, latesttxid, funcId, tokenid, ownerPubkey, heirPubkey, inactivityTimeSec, hasHeirSpendingBegun); - } - else - { - int64_t amount = atoll(strAmount.c_str()); - if (amount <= 0) { - UniValue result(UniValue::VOBJ); - result.push_back(Pair("result", "error")); - result.push_back(Pair("error", "invalid amount")); - return result; - } - return _HeirAdd(fundingtxid, txfee, amount, latesttxid, funcId, tokenid, ownerPubkey, heirPubkey, inactivityTimeSec, hasHeirSpendingBegun); - } - } - else { - UniValue result(UniValue::VOBJ); - - fprintf(stderr, "HeirAdd() can't find any heir CC funding tx's\n"); - result.push_back(Pair("result", "error")); - result.push_back(Pair("error", "can't find any heir CC funding transactions")); - return result; - } -} - - -/** - * heirclaim rpc call implementation - * creates tx to spend funds from cryptocondition address by either funds' owner or heir - * @return result object with raw tx or error text - */ -template UniValue _HeirClaim(uint256 fundingtxid, int64_t txfee, int64_t amount, uint256 latesttxid, uint8_t funcId, uint256 tokenid, CPubKey ownerPubkey, CPubKey heirPubkey, int64_t inactivityTimeSec, uint8_t hasHeirSpendingBegun) -{ - UniValue result(UniValue::VOBJ); - CMutableTransaction mtx = CreateNewContextualCMutableTransaction(Params().GetConsensus(), hush_nextheight()); - CPubKey myPubkey; - int64_t inputs, change = 0; - struct CCcontract_info *cp, C; - - cp = CCinit(&C, EVAL_HEIR); - if (txfee == 0) - txfee = 10000; - - int32_t numblocks; - uint64_t durationSec = 0; - - // we do not need to find duration if spending already has begun - if (!hasHeirSpendingBegun) { - durationSec = CCduration(numblocks, latesttxid); - std::cerr << "HeirClaim() duration=" << durationSec << " inactivityTime=" << inactivityTimeSec << " numblocks=" << numblocks << std::endl; - } - - // spending is allowed if there is already spending tx or inactivity time - //bool isAllowedToHeir = (funcId == 'C' || durationSec > inactivityTimeSec) ? true : false; - bool isAllowedToHeir = (hasHeirSpendingBegun || durationSec > inactivityTimeSec) ? true : false; - myPubkey = pubkey2pk(Mypubkey()); - - // if it is the heir, check if spending not allowed to heir yet - if (myPubkey == heirPubkey && !isAllowedToHeir) { - result.push_back(Pair("result", "error")); - result.push_back(Pair("error", "spending is not allowed yet for the heir")); - return result; - } - - // we do not use markers any more: - // we allow owner to spend funds at any time: - // if it is the owner, check if spending already allowed to heir - /* if (myPubkey == ownerPubkey && isAllowedToHeir) { - result.push_back(Pair("result", "spending is not already allowed for the owner")); - return result; - } */ - - // add spending txfee from the calling user - if (AddNormalinputs(mtx, myPubkey, txfee, 3) > 0) { - - // add spending from cc 1of2 address - if ((inputs = Add1of2AddressInputs(cp, fundingtxid, mtx, ownerPubkey, heirPubkey, amount, 60)) >= amount) // TODO: why only 60 inputs? - { - /*if (inputs < amount) { - std::cerr << "HeirClaim() cant find enough HeirCC 1of2 inputs, found=" << inputs << " required=" << amount << std::endl; - result.push_back(Pair("result", "error")); - result.push_back(Pair("error", "can't find heir CC funding")); - - return result; - }*/ - - // add vout with amount to claiming address - mtx.vout.push_back(Helper::makeUserVout(amount, myPubkey)); // vout[0] - - // calc and add change vout: - if (inputs > amount) - change = (inputs - amount); // -txfee <-- txfee pays user - - //std::cerr << "HeirClaim() inputs=" << inputs << " amount=" << amount << " txfee=" << txfee << " change=" << change << '\n'; - - // change to 1of2 funding addr: - if (change != 0) { // vout[1] - mtx.vout.push_back(Helper::make1of2Vout(change, ownerPubkey, heirPubkey)); // using always pubkeys from OP_RETURN in order to not mixing them up! - } - - // add marker vout: - /*char markeraddr[64]; - CPubKey markerpubkey = CCtxidaddr(markeraddr, fundingtxid); - // NOTE: amount = 0 is not working: causes error code: -26, error message : 64 : dust - mtx.vout.push_back(CTxOut(txfee, CScript() << ParseHex(HexStr(markerpubkey)) << OP_CHECKSIG)); // txfee 1, txfee 2 - for miners - std::cerr << "HeirClaim() adding markeraddr=" << markeraddr << '\n'; */ - - // get address of 1of2 cond - char coinaddr[64]; - Helper::GetCoinsOrTokensCCaddress1of2(coinaddr, ownerPubkey, heirPubkey); - - // retrieve priv key addresses for FinalizeCCtx: - uint8_t myprivkey[32]; - Myprivkey(myprivkey); - - // set pubkeys for finding 1of2 cc in FinalizeCCtx to sign it: - Helper::CCaddrCoinsOrTokens1of2set(cp, ownerPubkey, heirPubkey, coinaddr); - - // add 1of2 vout validation pubkeys (this is for tokens): - std::vector voutTokenPubkeys; - voutTokenPubkeys.push_back(ownerPubkey); - voutTokenPubkeys.push_back(heirPubkey); - - // add opreturn 'C' and sign tx: // this txfee will be ignored - std::string rawhextx = FinalizeCCTx(0, cp, mtx, myPubkey, txfee, - Helper::makeClaimOpRet(tokenid, voutTokenPubkeys, fundingtxid, (myPubkey == heirPubkey) ? 1 : hasHeirSpendingBegun)); // forward isHeirSpending to the next latest tx - - memset(myprivkey,0,sizeof(myprivkey)); - if (!rawhextx.empty()) { - result.push_back(Pair("result", "success")); - result.push_back(Pair("hex", rawhextx)); - } - else { - std::cerr << "HeirAdd error in FinalizeCCtx" << std::endl; - result.push_back(Pair("result", "error")); - result.push_back(Pair("error", "sign error")); - } - - } else { - fprintf(stderr, "HeirClaim() cant find Heir CC inputs\n"); - result.push_back(Pair("result", "error")); - result.push_back(Pair("error", "can't find heir CC funding")); - } - } else { - fprintf(stderr, "HeirClaim() cant find sufficient user inputs for tx fee\n"); - result.push_back(Pair("result", "error")); - result.push_back(Pair("error", "can't find sufficient user inputs to pay transaction fee")); - } - - - return result; -} - -UniValue HeirClaimCaller(uint256 fundingtxid, int64_t txfee, std::string strAmount) { - - CPubKey ownerPubkey, heirPubkey; - int64_t inactivityTimeSec; - - uint256 latesttxid, tokenid = zeroid; - uint8_t funcId; - std::string heirName, memo; - uint8_t hasHeirSpendingBegun = 0; - - // find latest tx to see if it is a token or coin: - if ((latesttxid = FindLatestFundingTx(fundingtxid, funcId, tokenid, ownerPubkey, heirPubkey, inactivityTimeSec, heirName, memo, hasHeirSpendingBegun)) != zeroid) - { - if (tokenid == zeroid) - { - int64_t amount = 0; - if (!ParseFixedPoint(strAmount, 8, &amount) || amount <= 0) { // using ParseFixedPoint instead atof to avoid round errors - UniValue result(UniValue::VOBJ); - result.push_back(Pair("result", "error")); - result.push_back(Pair("error", "invalid amount")); - return result; - } - return _HeirClaim(fundingtxid, txfee, amount, latesttxid, funcId, tokenid, ownerPubkey, heirPubkey, inactivityTimeSec, hasHeirSpendingBegun); - } - else { - int64_t amount = atoll(strAmount.c_str()); - if (amount <= 0) { - UniValue result(UniValue::VOBJ); - result.push_back(Pair("result", "error")); - result.push_back(Pair("error", "invalid amount")); - return result; - } - return _HeirClaim(fundingtxid, txfee, amount, latesttxid, funcId, tokenid, ownerPubkey, heirPubkey, inactivityTimeSec, hasHeirSpendingBegun); - } - - } - else { - UniValue result(UniValue::VOBJ); - - fprintf(stderr, "HeirClaim() can't find any heir CC funding tx's\n"); - result.push_back(Pair("result", "error")); - result.push_back(Pair("error", "can't find any heir CC funding transactions")); - return result; - } -} - - -/** - * heirinfo rpc call implementation - * returns some information about heir CC contract plan by a handle of initial fundingtxid: - * plan name, owner and heir pubkeys, funds deposited and available, flag if spending is enabled for the heir - * @return heir info data - */ -UniValue HeirInfo(uint256 fundingtxid) -{ - UniValue result(UniValue::VOBJ); - - CMutableTransaction mtx = CreateNewContextualCMutableTransaction(Params().GetConsensus(), hush_nextheight()); - CTransaction fundingtx; - uint256 hashBlock; - const bool allowSlow = false; - - //char markeraddr[64]; - //CCtxidaddr(markeraddr, fundingtxid); - //SetCCunspents(unspentOutputs, markeraddr,true); - - // get initial funding tx and set it as initial lasttx: - if (myGetTransaction(fundingtxid, fundingtx, hashBlock) && fundingtx.vout.size()) { - - CPubKey ownerPubkey, heirPubkey; - uint256 dummyTokenid, tokenid = zeroid; // important to clear tokenid - std::string heirName, memo; - int64_t inactivityTimeSec; - const bool noLogging = false; - uint8_t funcId; - - /*CScript opret = fundingtx.vout.size() > 0 ? fundingtx.vout[fundingtx.vout.size() - 1].scriptPubKey : CScript(); - uint8_t funcId = DecodeHeirEitherOpRet(opret, tokenid, ownerPubkey, heirPubkey, inactivityTimeSec, heirName, true); - if (funcId == 0) { - std::cerr << "HeirInfo() this fundingtx is incorrect" << std::endl; - result.push_back(Pair("result", "error")); - result.push_back(Pair("error", "initial tx F not found")); - return result; - }*/ - - struct CCcontract_info *cp, C; - cp = CCinit(&C, EVAL_HEIR); - - uint8_t hasHeirSpendingBegun = 0; - - uint256 latestFundingTxid = FindLatestFundingTx(fundingtxid, funcId, tokenid, ownerPubkey, heirPubkey, inactivityTimeSec, heirName, memo, hasHeirSpendingBegun); - - if (latestFundingTxid != zeroid) { - int32_t numblocks; - uint64_t durationSec = 0; - - //std::cerr << "HeirInfo() latesttxid=" << latestFundingTxid.GetHex() << '\n'; - - std::ostringstream stream; - std::string msg; - - //sleep(10); - - result.push_back(Pair("fundingtxid", fundingtxid.GetHex())); - result.push_back(Pair("name", heirName.c_str())); - - if (tokenid != zeroid) { // tokens - stream << tokenid.GetHex(); - msg = "tokenid"; - result.push_back(Pair(msg, stream.str().c_str())); - stream.str(""); - stream.clear(); - } - - char hexbuf[67]; - stream << pubkey33_str(hexbuf, (uint8_t*)ownerPubkey.begin()); - result.push_back(Pair("owner", stream.str().c_str())); - stream.str(""); - stream.clear(); - - stream << pubkey33_str(hexbuf, (uint8_t*)heirPubkey.begin()); - result.push_back(Pair("heir", stream.str().c_str())); - stream.str(""); - stream.clear(); - - int64_t total; - if (tokenid == zeroid) - total = LifetimeHeirContractFunds(cp, fundingtxid, ownerPubkey, heirPubkey); - else - total = LifetimeHeirContractFunds(cp, fundingtxid, ownerPubkey, heirPubkey); - - msg = "type"; - if (tokenid == zeroid) { - stream << "coins"; - } - else { - stream << "tokens"; - } - result.push_back(Pair(msg, stream.str().c_str())); - stream.str(""); - stream.clear(); - - msg = "lifetime"; - if (tokenid == zeroid) { - stream << std::fixed << std::setprecision(8) << (double)total / COIN; - } - else { - stream << total; - } - result.push_back(Pair(msg, stream.str().c_str())); - stream.str(""); - stream.clear(); - - int64_t inputs; - if (tokenid == zeroid) - inputs = Add1of2AddressInputs(cp, fundingtxid, mtx, ownerPubkey, heirPubkey, 0, 60); //NOTE: amount = 0 means all unspent inputs - else - inputs = Add1of2AddressInputs(cp, fundingtxid, mtx, ownerPubkey, heirPubkey, 0, 60); - - msg = "available"; - if (tokenid == zeroid) { - stream << std::fixed << std::setprecision(8) << (double)inputs / COIN; - } - else { - stream << inputs; - } - result.push_back(Pair(msg, stream.str().c_str())); - stream.str(""); - stream.clear(); - - if (tokenid != zeroid) { - int64_t ownerInputs = TokenHelper::addOwnerInputs(tokenid, mtx, ownerPubkey, 0, (int32_t)64); - stream << ownerInputs; - msg = "OwnerRemainderTokens"; - result.push_back(Pair(msg, stream.str().c_str())); - stream.str(""); - stream.clear(); - } - - stream << inactivityTimeSec; - result.push_back(Pair("InactivityTimeSetting", stream.str().c_str())); - stream.str(""); - stream.clear(); - - if (!hasHeirSpendingBegun) { // we do not need find duration if the spending already has begun - durationSec = CCduration(numblocks, latestFundingTxid); - std::cerr << "HeirInfo() duration (sec)=" << durationSec << " inactivityTime (sec)=" << inactivityTimeSec << " numblocks=" << numblocks << '\n'; - } - - stream << std::boolalpha << (hasHeirSpendingBegun || durationSec > inactivityTimeSec); - result.push_back(Pair("IsHeirSpendingAllowed", stream.str().c_str())); - stream.str(""); - stream.clear(); - - // adding owner current inactivity time: - if (!hasHeirSpendingBegun && durationSec <= inactivityTimeSec) { - stream << durationSec; - result.push_back(Pair("InactivityTime", stream.str().c_str())); - stream.str(""); - stream.clear(); - } - - result.push_back(Pair("memo", memo.c_str())); - - result.push_back(Pair("result", "success")); - } - else { - result.push_back(Pair("result", "error")); - result.push_back(Pair("error", "could not find heir cc plan for this txid")); - } - } - else { - result.push_back(Pair("result", "error")); - result.push_back(Pair("error", "could not find heir cc plan for this txid (no initial tx)")); - } - return (result); -} - -/** - * heirlist rpc call implementation - * @return list of heir plan handles (fundingtxid) - */ - -void _HeirList(struct CCcontract_info *cp, UniValue &result) -{ - std::vector> unspentOutputs; - char markeraddr[64]; - - GetCCaddress(cp, markeraddr, GetUnspendable(cp, NULL)); - SetCCunspents(unspentOutputs, markeraddr,true); - - //std::cerr << "HeirList() finding heir marker from unspendable addr=" << markeraddr << " unspentOutputs.size()=" << unspentOutputs.size() << '\n'; - - // TODO: move marker to special cc addr to prevent checking all tokens - for (std::vector>::const_iterator it = unspentOutputs.begin(); it != unspentOutputs.end(); it++) { - uint256 hashBlock; - uint256 txid = it->first.txhash; - uint256 tokenid; - int32_t vout = (int32_t)it->first.index; - - //std::cerr << "HeirList() checking txid=" << txid.GetHex() << " vout=" << vout << '\n'; - - CTransaction fundingtx; - if (myGetTransaction(txid, fundingtx, hashBlock)) { - CPubKey ownerPubkey, heirPubkey; - std::string heirName, memo; - int64_t inactivityTimeSec; - const bool noLogging = true; - uint256 tokenid; - - CScript opret = (fundingtx.vout.size() > 0) ? fundingtx.vout[fundingtx.vout.size() - 1].scriptPubKey : CScript(); - uint8_t funcId = DecodeHeirEitherOpRet(opret, tokenid, ownerPubkey, heirPubkey, inactivityTimeSec, heirName, memo, true); - - // note: if it is not Heir token funcId would be equal to 0 - if (funcId == 'F') { - //result.push_back(Pair("fundingtxid kind name", txid.GetHex() + std::string(" ") + (typeid(Helper) == typeid(TokenHelper) ? std::string("token") : std::string("coin")) + std::string(" ") + heirName)); - result.push_back( txid.GetHex() ); - } - else { - std::cerr << "HeirList() this is not the initial F transaction=" << txid.GetHex() << std::endl; - } - } - else { - std::cerr << "HeirList() could not load transaction=" << txid.GetHex() << std::endl; - } - } -} - - -UniValue HeirList() -{ - UniValue result(UniValue::VARR); - //result.push_back(Pair("result", "success")); - //result.push_back(Pair("name", "Heir List")); - - struct CCcontract_info *cpHeir, heirC; - - cpHeir = CCinit(&heirC, EVAL_HEIR); - _HeirList(cpHeir, result); - - return result; -} diff --git a/src/cc/oracles.cpp b/src/cc/oracles.cpp deleted file mode 100644 index e1307810b..000000000 --- a/src/cc/oracles.cpp +++ /dev/null @@ -1,1233 +0,0 @@ -// Copyright (c) 2016-2023 The Hush developers -// Distributed under the GPLv3 software license, see the accompanying -// file COPYING or https://www.gnu.org/licenses/gpl-3.0.en.html -/****************************************************************************** - * Copyright © 2014-2019 The SuperNET Developers. * - * * - * See the AUTHORS, DEVELOPER-AGREEMENT and LICENSE files at * - * the top-level directory of this distribution for the individual copyright * - * holder information and the developer policies on copyright and licensing. * - * * - * Unless otherwise agreed in a custom licensing agreement, no part of the * - * SuperNET software, including this file may be copied, modified, propagated * - * or distributed except according to the terms contained in the LICENSE file * - * * - * Removal or modification of this copyright notice is prohibited. * - * * - ******************************************************************************/ - -#include "CCOracles.h" -#include - -/* - An oracles CC has the purpose of converting offchain data into onchain data - simplest would just be to have a pubkey(s) that are trusted to provide such data, but this wont need to have a CC involved at all and can just be done by convention - - That begs the question, "what would an oracles CC do?" - A couple of things come to mind, ie. payments to oracles for future offchain data and maybe some sort of dispute/censoring ability - - first step is to define the data that the oracle is providing. A simple name:description tx can be created to define the name and description of the oracle data. - linked to this txid would be two types of transactions: - a) oracle providers - b) oracle data users - - In order to be resistant to sybil attacks, the feedback mechanism needs to have a cost. combining with the idea of payments for data, the oracle providers will be ranked by actual payments made to each oracle for each data type. - - Implementation notes: - In order to maintain good performance even under heavy usage, special marker utxo are used. Actually a pair of them. When a provider registers to be a data provider, a special unspendable normal output is created to allow for quick scanning. Since the marker is based on the oracletxid, it becomes a single address where all the providers can be found. - - A convention is used so that the datafee can be changed by registering again. it is assumed that there wont be too many of these datafee changes. if more than one from the same provider happens in the same block, the lower price is used. - - The other efficiency issue is finding the most recent data point. We want to create a linked list of all data points, going back to the first one. In order to make this efficient, a special and unique per provider/oracletxid baton utxo is used. This should have exactly one utxo, so the search would be a direct lookup and it is passed on from one data point to the next. There is some small chance that the baton utxo is spent in a non-data transaction, so provision is made to allow for recreating a baton utxo in case it isnt found. The baton utxo is a convenience and doesnt affect validation - - Required transactions: - 0) create oracle description -> just needs to create txid for oracle data - 1) register as oracle data provider with price -> become a registered oracle data provider - 2) pay provider for N oracle data points -> lock funds for oracle provider - 3) publish oracle data point -> publish data and collect payment - - The format string is a set of chars with the following meaning: - 's' -> <256 char string - 'S' -> <65536 char string - 'd' -> <256 binary data - 'D' -> <65536 binary data - 'c' -> 1 byte signed little endian number, 'C' unsigned - 't' -> 2 byte signed little endian number, 'T' unsigned - 'i' -> 4 byte signed little endian number, 'I' unsigned - 'l' -> 8 byte signed little endian number, 'L' unsigned - 'h' -> 32 byte hash - - create: - vins.*: normal inputs - vout.0: txfee tag to oracle normal address - vout.1: change, if any - vout.n-1: opreturn with name and description and format for data - - register: - vins.*: normal inputs - vout.0: txfee tag to normal marker address - vout.1: baton CC utxo - vout.2: change, if any - vout.n-1: opreturn with oracletxid, pubkey and price per data point - - subscribe: - vins.*: normal inputs - vout.0: subscription fee to publishers CC address - vout.1: change, if any - vout.n-1: opreturn with oracletxid, registered provider's pubkey, amount - - data: - vin.0: normal input - vin.1: baton CC utxo (most of the time) - vin.2+: subscription or data vout.0 - vout.0: change to publishers CC address - vout.1: baton CC utxo - vout.2: payment for dataprovider - vout.3: change, if any - vout.n-1: opreturn with oracletxid, prevbatontxid and data in proper format - - data (without payment) this is not needed as publisher can pay themselves! - vin.0: normal input - vin.1: baton CC utxo - vout.0: txfee to publishers normal address - vout.1: baton CC utxo - vout.2: change, if any - vout.n-1: opreturn with oracletxid, prevbatontxid and data in proper format - -*/ -extern int32_t hush_get_current_height(); -#define PUBKEY_SPOOFING_FIX_ACTIVATION 1563148800 -#define CC_MARKER_VALUE 10000 - -// start of consensus code -CScript EncodeOraclesCreateOpRet(uint8_t funcid,std::string name,std::string description,std::string format) -{ - CScript opret; uint8_t evalcode = EVAL_ORACLES; - opret << OP_RETURN << E_MARSHAL(ss << evalcode << funcid << name << format << description); - return(opret); -} - -uint8_t DecodeOraclesCreateOpRet(const CScript &scriptPubKey,std::string &name,std::string &description,std::string &format) -{ - std::vector vopret; uint8_t *script,e,f,funcid; - GetOpReturnData(scriptPubKey,vopret); - script = (uint8_t *)vopret.data(); - if ( vopret.size() > 2 && script[0] == EVAL_ORACLES ) - { - if ( script[1] == 'C' ) - { - if ( E_UNMARSHAL(vopret,ss >> e; ss >> f; ss >> name; ss >> format; ss >> description) != 0 ) - { - return(script[1]); - } else fprintf(stderr,"DecodeOraclesCreateOpRet unmarshal error for C\n"); - } - } - return(0); -} - -CScript EncodeOraclesOpRet(uint8_t funcid,uint256 oracletxid,CPubKey pk,int64_t num) -{ - CScript opret; uint8_t evalcode = EVAL_ORACLES; - - opret << OP_RETURN << E_MARSHAL(ss << evalcode << funcid << oracletxid << pk << num); - return(opret); -} - -uint8_t DecodeOraclesOpRet(const CScript &scriptPubKey,uint256 &oracletxid,CPubKey &pk,int64_t &num) -{ - std::vector vopret; uint8_t *script,e,f; - - GetOpReturnData(scriptPubKey,vopret); - script = (uint8_t *)vopret.data(); - if ( vopret.size() > 2 && script[0] == EVAL_ORACLES ) - { - if (script[0] == EVAL_ORACLES && (script[1]== 'R' || script[1] == 'S' || script[1] == 'F') && E_UNMARSHAL(vopret,ss >> e; ss >> f; ss >> oracletxid; ss >> pk; ss >> num)!=0) - return(f); - else return(script[1]); - } - return(0); -} - -CScript EncodeOraclesData(uint8_t funcid,uint256 oracletxid,uint256 batontxid,CPubKey pk,std::vector data) -{ - CScript opret; uint8_t evalcode = EVAL_ORACLES; - opret << OP_RETURN << E_MARSHAL(ss << evalcode << funcid << oracletxid << batontxid << pk << data); - return(opret); -} - -uint8_t DecodeOraclesData(const CScript &scriptPubKey,uint256 &oracletxid,uint256 &batontxid,CPubKey &pk,std::vector &data) -{ - std::vector vopret; uint8_t *script,e,f; - GetOpReturnData(scriptPubKey,vopret); - script = (uint8_t *)vopret.data(); - if ( vopret.size() > 2 && E_UNMARSHAL(vopret,ss >> e; ss >> f; ss >> oracletxid; ss >> batontxid; ss >> pk; ss >> data) != 0 ) - { - if ( e == EVAL_ORACLES && f == 'D' ) - return(f); - //else fprintf(stderr,"DecodeOraclesData evalcode.%d f.%c\n",e,f); - } //else fprintf(stderr,"DecodeOraclesData not enough opereturn data\n"); - return(0); -} - -CPubKey OracleBatonPk(char *batonaddr,struct CCcontract_info *cp) -{ - static secp256k1_context *ctx; - size_t clen = CPubKey::PUBLIC_KEY_SIZE; - secp256k1_pubkey pubkey; CPubKey batonpk; uint8_t priv[32]; int32_t i; - if ( ctx == 0 ) - ctx = secp256k1_context_create(SECP256K1_CONTEXT_SIGN); - Myprivkey(priv); - cp->unspendableEvalcode2 = EVAL_ORACLES; - for (i=0; i<32; i++) - cp->unspendablepriv2[i] = (priv[i] ^ cp->CCpriv[i]); - while ( secp256k1_ec_seckey_verify(ctx,cp->unspendablepriv2) == 0 ) - { - for (i=0; i<32; i++) - fprintf(stderr,"%02x",cp->unspendablepriv2[i]); - fprintf(stderr," invalid privkey\n"); - if ( secp256k1_ec_privkey_tweak_add(ctx,cp->unspendablepriv2,priv) != 0 ) - break; - } - if ( secp256k1_ec_pubkey_create(ctx,&pubkey,cp->unspendablepriv2) != 0 ) - { - secp256k1_ec_pubkey_serialize(ctx,(unsigned char*)batonpk.begin(),&clen,&pubkey,SECP256K1_EC_COMPRESSED); - cp->unspendablepk2 = batonpk; - Getscriptaddress(batonaddr,MakeCC1vout(cp->evalcode,0,batonpk).scriptPubKey); - //fprintf(stderr,"batonpk.(%s) -> %s\n",(char *)HexStr(batonpk).c_str(),batonaddr); - strcpy(cp->unspendableaddr2,batonaddr); - } else fprintf(stderr,"error creating pubkey\n"); - memset(priv,0,sizeof(priv)); - return(batonpk); -} - -int64_t OracleCurrentDatafee(uint256 reforacletxid,char *markeraddr,CPubKey publisher) -{ - uint256 txid,oracletxid,hashBlock; int64_t datafee=0,dfee; int32_t dheight=0,vout,height,numvouts; CTransaction tx; CPubKey pk; - std::vector > unspentOutputs; - SetCCunspents(unspentOutputs,markeraddr,false); - for (std::vector >::const_iterator it=unspentOutputs.begin(); it!=unspentOutputs.end(); it++) - { - txid = it->first.txhash; - vout = (int32_t)it->first.index; - height = (int32_t)it->second.blockHeight; - if ( myGetTransaction(txid,tx,hashBlock) != 0 && (numvouts= tx.vout.size()) > 0 ) - { - if ( DecodeOraclesOpRet(tx.vout[numvouts-1].scriptPubKey,oracletxid,pk,dfee) == 'R' ) - { - if ( oracletxid == reforacletxid && pk == publisher ) - { - if ( height > dheight || (height == dheight && dfee < datafee) ) - { - dheight = height; - datafee = dfee; - if ( 0 && dheight != 0 ) - fprintf(stderr,"set datafee %.8f height.%d\n",(double)datafee/COIN,height); - } - } - } - } - } - return(datafee); -} - -int64_t OracleDatafee(CScript &scriptPubKey,uint256 oracletxid,CPubKey publisher) -{ - CTransaction oracletx; char markeraddr[64]; uint256 hashBlock; std::string name,description,format; int32_t numvouts; int64_t datafee = 0; - if ( myGetTransaction(oracletxid,oracletx,hashBlock) != 0 && (numvouts= oracletx.vout.size()) > 0 ) - { - if ( DecodeOraclesCreateOpRet(oracletx.vout[numvouts-1].scriptPubKey,name,description,format) == 'C' ) - { - CCtxidaddr(markeraddr,oracletxid); - datafee = OracleCurrentDatafee(oracletxid,markeraddr,publisher); - } - else - { - fprintf(stderr,"Could not decode op_ret from transaction %s\nscriptPubKey: %s\n", oracletxid.GetHex().c_str(), oracletx.vout[numvouts-1].scriptPubKey.ToString().c_str()); - } - } - return(datafee); -} - -static uint256 myIs_baton_spentinmempool(uint256 batontxid,int32_t batonvout) -{ - std::vector tmp_txs; - myGet_mempool_txs(tmp_txs,EVAL_ORACLES,'D'); - for (std::vector::const_iterator it=tmp_txs.begin(); it!=tmp_txs.end(); it++) - { - const CTransaction &tx = *it; - if ( tx.vout.size() > 0 && tx.vin.size() > 1 && batontxid == tx.vin[1].prevout.hash && batonvout == tx.vin[1].prevout.n ) - { - const uint256 &txid = tx.GetHash(); - //char str[65]; fprintf(stderr,"found baton spent in mempool %s\n",uint256_str(str,txid)); - return(txid); - } - } - return(batontxid); -} - -uint256 OracleBatonUtxo(uint64_t txfee,struct CCcontract_info *cp,uint256 reforacletxid,char *batonaddr,CPubKey publisher,std::vector &dataarg) -{ - uint256 txid,oracletxid,hashBlock,btxid,batontxid = zeroid; int64_t dfee; int32_t dheight=0,vout,height,numvouts; CTransaction tx; CPubKey pk; uint8_t *ptr; std::vector vopret,data; - std::vector > unspentOutputs; - SetCCunspents(unspentOutputs,batonaddr,true); - for (std::vector >::const_iterator it=unspentOutputs.begin(); it!=unspentOutputs.end(); it++) - { - txid = it->first.txhash; - vout = (int32_t)it->first.index; - height = (int32_t)it->second.blockHeight; - if ( it->second.satoshis != txfee ) - { - fprintf(stderr,"it->second.satoshis %llu != %llu txfee\n",(long long)it->second.satoshis,(long long)txfee); - continue; - } - if ( myGetTransaction(txid,tx,hashBlock) != 0 && (numvouts= tx.vout.size()) > 0 ) - { - GetOpReturnData(tx.vout[numvouts-1].scriptPubKey,vopret); - if ( vopret.size() > 2 ) - { - ptr = (uint8_t *)vopret.data(); - if ( (ptr[1] == 'D' && DecodeOraclesData(tx.vout[numvouts-1].scriptPubKey,oracletxid,btxid,pk,data) == 'D') || (ptr[1] == 'R' && DecodeOraclesOpRet(tx.vout[numvouts-1].scriptPubKey,oracletxid,pk,dfee) == 'R') ) - { - if ( oracletxid == reforacletxid && pk == publisher ) - { - if ( height > dheight ) - { - dheight = height; - batontxid = txid; - if ( ptr[1] == 'D' ) - dataarg = data; - //char str[65]; fprintf(stderr,"set batontxid %s height.%d\n",uint256_str(str,batontxid),height); - } - } - } - } - } - } - while ( myIsutxo_spentinmempool(ignoretxid,ignorevin,batontxid,1) != 0 ) - batontxid = myIs_baton_spentinmempool(batontxid,1); - return(batontxid); -} - -uint256 OraclesBatontxid(uint256 reforacletxid,CPubKey refpk) -{ - std::vector > unspentOutputs; - CTransaction regtx; uint256 hash,txid,batontxid,oracletxid; CPubKey pk; int32_t numvouts,height,maxheight=0; int64_t datafee; char markeraddr[64],batonaddr[64]; std::vector data; struct CCcontract_info *cp,C; - batontxid = zeroid; - cp = CCinit(&C,EVAL_ORACLES); - CCtxidaddr(markeraddr,reforacletxid); - SetCCunspents(unspentOutputs,markeraddr,false); - //char str[67]; fprintf(stderr,"markeraddr.(%s) %s\n",markeraddr,pubkey33_str(str,(uint8_t *)&refpk)); - for (std::vector >::const_iterator it=unspentOutputs.begin(); it!=unspentOutputs.end(); it++) - { - txid = it->first.txhash; - //fprintf(stderr,"check %s\n",uint256_str(str,txid)); - height = (int32_t)it->second.blockHeight; - if ( myGetTransaction(txid,regtx,hash) != 0 ) - { - if ( regtx.vout.size() > 0 && DecodeOraclesOpRet(regtx.vout[regtx.vout.size()-1].scriptPubKey,oracletxid,pk,datafee) == 'R' && oracletxid == reforacletxid && pk == refpk ) - { - Getscriptaddress(batonaddr,regtx.vout[1].scriptPubKey); - batontxid = OracleBatonUtxo(10000,cp,oracletxid,batonaddr,pk,data); - break; - } - } - } - return(batontxid); -} - -int32_t oracle_format(uint256 *hashp,int64_t *valp,char *str,uint8_t fmt,uint8_t *data,int32_t offset,int32_t datalen) -{ - char _str[65]; int32_t sflag = 0,i,val32,len = 0,slen = 0,dlen = 0; uint32_t uval32; uint16_t uval16; int16_t val16; int64_t val = 0; uint64_t uval = 0; - *valp = 0; - *hashp = zeroid; - if ( str != 0 ) - str[0] = 0; - switch ( fmt ) - { - case 's': slen = data[offset++]; break; - case 'S': slen = data[offset++]; slen |= ((int32_t)data[offset++] << 8); break; - case 'd': dlen = data[offset++]; break; - case 'D': dlen = data[offset++]; dlen |= ((int32_t)data[offset++] << 8); break; - case 'c': len = 1; sflag = 1; break; - case 'C': len = 1; break; - case 't': len = 2; sflag = 1; break; - case 'T': len = 2; break; - case 'i': len = 4; sflag = 1; break; - case 'I': len = 4; break; - case 'l': len = 8; sflag = 1; break; - case 'L': len = 8; break; - case 'h': len = 32; break; - default: return(-1); break; - } - if ( slen != 0 ) - { - if ( str != 0 ) - { - if ( slen < DRAGON_MAXSCRIPTSIZE && offset+slen <= datalen ) - { - for (i=0; i data,std::string format) -{ - int64_t offset=0,len=0; char fmt; - - for (int i=0; idata.size()-offset) return (0); - if (fmt=='S' || fmt=='s') - { - for (int j=offset;j127) return (0); - } - offset+=len; - } - if (offset!=data.size()) return (0); - else return (offset); -} - -int64_t _correlate_price(int64_t *prices,int32_t n,int64_t price) -{ - int32_t i,count = 0; int64_t diff,threshold = (price >> 8); - for (i=0; i> 1) ) - return(0); - else return(price); -} - -int64_t correlate_price(int32_t height,int64_t *prices,int32_t n) -{ - int32_t i,j; int64_t price = 0; - if ( n == 1 ) - return(prices[0]); - for (i=0; i %llu ht.%d\n",(long long)price,height); - return(price); -} - -int64_t OracleCorrelatedPrice(int32_t height,std::vector origprices) -{ - std::vector sorted; int32_t i,n; int64_t *prices,price; - if ( (n= origprices.size()) == 1 ) - return(origprices[0]); - std::sort(origprices.begin(), origprices.end()); - prices = (int64_t *)calloc(n,sizeof(*prices)); - i = 0; - for (std::vector::const_iterator it=sorted.begin(); it!=sorted.end(); it++) - prices[i++] = *it; - price = correlate_price(height,prices,i); - free(prices); - return(price); -} - -int32_t oracleprice_add(std::vector &publishers,CPubKey pk,int32_t height,std::vector data,int32_t maxheight) -{ - struct oracleprice_info item; int32_t flag = 0; - for (std::vector::iterator it=publishers.begin(); it!=publishers.end(); it++) - { - if ( pk == it->pk ) - { - flag = 1; - if ( height > it->height ) - { - it->height = height; - it->data = data; - return(height); - } - } - } - if ( flag == 0 ) - { - item.pk = pk; - item.data = data; - item.height = height; - publishers.push_back(item); - return(height); - } else return(0); -} - -/*int64_t OraclePrice(int32_t height,uint256 reforacletxid,char *markeraddr,char *format) -{ - std::vector > unspentOutputs; - CTransaction regtx; uint256 hash,txid,oracletxid,batontxid; CPubKey pk; int32_t i,ht,maxheight=0; int64_t datafee,price; char batonaddr[64]; std::vector data; struct CCcontract_info *cp,C; std::vector publishers; std::vector prices; - if ( format[0] != 'L' ) - return(0); - cp = CCinit(&C,EVAL_ORACLES); - SetCCunspents(unspentOutputs,markeraddr,false); - for (std::vector >::const_iterator it=unspentOutputs.begin(); it!=unspentOutputs.end(); it++) - { - txid = it->first.txhash; - ht = (int32_t)it->second.blockHeight; - if ( myGetTransaction(txid,regtx,hash) != 0 ) - { - if ( regtx.vout.size() > 0 && DecodeOraclesOpRet(regtx.vout[regtx.vout.size()-1].scriptPubKey,oracletxid,pk,datafee) == 'R' && oracletxid == reforacletxid ) - { - Getscriptaddress(batonaddr,regtx.vout[1].scriptPubKey); - batontxid = OracleBatonUtxo(10000,cp,oracletxid,batonaddr,pk,data); - if ( batontxid != zeroid && (ht= oracleprice_add(publishers,pk,ht,data,maxheight)) > maxheight ) - maxheight = ht; - } - } - } - if ( maxheight > 10 ) - { - for (std::vector::const_iterator it=publishers.begin(); it!=publishers.end(); it++) - { - if ( it->height >= maxheight-10 ) - { - oracle_format(&hash,&price,0,'L',(uint8_t *)it->data.data(),0,(int32_t)it->data.size()); - if ( price != 0 ) - prices.push_back(price); - } - } - return(OracleCorrelatedPrice(height,prices)); - } - return(0); -}*/ - -int64_t IsOraclesvout(struct CCcontract_info *cp,const CTransaction& tx,int32_t v) -{ - //char destaddr[64]; - if ( tx.vout[v].scriptPubKey.IsPayToCryptoCondition() != 0 ) - { - //if ( Getscriptaddress(destaddr,tx.vout[v].scriptPubKey) > 0 && strcmp(destaddr,cp->unspendableCCaddr) == 0 ) - return(tx.vout[v].nValue); - } - return(0); -} - -bool OraclesDataValidate(struct CCcontract_info *cp,Eval* eval,const CTransaction &tx,uint256 oracletxid,CPubKey publisher,int64_t datafee) -{ - static uint256 zerohash; - CTransaction vinTx; uint256 hashBlock,activehash; int32_t i,numvins,numvouts; int64_t inputs=0,outputs=0,assetoshis; CScript scriptPubKey; - numvins = tx.vin.size(); - numvouts = tx.vout.size(); - if ( OracleDatafee(scriptPubKey,oracletxid,publisher) != datafee ) - return eval->Invalid("mismatched datafee"); - scriptPubKey = MakeCC1vout(cp->evalcode,0,publisher).scriptPubKey; - for (i=0; iismyvin)(tx.vin[i].scriptSig) != 0 ) - { - if ( i == 0 ) - return eval->Invalid("unexpected vin.0 is CC"); - //fprintf(stderr,"vini.%d check mempool\n",i); - else if ( eval->GetTxUnconfirmed(tx.vin[i].prevout.hash,vinTx,hashBlock) == 0 ) - return eval->Invalid("cant find vinTx"); - else - { - //fprintf(stderr,"vini.%d check hash and vout\n",i); - //if ( hashBlock == zerohash ) - // return eval->Invalid("cant Oracles from mempool"); - if ( (assetoshis= IsOraclesvout(cp,vinTx,tx.vin[i].prevout.n)) != 0 ) - { - if ( i == 1 && vinTx.vout[1].scriptPubKey != tx.vout[1].scriptPubKey ) - return eval->Invalid("baton violation"); - else if ( i != 1 && scriptPubKey == vinTx.vout[tx.vin[i].prevout.n].scriptPubKey ) - inputs += assetoshis; - } - } - } - } - for (i=0; iInvalid("invalid CC vout CC destination"); - } - } - } - } - if ( inputs != outputs+datafee ) - { - fprintf(stderr,"inputs %llu vs outputs %llu + datafee %llu\n",(long long)inputs,(long long)outputs,(long long)datafee); - return eval->Invalid("mismatched inputs != outputs + datafee"); - } - else return(true); -} - -/*nt32_t GetLatestTimestamp(int32_t height) -{ - if ( HUSH_NSPV_SUPERLITE ) return (NSPV_blocktime(height)); - return(hush_heightstamp(height)); -} */ - -bool OraclesValidate(struct CCcontract_info *cp,Eval* eval,const CTransaction &tx, uint32_t nIn) -{ - uint256 oracletxid,batontxid,txid; uint64_t txfee=10000; int32_t numvins,numvouts,preventCCvins,preventCCvouts; int64_t amount; uint256 hashblock; - uint8_t *script; std::vector vopret,data; CPubKey publisher,tmppk,oraclespk; char tmpaddress[64],vinaddress[64],oraclesaddr[64]; - CTransaction tmptx; std::string name,desc,format; - - numvins = tx.vin.size(); - numvouts = tx.vout.size(); - preventCCvins = preventCCvouts = -1; - if ( numvouts < 1 ) - return eval->Invalid("no vouts"); - else - { - GetOpReturnData(tx.vout[numvouts-1].scriptPubKey,vopret); - if ( vopret.size() > 2 ) - { - oraclespk=GetUnspendable(cp,0); - Getscriptaddress(oraclesaddr,CScript() << ParseHex(HexStr(oraclespk)) << OP_CHECKSIG); - script = (uint8_t *)vopret.data(); - switch ( script[1] ) - { - case 'C': // create - // vins.*: normal inputs - // vout.0: txfee tag to oracle normal address - // vout.1: change, if any - // vout.n-1: opreturn with name and description and format for data - return eval->Invalid("unexpected OraclesValidate for create"); - break; - case 'F': // fund (activation on Jul 15th 2019 00:00) - // vins.*: normal inputs - // vout.0: txfee to oracle CC address of users pubkey - // vout.1: change, if any - // vout.n-1: opreturn with createtxid, pubkey and amount - return eval->Invalid("unexpected OraclesValidate for create"); - break; - case 'R': // register - // vin.0: normal inputs - // vin.n-1: CC input from pubkeys oracle CC addres - to prove that register came from pubkey that is registred (activation on Jul 15th 2019 00:00) - // vout.0: txfee tag to normal marker address - // vout.1: baton CC utxo - // vout.2: marker from oraclesfund tx to normal pubkey address (activation on Jul 15th 2019 00:00) - // vout.n-2: change, if any - // vout.n-1: opreturn with createtxid, pubkey and price per data point - if (GetLatestTimestamp(eval->GetCurrentHeight())>PUBKEY_SPOOFING_FIX_ACTIVATION) - { - if ((numvouts=tx.vout.size()) < 1 || DecodeOraclesOpRet(tx.vout[numvouts-1].scriptPubKey,oracletxid,tmppk,amount)!='R') - return eval->Invalid("invalid oraclesregister OP_RETURN data!"); - else if (myGetTransaction(oracletxid,tmptx,hashblock) == 0) - return eval->Invalid("invalid oraclescreate txid!"); - else if ((numvouts=tmptx.vout.size()) < 1 || DecodeOraclesCreateOpRet(tmptx.vout[numvouts-1].scriptPubKey,name,desc,format)!='C') - return eval->Invalid("invalid oraclescreate OP_RETURN data!"); - else if ( IsCCInput(tmptx.vin[0].scriptSig) != 0 ) - return eval->Invalid("vin.0 is normal for oraclescreate!"); - else if (ConstrainVout(tmptx.vout[0],0,oraclesaddr,txfee)==0) - return eval->Invalid("invalid marker for oraclescreate!"); - else if ( IsCCInput(tx.vin[0].scriptSig) != 0 ) - return eval->Invalid("vin.0 is normal for oraclesregister!"); - else if ((*cp->ismyvin)(tx.vin[1].scriptSig) == 0 && (*cp->ismyvin)(tx.vin[tx.vin.size()-1].scriptSig) == 0) - return eval->Invalid("there is no CC vin from oraclesfund tx"); - else if ((*cp->ismyvin)(tx.vin[1].scriptSig) == 1 && (myGetTransaction(tx.vin[1].prevout.hash,tmptx,hashblock)==0 || DecodeOraclesOpRet(tmptx.vout[tmptx.vout.size()-1].scriptPubKey,txid,tmppk,amount)!='F' - || tmptx.vout[tx.vin[1].prevout.n].nValue!=CC_MARKER_VALUE || !Getscriptaddress(vinaddress,tmptx.vout[tx.vin[1].prevout.n].scriptPubKey) - || !GetCCaddress(cp,tmpaddress,tmppk) || strcmp(tmpaddress,vinaddress)!=0) || oracletxid!=txid) - return eval->Invalid("invalid vin.1 for oraclesregister, it must be CC vin or pubkey not same as vin pubkey, register and fund tx must be done from owner of pubkey that registers to oracle!!"); - else if ((*cp->ismyvin)(tx.vin[tx.vin.size()-1].scriptSig) == 1 && (myGetTransaction(tx.vin[tx.vin.size()-1].prevout.hash,tmptx,hashblock)==0 || DecodeOraclesOpRet(tmptx.vout[tmptx.vout.size()-1].scriptPubKey,txid,tmppk,amount)!='F' - || tmptx.vout[tx.vin[tx.vin.size()-1].prevout.n].nValue!=CC_MARKER_VALUE || !Getscriptaddress(vinaddress,tmptx.vout[tx.vin[tx.vin.size()-1].prevout.n].scriptPubKey) - || !GetCCaddress(cp,tmpaddress,tmppk) || strcmp(tmpaddress,vinaddress)!=0) || oracletxid!=txid) - return eval->Invalid("invalid vin."+std::to_string(tx.vin.size()-1)+" for oraclesregister, it must be CC vin or pubkey not same as vin pubkey, register and fund tx must be done from owner of pubkey that registers to oracle!!"); - else if (CCtxidaddr(tmpaddress,oracletxid).IsValid() && ConstrainVout(tx.vout[0],0,tmpaddress,txfee)==0) - return eval->Invalid("invalid marker for oraclesregister!"); - else if (!Getscriptaddress(tmpaddress,CScript() << ParseHex(HexStr(tmppk)) << OP_CHECKSIG) || ConstrainVout(tx.vout[2],0,tmpaddress,CC_MARKER_VALUE)==0) - return eval->Invalid("pubkey in OP_RETURN and in vout.2 not matching, register must be done from owner of pubkey that registers to oracle!"); - } - else return eval->Invalid("unexpected OraclesValidate for register"); - break; - case 'S': // subscribe - // vins.*: normal inputs - // vout.0: subscription fee to publishers CC address - // vout.1: change, if any - // vout.n-1: opreturn with createtxid, registered provider's pubkey, amount - return eval->Invalid("unexpected OraclesValidate for subscribe"); - break; - case 'D': // data - // vin.0: normal input - // vin.1: baton CC utxo (most of the time) - // vin.2+: subscription vout.0 - // vout.0: change to publishers CC address - // vout.1: baton CC utxo - // vout.2: payment for dataprovider - // vout.3: change, if any - if ( numvins >= 2 && numvouts >= 3 && DecodeOraclesData(tx.vout[numvouts-1].scriptPubKey,oracletxid,batontxid,publisher,data) == 'D' ) - { - if ( OraclesDataValidate(cp,eval,tx,oracletxid,publisher,tx.vout[2].nValue) != 0 ) - { - return(true); - } else return(false); - } - return eval->Invalid("unexpected OraclesValidate 'D' tx invalid"); - break; - default: - fprintf(stderr,"illegal oracles funcid.(%c)\n",script[1]); - return eval->Invalid("unexpected OraclesValidate funcid"); - break; - } - } else return eval->Invalid("unexpected oracles missing funcid"); - return(PreventCC(eval,tx,preventCCvins,numvins,preventCCvouts,numvouts)); - } - return(true); -} -// end of consensus code - -// helper functions for rpc calls in rpcwallet.cpp - -int64_t AddOracleInputs(struct CCcontract_info *cp,CMutableTransaction &mtx,uint256 oracletxid,CPubKey pk,int64_t total,int32_t maxinputs) -{ - char coinaddr[64],funcid; int64_t nValue,price,totalinputs = 0; uint256 tmporacletxid,tmpbatontxid,txid,hashBlock; std::vector origpubkey,data; CTransaction vintx; int32_t numvouts,vout,n = 0; - std::vector > unspentOutputs; CPubKey tmppk; int64_t tmpnum; - GetCCaddress(cp,coinaddr,pk); - SetCCunspents(unspentOutputs,coinaddr,true); - //fprintf(stderr,"addoracleinputs from (%s)\n",coinaddr); - for (std::vector >::const_iterator it=unspentOutputs.begin(); it!=unspentOutputs.end(); it++) - { - txid = it->first.txhash; - vout = (int32_t)it->first.index; - //char str[65]; fprintf(stderr,"oracle check %s/v%d\n",uint256_str(str,txid),vout); - if ( myGetTransaction(txid,vintx,hashBlock) != 0 && (numvouts=vintx.vout.size()-1)>0) - { - if ((funcid=DecodeOraclesOpRet(vintx.vout[numvouts].scriptPubKey,tmporacletxid,tmppk,tmpnum))!=0 && (funcid=='S' || funcid=='D')) - { - if (funcid=='D' && DecodeOraclesData(vintx.vout[numvouts].scriptPubKey,tmporacletxid,tmpbatontxid,tmppk,data)==0) - fprintf(stderr,"invalid oraclesdata transaction \n"); - else if (tmporacletxid==oracletxid) - { - // get valid CC payments - if ( (nValue= IsOraclesvout(cp,vintx,vout)) >= 10000 && myIsutxo_spentinmempool(ignoretxid,ignorevin,txid,vout) == 0 ) - { - if ( total != 0 && maxinputs != 0 ) - mtx.vin.push_back(CTxIn(txid,vout,CScript())); - nValue = it->second.satoshis; - totalinputs += nValue; - n++; - if ( (total > 0 && totalinputs >= total) || (maxinputs > 0 && n >= maxinputs) ) - break; - } //else fprintf(stderr,"nValue %.8f or utxo memspent\n",(double)nValue/COIN); - } - } - } else fprintf(stderr,"couldnt find transaction\n"); - } - return(totalinputs); -} - -int64_t LifetimeOraclesFunds(struct CCcontract_info *cp,uint256 oracletxid,CPubKey publisher) -{ - char coinaddr[64]; CPubKey pk; int64_t total=0,num; uint256 txid,hashBlock,subtxid; CTransaction subtx; - std::vector txids; - GetCCaddress(cp,coinaddr,publisher); - SetCCtxids(txids,coinaddr,true,cp->evalcode,oracletxid,'S'); - //fprintf(stderr,"scan lifetime of %s\n",coinaddr); - for (std::vector::const_iterator it=txids.begin(); it!=txids.end(); it++) - { - txid = *it; - if ( myGetTransaction(txid,subtx,hashBlock) != 0 ) - { - if ( subtx.vout.size() > 0 && DecodeOraclesOpRet(subtx.vout[subtx.vout.size()-1].scriptPubKey,subtxid,pk,num) == 'S' && subtxid == oracletxid && pk == publisher ) - { - total += subtx.vout[0].nValue; - } - } - } - return(total); -} - -int64_t AddMyOraclesFunds(struct CCcontract_info *cp,CMutableTransaction &mtx,CPubKey pk,uint256 oracletxid) -{ - char coinaddr[64],funcid; int64_t nValue,tmpamount; uint256 tmporacletxid,txid,hashBlock,ignoretxid; int32_t numvouts,vout,ignorevin; - std::vector > unspentOutputs; CTransaction vintx; CPubKey tmppk; - - GetCCaddress(cp,coinaddr,pk); - SetCCunspents(unspentOutputs,coinaddr,true); - for (std::vector >::const_iterator it=unspentOutputs.begin(); it!=unspentOutputs.end(); it++) - { - txid = it->first.txhash; - vout = (int32_t)it->first.index; - nValue = it->second.satoshis; - if ( myGetTransaction(txid,vintx,hashBlock) != 0 && (numvouts=vintx.vout.size())>0) - { - if ((funcid=DecodeOraclesOpRet(vintx.vout[numvouts-1].scriptPubKey,tmporacletxid,tmppk,tmpamount))!=0 && funcid=='F' && tmppk==pk - && tmporacletxid==oracletxid && tmpamount==nValue && myIsutxo_spentinmempool(ignoretxid,ignorevin,txid,vout)==0) - { - mtx.vin.push_back(CTxIn(txid,vout,CScript())); - return (nValue); - } - } else fprintf(stderr,"couldnt find transaction\n"); - } - - std::vector tmp_txs; - myGet_mempool_txs(tmp_txs,EVAL_ORACLES,'F'); - for (std::vector::const_iterator it=tmp_txs.begin(); it!=tmp_txs.end(); it++) - { - const CTransaction &txmempool = *it; - const uint256 &hash = txmempool.GetHash(); - nValue=txmempool.vout[0].nValue; - - if ((funcid=DecodeOraclesOpRet(txmempool.vout[txmempool.vout.size()-1].scriptPubKey,tmporacletxid,tmppk,tmpamount))!=0 && funcid=='F' - && tmppk==pk && tmporacletxid==oracletxid && tmpamount==nValue && myIsutxo_spentinmempool(ignoretxid,ignorevin,hash,0)==0) - { - mtx.vin.push_back(CTxIn(hash,0,CScript())); - return (nValue); - } - } - return (0); -} - -UniValue OracleCreate(const CPubKey& pk, int64_t txfee,std::string name,std::string description,std::string format) -{ - CMutableTransaction mtx = CreateNewContextualCMutableTransaction(Params().GetConsensus(), hush_nextheight()); - CPubKey mypk,Oraclespk; struct CCcontract_info *cp,C; char fmt; - - cp = CCinit(&C,EVAL_ORACLES); - if ( name.size() > 32) - CCERR_RESULT("oraclescc",CCLOG_INFO, stream << "name."<< (int32_t)name.size() << " must be less then 32"); - if (description.size() > 4096) - CCERR_RESULT("oraclescc",CCLOG_INFO, stream << "description."<< (int32_t)description.size() << " must be less then 4096"); - if (format.size() > 4096 ) - CCERR_RESULT("oraclescc",CCLOG_INFO, stream << "format."<< (int32_t)format.size() << " must be less then 4096"); - if ( name.size() == 0 ) - CCERR_RESULT("oraclescc",CCLOG_INFO, stream << "name must not be empty"); - for(int i = 0; i < format.size(); i++) - { - fmt=format[i]; - switch (fmt) - { - case 's': case 'S': case 'd': case 'D': - case 'c': case 'C': case 't': case 'T': - case 'i': case 'I': case 'l': case 'L': - case 'h': break; - default: CCERR_RESULT("oraclescc",CCLOG_INFO, stream << "invalid format type"); - } - } - if ( txfee == 0 ) - txfee = 10000; - mypk = pk.IsValid()?pk:pubkey2pk(Mypubkey()); - Oraclespk = GetUnspendable(cp,0); - if ( AddNormalinputs(mtx,mypk,2*txfee,3,pk.IsValid()) > 0 ) - { - mtx.vout.push_back(CTxOut(txfee,CScript() << ParseHex(HexStr(Oraclespk)) << OP_CHECKSIG)); - return(FinalizeCCTxExt(pk.IsValid(),0,cp,mtx,mypk,txfee,EncodeOraclesCreateOpRet('C',name,description,format))); - } - CCERR_RESULT("oraclescc",CCLOG_INFO, stream << "error adding normal inputs"); -} - -UniValue OracleFund(const CPubKey& pk, int64_t txfee,uint256 oracletxid) -{ - CMutableTransaction mtx = CreateNewContextualCMutableTransaction(Params().GetConsensus(), hush_nextheight()); CTransaction tx; - CPubKey mypk,oraclespk; struct CCcontract_info *cp,C; std::string name,desc,format; int32_t numvouts; uint256 hashBlock; - - if (GetLatestTimestamp(hush_currentheight())evalcode,CC_MARKER_VALUE,mypk)); - return(FinalizeCCTxExt(pk.IsValid(),0,cp,mtx,mypk,txfee,EncodeOraclesOpRet('F',oracletxid,mypk,CC_MARKER_VALUE))); - } - CCERR_RESULT("oraclescc",CCLOG_INFO, stream << "error adding normal inputs"); -} - -UniValue OracleRegister(const CPubKey& pk, int64_t txfee,uint256 oracletxid,int64_t datafee) -{ - CMutableTransaction mtx = CreateNewContextualCMutableTransaction(Params().GetConsensus(), hush_nextheight()); - CPubKey mypk,markerpubkey,batonpk,oraclespk; struct CCcontract_info *cp,C; char markeraddr[64],batonaddr[64]; - std::string name,desc,format; int32_t numvouts; uint256 hashBlock; CTransaction tx; - - cp = CCinit(&C,EVAL_ORACLES); - if ( txfee == 0 ) - txfee = 10000; - if (myGetTransaction(oracletxid,tx,hashBlock)==0 || (numvouts=tx.vout.size())<=0) - CCERR_RESULT("oraclecc",CCLOG_INFO, stream << "cant find oracletxid " << oracletxid.GetHex()); - if (DecodeOraclesCreateOpRet(tx.vout[numvouts-1].scriptPubKey,name,desc,format)!='C') - CCERR_RESULT("oraclecc",CCLOG_INFO, stream << "invalid oracletxid " << oracletxid.GetHex()); - if ( datafee < txfee ) - CCERR_RESULT("oraclescc",CCLOG_INFO, stream << "datafee must be txfee or more"); - mypk = pk.IsValid()?pk:pubkey2pk(Mypubkey()); - oraclespk = GetUnspendable(cp,0); - batonpk = OracleBatonPk(batonaddr,cp); - markerpubkey = CCtxidaddr(markeraddr,oracletxid); - if (AddNormalinputs(mtx,mypk,3*txfee,4,pk.IsValid())) - { - if (GetLatestTimestamp(hush_currentheight())>PUBKEY_SPOOFING_FIX_ACTIVATION && AddMyOraclesFunds(cp,mtx,mypk,oracletxid)!=CC_MARKER_VALUE) - CCERR_RESULT("oraclescc",CCLOG_INFO, stream << "error adding inputs from your Oracles CC address, please fund it first with oraclesfund rpc!"); - mtx.vout.push_back(CTxOut(txfee,CScript() << ParseHex(HexStr(markerpubkey)) << OP_CHECKSIG)); - mtx.vout.push_back(MakeCC1vout(cp->evalcode,txfee,batonpk)); - if (GetLatestTimestamp(hush_get_current_height())>PUBKEY_SPOOFING_FIX_ACTIVATION) mtx.vout.push_back(CTxOut(txfee,CScript() << ParseHex(HexStr(mypk)) << OP_CHECKSIG)); - return(FinalizeCCTxExt(pk.IsValid(),0,cp,mtx,mypk,txfee,EncodeOraclesOpRet('R',oracletxid,mypk,datafee))); - } - CCERR_RESULT("oraclescc",CCLOG_INFO, stream << "error adding normal inputs"); -} - -UniValue OracleSubscribe(const CPubKey& pk, int64_t txfee,uint256 oracletxid,CPubKey publisher,int64_t amount) -{ - CMutableTransaction mtx = CreateNewContextualCMutableTransaction(Params().GetConsensus(), hush_nextheight()); CTransaction tx; - CPubKey mypk,markerpubkey; struct CCcontract_info *cp,C; char markeraddr[64]; std::string name,desc,format; int32_t numvouts; uint256 hashBlock; - cp = CCinit(&C,EVAL_ORACLES); - if ( txfee == 0 ) - txfee = 10000; - if (myGetTransaction(oracletxid,tx,hashBlock)==0 || (numvouts=tx.vout.size())<=0) - CCERR_RESULT("oraclecc",CCLOG_INFO, stream << "cant find oracletxid " << oracletxid.GetHex()); - if (DecodeOraclesCreateOpRet(tx.vout[numvouts-1].scriptPubKey,name,desc,format)!='C') - CCERR_RESULT("oraclecc",CCLOG_INFO, stream << "invalid oracletxid " << oracletxid.GetHex()); - mypk = pk.IsValid()?pk:pubkey2pk(Mypubkey()); - markerpubkey = CCtxidaddr(markeraddr,oracletxid); - if ( AddNormalinputs(mtx,mypk,amount + 2*txfee,64,pk.IsValid()) > 0 ) - { - mtx.vout.push_back(MakeCC1vout(cp->evalcode,amount,publisher)); - mtx.vout.push_back(CTxOut(txfee,CScript() << ParseHex(HexStr(markerpubkey)) << OP_CHECKSIG)); - return(FinalizeCCTxExt(pk.IsValid(),0,cp,mtx,mypk,txfee,EncodeOraclesOpRet('S',oracletxid,mypk,amount))); - } - CCERR_RESULT("oraclescc",CCLOG_INFO, stream << "error adding normal inputs"); -} - -UniValue OracleData(const CPubKey& pk, int64_t txfee,uint256 oracletxid,std::vector data) -{ - CMutableTransaction mtx = CreateNewContextualCMutableTransaction(Params().GetConsensus(), hush_nextheight()); - CScript pubKey; CPubKey mypk,batonpk; int64_t offset,datafee,inputs,CCchange = 0; struct CCcontract_info *cp,C; uint256 batontxid,hashBlock; - char coinaddr[64],batonaddr[64]; std::vector prevdata; CTransaction tx; std::string name,description,format; int32_t len,numvouts; - - cp = CCinit(&C,EVAL_ORACLES); - mypk = pk.IsValid()?pk:pubkey2pk(Mypubkey()); - if ( data.size() > 8192 ) - CCERR_RESULT("oraclescc",CCLOG_INFO, stream << "datasize " << (int32_t)data.size() << " is too big"); - if ( (datafee= OracleDatafee(pubKey,oracletxid,mypk)) <= 0 ) - CCERR_RESULT("oraclescc",CCLOG_INFO, stream << "datafee " << (double)datafee/COIN << "is illegal"); - if ( myGetTransaction(oracletxid,tx,hashBlock) != 0 && (numvouts=tx.vout.size()) > 0 ) - { - if ( DecodeOraclesCreateOpRet(tx.vout[numvouts-1].scriptPubKey,name,description,format) == 'C' ) - { - if (oracle_parse_data_format(data,format)==0) - CCERR_RESULT("oraclescc",CCLOG_INFO, stream << "data does not match length or content format specification"); - } - else - CCERR_RESULT("oraclescc",CCLOG_INFO, stream << "invalid oracle txid opret data"); - } - else - CCERR_RESULT("oraclescc",CCLOG_INFO, stream << "invalid oracle txid"); - if ( txfee == 0 ) - txfee = 10000; - GetCCaddress(cp,coinaddr,mypk); - if ( AddNormalinputs(mtx,mypk,2*txfee,3,pk.IsValid()) > 0 ) // have enough funds even if baton utxo not there - { - batonpk = OracleBatonPk(batonaddr,cp); - batontxid = OracleBatonUtxo(txfee,cp,oracletxid,batonaddr,mypk,prevdata); - if ( batontxid != zeroid ) // not impossible to fail, but hopefully a very rare event - mtx.vin.push_back(CTxIn(batontxid,1,CScript())); - else fprintf(stderr,"warning: couldnt find baton utxo %s\n",batonaddr); - if ( (inputs= AddOracleInputs(cp,mtx,oracletxid,mypk,datafee,60)) > 0 ) - { - if ( inputs > datafee ) - CCchange = (inputs - datafee); - mtx.vout.push_back(MakeCC1vout(cp->evalcode,CCchange,mypk)); - mtx.vout.push_back(MakeCC1vout(cp->evalcode,CC_MARKER_VALUE,batonpk)); - mtx.vout.push_back(CTxOut(datafee,CScript() << ParseHex(HexStr(mypk)) << OP_CHECKSIG)); - return(FinalizeCCTxExt(pk.IsValid(),0,cp,mtx,mypk,txfee,EncodeOraclesData('D',oracletxid,batontxid,mypk,data))); - } else - CCERR_RESULT("oraclescc",CCLOG_INFO, stream << "couldnt find enough oracle inputs " << coinaddr << ", limit 1 per utxo"); - } - CCERR_RESULT("oraclescc",CCLOG_INFO, stream << "couldnt add normal inputs"); -} - -UniValue OracleFormat(uint8_t *data,int32_t datalen,char *format,int32_t formatlen) -{ - UniValue obj(UniValue::VARR); uint256 hash; int32_t i,j=0; int64_t val; char str[DRAGON_MAXSCRIPTSIZE*2+1]; - for (i=0; i= datalen ) - break; - } - return(obj); -} - -UniValue OracleDataSample(uint256 reforacletxid,uint256 txid) -{ - UniValue result(UniValue::VOBJ); CTransaction tx,oracletx; uint256 hashBlock,btxid,oracletxid; std::string error; - CPubKey pk; std::string name,description,format; int32_t numvouts; std::vector data; char str[67], *formatstr = 0; - - result.push_back(Pair("result","success")); - if ( myGetTransaction(reforacletxid,oracletx,hashBlock) != 0 && (numvouts=oracletx.vout.size()) > 0 ) - { - if ( DecodeOraclesCreateOpRet(oracletx.vout[numvouts-1].scriptPubKey,name,description,format) == 'C' ) - { - if ( myGetTransaction(txid,tx,hashBlock) != 0 && (numvouts=tx.vout.size()) > 0 ) - { - if ( DecodeOraclesData(tx.vout[numvouts-1].scriptPubKey,oracletxid,btxid,pk,data) == 'D' && reforacletxid == oracletxid ) - { - if ( (formatstr= (char *)format.c_str()) == 0 ) - formatstr = (char *)""; - result.push_back(Pair("txid",uint256_str(str,txid))); - result.push_back(Pair("data",OracleFormat((uint8_t *)data.data(),(int32_t)data.size(),formatstr,(int32_t)format.size()))); - return(result); - } - else error="invalid data tx"; - } - else error="cannot find data txid"; - } - else error="invalid oracles txid"; - } - else error="cannot find oracles txid"; - result.push_back(Pair("result","error")); - result.push_back(Pair("error",error)); - return(result); -} - -UniValue OracleDataSamples(uint256 reforacletxid,char* batonaddr,int32_t num) -{ - UniValue result(UniValue::VOBJ),b(UniValue::VARR); CTransaction tx,oracletx; uint256 txid,hashBlock,btxid,oracletxid; - CPubKey pk; std::string name,description,format; int32_t numvouts,n=0,vout; std::vector data; char *formatstr = 0, addr[64]; - std::vector txids; int64_t nValue; - - result.push_back(Pair("result","success")); - if ( myGetTransaction(reforacletxid,oracletx,hashBlock) != 0 && (numvouts=oracletx.vout.size()) > 0 ) - { - if ( DecodeOraclesCreateOpRet(oracletx.vout[numvouts-1].scriptPubKey,name,description,format) == 'C' ) - { - std::vector tmp_txs; - myGet_mempool_txs(tmp_txs,EVAL_ORACLES,'D'); - for (std::vector::const_iterator it=tmp_txs.begin(); it!=tmp_txs.end(); it++) - { - const CTransaction &txmempool = *it; - const uint256 &hash = txmempool.GetHash(); - if ((numvouts=txmempool.vout.size())>0 && txmempool.vout[1].nValue==CC_MARKER_VALUE && DecodeOraclesData(txmempool.vout[numvouts-1].scriptPubKey,oracletxid,btxid,pk,data) == 'D' && reforacletxid == oracletxid ) - { - Getscriptaddress(addr,txmempool.vout[1].scriptPubKey); - if (strcmp(addr,batonaddr)!=0) continue; - if ( (formatstr= (char *)format.c_str()) == 0 ) - formatstr = (char *)""; - UniValue a(UniValue::VOBJ); - a.push_back(Pair("txid",hash.GetHex())); - a.push_back(Pair("data",OracleFormat((uint8_t *)data.data(),(int32_t)data.size(),formatstr,(int32_t)format.size()))); - b.push_back(a); - if ( ++n >= num && num != 0) - { - result.push_back(Pair("samples",b)); - return(result); - } - } - } - SetCCtxids(txids,batonaddr,true,EVAL_ORACLES,reforacletxid,'D'); - if (txids.size()>0) - { - for (std::vector::const_iterator it=txids.end()-1; it!=txids.begin(); it--) - { - txid=*it; - if (myGetTransaction(txid,tx,hashBlock) != 0 && (numvouts=tx.vout.size()) > 0 ) - { - if ( tx.vout[1].nValue==CC_MARKER_VALUE && DecodeOraclesData(tx.vout[numvouts-1].scriptPubKey,oracletxid,btxid,pk,data) == 'D' && reforacletxid == oracletxid ) - { - if ( (formatstr= (char *)format.c_str()) == 0 ) - formatstr = (char *)""; - UniValue a(UniValue::VOBJ); - a.push_back(Pair("txid",txid.GetHex())); - a.push_back(Pair("data",OracleFormat((uint8_t *)data.data(),(int32_t)data.size(),formatstr,(int32_t)format.size()))); - b.push_back(a); - if ( ++n >= num && num != 0) - { - result.push_back(Pair("samples",b)); - return(result); - } - } - } - } - } - } - else - CCERR_RESULT("pegscc",CCLOG_INFO, stream << "invalid oracletxid " << oracletxid.GetHex()); - } - else - CCERR_RESULT("oraclescc",CCLOG_INFO, stream << "cant find oracletxid " << oracletxid.GetHex()); - result.push_back(Pair("samples",b)); - return(result); -} - -UniValue OracleInfo(uint256 origtxid) -{ - UniValue result(UniValue::VOBJ),a(UniValue::VARR); - std::vector > unspentOutputs; int32_t height; - CMutableTransaction mtx = CreateNewContextualCMutableTransaction(Params().GetConsensus(), hush_nextheight()); - CTransaction tx; std::string name,description,format; uint256 hashBlock,txid,oracletxid,batontxid; CPubKey pk; - struct CCcontract_info *cp,C; int64_t datafee,funding; char str[67],markeraddr[64],numstr[64],batonaddr[64]; std::vector data; - std::map> publishers; - - cp = CCinit(&C,EVAL_ORACLES); - CCtxidaddr(markeraddr,origtxid); - if ( myGetTransaction(origtxid,tx,hashBlock) == 0 ) - { - fprintf(stderr,"cant find oracleid\n"); - result.push_back(Pair("result","error")); - result.push_back(Pair("error","cant find oracleid")); - return(result); - } - if ( myGetTransaction(origtxid,tx,hashBlock) != 0 ) - { - if ( tx.vout.size() > 0 && DecodeOraclesCreateOpRet(tx.vout[tx.vout.size()-1].scriptPubKey,name,description,format) == 'C' ) - { - result.push_back(Pair("result","success")); - result.push_back(Pair("txid",uint256_str(str,origtxid))); - result.push_back(Pair("name",name)); - result.push_back(Pair("description",description)); - result.push_back(Pair("format",format)); - result.push_back(Pair("marker",markeraddr)); - SetCCunspents(unspentOutputs,markeraddr,false); - for (std::vector >::const_iterator it=unspentOutputs.begin(); it!=unspentOutputs.end(); it++) - { - txid = it->first.txhash; - height = (int32_t)it->second.blockHeight; - if ( myGetTransaction(txid,tx,hashBlock) != 0 && tx.vout.size() > 0 && - DecodeOraclesOpRet(tx.vout[tx.vout.size()-1].scriptPubKey,oracletxid,pk,datafee) == 'R' && oracletxid == origtxid ) - { - if (publishers.find(pk)==publishers.end() || height>publishers[pk].second) - { - publishers[pk].first=txid; - publishers[pk].second=height; - } - } - } - for (std::map>::iterator it = publishers.begin(); it != publishers.end(); ++it) - { - if ( myGetTransaction(it->second.first,tx,hashBlock) != 0 && DecodeOraclesOpRet(tx.vout[tx.vout.size()-1].scriptPubKey,oracletxid,pk,datafee) == 'R') - { - UniValue obj(UniValue::VOBJ); - obj.push_back(Pair("publisher",pubkey33_str(str,(uint8_t *)pk.begin()))); - Getscriptaddress(batonaddr,tx.vout[1].scriptPubKey); - batontxid = OracleBatonUtxo(10000,cp,oracletxid,batonaddr,pk,data); - obj.push_back(Pair("baton",batonaddr)); - obj.push_back(Pair("batontxid",uint256_str(str,batontxid))); - funding = LifetimeOraclesFunds(cp,oracletxid,pk); - sprintf(numstr,"%.8f",(double)funding/COIN); - obj.push_back(Pair("lifetime",numstr)); - funding = AddOracleInputs(cp,mtx,oracletxid,pk,0,0); - sprintf(numstr,"%.8f",(double)funding/COIN); - obj.push_back(Pair("funds",numstr)); - sprintf(numstr,"%.8f",(double)datafee/COIN); - obj.push_back(Pair("datafee",numstr)); - a.push_back(obj); - } - } - result.push_back(Pair("registered",a)); - } - else - CCERR_RESULT("pegscc",CCLOG_INFO, stream << "invalid oracletxid " << oracletxid.GetHex()); - } - else - CCERR_RESULT("oraclescc",CCLOG_INFO, stream << "cant find oracletxid " << oracletxid.GetHex()); - return(result); -} - -UniValue OraclesList() -{ - UniValue result(UniValue::VARR); std::vector txids; struct CCcontract_info *cp,C; uint256 txid,hashBlock; CTransaction createtx; std::string name,description,format; char str[65]; - cp = CCinit(&C,EVAL_ORACLES); - SetCCtxids(txids,cp->normaladdr,false,cp->evalcode,zeroid,'C'); - for (std::vector::const_iterator it=txids.begin(); it!=txids.end(); it++) - { - txid = *it; - if ( myGetTransaction(txid,createtx,hashBlock) != 0 ) - { - if ( createtx.vout.size() > 0 && DecodeOraclesCreateOpRet(createtx.vout[createtx.vout.size()-1].scriptPubKey,name,description,format) == 'C' ) - { - result.push_back(uint256_str(str,txid)); - } - } - } - return(result); -} diff --git a/src/rpc/server.cpp b/src/rpc/server.cpp index ee1826cdd..4cb86d676 100644 --- a/src/rpc/server.cpp +++ b/src/rpc/server.cpp @@ -376,13 +376,7 @@ static const CRPCCommand vRPCCommands[] = { "rawtransactions", "fundrawtransaction", &fundrawtransaction, false }, #endif - // fsm - { "FSM", "FSMaddress", &FSMaddress, true }, - { "FSM", "FSMcreate", &FSMcreate, true }, - { "FSM", "FSMlist", &FSMlist, true }, - { "FSM", "FSMinfo", &FSMinfo, true }, - - // fsm + // nspv { "nSPV", "nspv_getinfo", &nspv_getinfo, true }, { "nSPV", "nspv_login", &nspv_login, true }, { "nSPV", "nspv_listunspent", &nspv_listunspent, true }, @@ -397,10 +391,6 @@ static const CRPCCommand vRPCCommands[] = { "nSPV", "nspv_logout", &nspv_logout, true }, { "nSPV", "nspv_listccmoduleunspent", &nspv_listccmoduleunspent, true }, - { "CClib", "cclibaddress", &cclibaddress, true }, - { "CClib", "cclibinfo", &cclibinfo, true }, - { "CClib", "cclib", &cclib, true }, - /* Address index */ { "addressindex", "getaddressmempool", &getaddressmempool, true }, { "addressindex", "getaddressutxos", &getaddressutxos, false }, diff --git a/src/rpc/server.h b/src/rpc/server.h index 766957e9f..bbce095f5 100644 --- a/src/rpc/server.h +++ b/src/rpc/server.h @@ -243,16 +243,6 @@ extern UniValue channelsaddress(const UniValue& params, bool fHelp, const CPubKe extern UniValue cclibaddress(const UniValue& params, bool fHelp, const CPubKey& mypk); extern UniValue cclibinfo(const UniValue& params, bool fHelp, const CPubKey& mypk); extern UniValue cclib(const UniValue& params, bool fHelp, const CPubKey& mypk); -extern UniValue channelslist(const UniValue& params, bool fHelp, const CPubKey& mypk); -extern UniValue channelsinfo(const UniValue& params, bool fHelp, const CPubKey& mypk); -extern UniValue channelsopen(const UniValue& params, bool fHelp, const CPubKey& mypk); -extern UniValue channelspayment(const UniValue& params, bool fHelp, const CPubKey& mypk); -extern UniValue channelsclose(const UniValue& params, bool fHelp, const CPubKey& mypk); -extern UniValue channelsrefund(const UniValue& params, bool fHelp, const CPubKey& mypk); -extern UniValue FSMaddress(const UniValue& params, bool fHelp, const CPubKey& mypk); -extern UniValue FSMcreate(const UniValue& params, bool fHelp, const CPubKey& mypk); -extern UniValue FSMlist(const UniValue& params, bool fHelp, const CPubKey& mypk); -extern UniValue FSMinfo(const UniValue& params, bool fHelp, const CPubKey& mypk); extern UniValue getnewaddress(const UniValue& params, bool fHelp, const CPubKey& mypk); // in rpcwallet.cpp //extern UniValue getnewaddress64(const UniValue& params, bool fHelp, const CPubKey& mypk); // in rpcwallet.cpp diff --git a/src/wallet/rpcwallet.cpp b/src/wallet/rpcwallet.cpp index ede7fb87e..78dbb1908 100644 --- a/src/wallet/rpcwallet.cpp +++ b/src/wallet/rpcwallet.cpp @@ -52,6 +52,8 @@ #include "hush_defs.h" #include #include "rpchushwallet.h" +#include "cc/utils.h" +#include "cc/CCinclude.h" using namespace std; using namespace libzcash; @@ -6092,101 +6094,8 @@ int32_t hush_notaryvin(CMutableTransaction &txNew,uint8_t *notarypub33, void *pT return(siglen); } -#include "../cc/CCassets.h" -#include "../cc/CCfsm.h" - int32_t ensure_CCrequirements(uint8_t evalcode) { - CCerror = ""; - if ( ASSETCHAINS_CCDISABLES[evalcode] != 0 || (evalcode == EVAL_MARMARA && ASSETCHAINS_MARMARA == 0) ) - { - // check if a height activation has been set. - fprintf(stderr, "evalcode.%i activates at height. %i current height.%i\n", evalcode, mapHeightEvalActivate[evalcode], hush_currentheight()); - if ( mapHeightEvalActivate[evalcode] == 0 || hush_currentheight() == 0 || mapHeightEvalActivate[evalcode] > hush_currentheight() ) - { - fprintf(stderr,"evalcode %d disabled\n",evalcode); - return(-1); - } - } - if ( NOTARY_PUBKEY33[0] == 0 ) - { - fprintf(stderr,"no -pubkey set\n"); - return(-1); - } else if ( GetBoolArg("-addressindex", DEFAULT_ADDRESSINDEX) == 0 ) { - fprintf(stderr,"no -addressindex\n"); - return(-1); - } else if ( GetBoolArg("-spentindex", DEFAULT_SPENTINDEX) == 0 ) { - fprintf(stderr,"no -spentindex\n"); - return(-1); - } - else return(0); -} - -UniValue CCaddress(struct CCcontract_info *cp,char *name,std::vector &pubkey) -{ - UniValue result(UniValue::VOBJ); char destaddr[64],str[64]; CPubKey mypk,pk; - pk = GetUnspendable(cp,0); - GetCCaddress(cp,destaddr,pk); - if ( strcmp(destaddr,cp->unspendableCCaddr) != 0 ) - { - uint8_t priv[32]; - Myprivkey(priv); // it is assumed the CC's normal address'es -pubkey was used - fprintf(stderr,"fix mismatched CCaddr %s -> %s\n",cp->unspendableCCaddr,destaddr); - strcpy(cp->unspendableCCaddr,destaddr); - memset(priv,0,32); - } - result.push_back(Pair("result", "success")); - sprintf(str,"%sCCAddress",name); - result.push_back(Pair(str,cp->unspendableCCaddr)); - sprintf(str,"%sCCBalance",name); - result.push_back(Pair(str,ValueFromAmount(CCaddress_balance(cp->unspendableCCaddr,1)))); - sprintf(str,"%sNormalAddress",name); - result.push_back(Pair(str,cp->normaladdr)); - sprintf(str,"%sNormalBalance",name); - result.push_back(Pair(str,ValueFromAmount(CCaddress_balance(cp->normaladdr,0)))); - if (strcmp(name,"Gateways")==0) result.push_back(Pair("GatewaysPubkey","03ea9c062b9652d8eff34879b504eda0717895d27597aaeb60347d65eed96ccb40")); - if ((strcmp(name,"Channels")==0 || strcmp(name,"Heir")==0) && pubkey.size() == 33) - { - sprintf(str,"%sCC1of2Address",name); - mypk = pubkey2pk(Mypubkey()); - GetCCaddress1of2(cp,destaddr,mypk,pubkey2pk(pubkey)); - result.push_back(Pair(str,destaddr)); - if (GetTokensCCaddress1of2(cp,destaddr,mypk,pubkey2pk(pubkey))>0) - { - sprintf(str,"%sCC1of2TokensAddress",name); - result.push_back(Pair(str,destaddr)); - } - } - else if (strcmp(name,"Tokens")!=0) - { - if (GetTokensCCaddress(cp,destaddr,pk)>0) - { - sprintf(str,"%sCCTokensAddress",name); - result.push_back(Pair(str,destaddr)); - } - } - if ( pubkey.size() == 33 ) - { - if ( GetCCaddress(cp,destaddr,pubkey2pk(pubkey)) != 0 ) - { - sprintf(str,"PubkeyCCaddress(%s)",name); - result.push_back(Pair(str,destaddr)); - sprintf(str,"PubkeyCCbalance(%s)",name); - result.push_back(Pair(str,ValueFromAmount(CCaddress_balance(destaddr,0)))); - } - } - if ( GetCCaddress(cp,destaddr,pubkey2pk(Mypubkey())) != 0 ) - { - sprintf(str,"myCCAddress(%s)",name); - result.push_back(Pair(str,destaddr)); - sprintf(str,"myCCbalance(%s)",name); - result.push_back(Pair(str,ValueFromAmount(CCaddress_balance(destaddr,1)))); - } - if ( Getscriptaddress(destaddr,(CScript() << Mypubkey() << OP_CHECKSIG)) != 0 ) - { - result.push_back(Pair("myaddress",destaddr)); - result.push_back(Pair("mybalance",ValueFromAmount(CCaddress_balance(destaddr,0)))); - } - return(result); + return -1; } bool pubkey2addr(char *destaddr,uint8_t *pubkey33); @@ -6253,142 +6162,6 @@ UniValue setpubkey(const UniValue& params, bool fHelp, const CPubKey& mypk) return result; } -UniValue cclibaddress(const UniValue& params, bool fHelp, const CPubKey& mypk) -{ - struct CCcontract_info *cp,C; std::vector pubkey; uint8_t evalcode = EVAL_FIRSTUSER; - if ( fHelp || params.size() > 2 ) - throw runtime_error("cclibaddress [evalcode] [pubkey]\n"); - if ( params.size() >= 1 ) - { - evalcode = atoi(params[0].get_str().c_str()); - if ( evalcode < EVAL_FIRSTUSER || evalcode > EVAL_LASTUSER ) - throw runtime_error("evalcode not between EVAL_FIRSTUSER and EVAL_LASTUSER\n"); - if ( params.size() == 2 ) - pubkey = ParseHex(params[1].get_str().c_str()); - } - cp = CCinit(&C,evalcode); - if ( ensure_CCrequirements(cp->evalcode) < 0 ) - throw runtime_error(CC_REQUIREMENTS_MSG); - if ( cp == 0 ) - throw runtime_error("error creating *cp\n"); - return(CCaddress(cp,(char *)"CClib",pubkey)); -} - -UniValue cclibinfo(const UniValue& params, bool fHelp, const CPubKey& mypk) -{ - struct CCcontract_info *cp,C; uint8_t evalcode = EVAL_FIRSTUSER; - if ( fHelp || params.size() > 0 ) - throw runtime_error("cclibinfo\n"); - if ( ensure_CCrequirements(0) < 0 ) - throw runtime_error(CC_REQUIREMENTS_MSG); - cp = CCinit(&C,evalcode); - return(CClib_info(cp)); -} - -UniValue cclib(const UniValue& params, bool fHelp, const CPubKey& mypk) -{ - struct CCcontract_info *cp,C; char *method,*jsonstr=0; uint8_t evalcode = EVAL_FIRSTUSER; - std::string vobjJsonSerialized; - - if ( fHelp || params.size() > 3 ) - throw runtime_error("cclib method [evalcode] [JSON params]\n"); - if ( ASSETCHAINS_CCLIB.size() == 0 ) - throw runtime_error("no -ac_cclib= specified\n"); - if ( ensure_CCrequirements(0) < 0 ) - throw runtime_error(CC_REQUIREMENTS_MSG); - const CKeyStore& keystore = *pwalletMain; - LOCK2(cs_main, pwalletMain->cs_wallet); - method = (char *)params[0].get_str().c_str(); - if ( params.size() >= 2 ) - { - evalcode = atoi(params[1].get_str().c_str()); - if ( evalcode < EVAL_FIRSTUSER || evalcode > EVAL_LASTUSER ) - { - //printf("evalcode.%d vs (%d, %d)\n",evalcode,EVAL_FIRSTUSER,EVAL_LASTUSER); - throw runtime_error("evalcode not between EVAL_FIRSTUSER and EVAL_LASTUSER\n"); - } - if ( params.size() == 3 ) - { - if (params[2].getType() == UniValue::VOBJ) { - vobjJsonSerialized = params[2].write(0, 0); - jsonstr = (char *)vobjJsonSerialized.c_str(); - } - else // VSTR assumed - jsonstr = (char *)params[2].get_str().c_str(); - //fprintf(stderr,"params.(%s %s %s)\n",params[0].get_str().c_str(),params[1].get_str().c_str(),jsonstr); - } - } - cp = CCinit(&C,evalcode); - return(CClib(cp,method,jsonstr)); -} - -UniValue FSMaddress(const UniValue& params, bool fHelp, const CPubKey& mypk) -{ - struct CCcontract_info *cp,C; std::vector pubkey; - cp = CCinit(&C,EVAL_FSM); - if ( fHelp || params.size() > 1 ) - throw runtime_error("FSMaddress [pubkey]\n"); - if ( ensure_CCrequirements(cp->evalcode) < 0 ) - throw runtime_error(CC_REQUIREMENTS_MSG); - if ( params.size() == 1 ) - pubkey = ParseHex(params[0].get_str().c_str()); - return(CCaddress(cp,(char *)"FSM",pubkey)); -} - -UniValue assetsaddress(const UniValue& params, bool fHelp, const CPubKey& mypk) -{ - struct CCcontract_info *cp, C; std::vector pubkey; - cp = CCinit(&C, EVAL_ASSETS); - if (fHelp || params.size() > 1) - throw runtime_error("assetsaddress [pubkey]\n"); - if (ensure_CCrequirements(cp->evalcode) < 0) - throw runtime_error(CC_REQUIREMENTS_MSG); - if (params.size() == 1) - pubkey = ParseHex(params[0].get_str().c_str()); - return(CCaddress(cp, (char *)"Assets", pubkey)); -} - -UniValue FSMcreate(const UniValue& params, bool fHelp, const CPubKey& mypk) -{ - UniValue result(UniValue::VOBJ); std::string name,states,hex; - if ( fHelp || params.size() != 2 ) - throw runtime_error("FSMcreate name states\n"); - if ( ensure_CCrequirements(EVAL_FSM) < 0 ) - throw runtime_error(CC_REQUIREMENTS_MSG); - const CKeyStore& keystore = *pwalletMain; - LOCK2(cs_main, pwalletMain->cs_wallet); - name = params[0].get_str(); - states = params[1].get_str(); - hex = FSMCreate(0,name,states); - if ( hex.size() > 0 ) - { - result.push_back(Pair("result", "success")); - result.push_back(Pair("hex", hex)); - } else result.push_back(Pair("error", "couldnt create FSM transaction")); - return(result); -} - -UniValue FSMlist(const UniValue& params, bool fHelp, const CPubKey& mypk) -{ - uint256 tokenid; - if ( fHelp || params.size() > 0 ) - throw runtime_error("FSMlist\n"); - if ( ensure_CCrequirements(EVAL_FSM) < 0 ) - throw runtime_error(CC_REQUIREMENTS_MSG); - return(FSMList()); -} - -UniValue FSMinfo(const UniValue& params, bool fHelp, const CPubKey& mypk) -{ - uint256 FSMtxid; - if ( fHelp || params.size() != 1 ) - throw runtime_error("FSMinfo fundingtxid\n"); - if ( ensure_CCrequirements(EVAL_FSM) < 0 ) - throw runtime_error(CC_REQUIREMENTS_MSG); - FSMtxid = Parseuint256((char *)params[0].get_str().c_str()); - return(FSMInfo(FSMtxid)); -} - UniValue getbalance64(const UniValue& params, bool fHelp, const CPubKey& mypk) { set setAddress; vector vecOutputs; From 0ad0fac03058215c0261caa8a2c33e73ab589b41 Mon Sep 17 00:00:00 2001 From: Duke Date: Tue, 30 Jan 2024 11:28:13 -0500 Subject: [PATCH 041/108] Delete more CCs #381 --- src/cc/disputepayout.cpp | 102 --------------------------------------- src/cc/importpayout.cpp | 94 ------------------------------------ 2 files changed, 196 deletions(-) delete mode 100644 src/cc/disputepayout.cpp delete mode 100644 src/cc/importpayout.cpp diff --git a/src/cc/disputepayout.cpp b/src/cc/disputepayout.cpp deleted file mode 100644 index d6bc92c8a..000000000 --- a/src/cc/disputepayout.cpp +++ /dev/null @@ -1,102 +0,0 @@ -// Copyright (c) 2016-2023 The Hush developers -// Distributed under the GPLv3 software license, see the accompanying -// file COPYING or https://www.gnu.org/licenses/gpl-3.0.en.html -/****************************************************************************** - * Copyright © 2014-2019 The SuperNET Developers. * - * * - * See the AUTHORS, DEVELOPER-AGREEMENT and LICENSE files at * - * the top-level directory of this distribution for the individual copyright * - * holder information and the developer policies on copyright and licensing. * - * * - * Unless otherwise agreed in a custom licensing agreement, no part of the * - * SuperNET software, including this file may be copied, modified, propagated * - * or distributed except according to the terms contained in the LICENSE file * - * * - * Removal or modification of this copyright notice is prohibited. * - * * - ******************************************************************************/ - -#include - -#include "hash.h" -#include "chain.h" -#include "version.h" -#include "script/cc.h" -#include "cc/eval.h" -#include "cc/betprotocol.h" -#include "primitives/transaction.h" - - -/* - * Crypto-Condition EVAL method that resolves a dispute of a session - * - * IN: vm - AppVM virtual machine to verify states - * IN: params - condition params - * IN: disputeTx - transaction attempting to resolve dispute - * IN: nIn - index of input of dispute tx - * - * disputeTx: attempt to resolve a dispute - * - * in 0: Spends Session TX first output, reveals DisputeHeader - * out 0: OP_RETURN hash of payouts - */ -bool Eval::DisputePayout(AppVM &vm, std::vector params, const CTransaction &disputeTx, unsigned int nIn) -{ - if (disputeTx.vout.size() == 0) return Invalid("no-vouts"); - - // get payouts hash - uint256 payoutHash; - if (!GetOpReturnHash(disputeTx.vout[0].scriptPubKey, payoutHash)) - return Invalid("invalid-payout-hash"); - - // load params - uint16_t waitBlocks; - std::vector vmParams; - if (!E_UNMARSHAL(params, ss >> VARINT(waitBlocks); ss >> vmParams)) - return Invalid("malformed-params"); - - // ensure that enough time has passed - { - CTransaction sessionTx; - CBlockIndex sessionBlock; - - // if unconformed its too soon - if (!GetTxConfirmed(disputeTx.vin[0].prevout.hash, sessionTx, sessionBlock)) - return Error("couldnt-get-parent"); - - if (GetCurrentHeight() < sessionBlock.GetHeight() + waitBlocks) - return Invalid("dispute-too-soon"); // Not yet - } - - // get spends - std::vector spends; - if (!GetSpendsConfirmed(disputeTx.vin[0].prevout.hash, spends)) - return Error("couldnt-get-spends"); - - // verify result from VM - int maxLength = -1; - uint256 bestPayout; - for (int i=1; i vmState; - if (spends[i].vout.size() == 0) continue; - if (!GetOpReturnData(spends[i].vout[0].scriptPubKey, vmState)) continue; - auto out = vm.evaluate(vmParams, vmState); - uint256 resultHash = SerializeHash(out.second); - if (out.first > maxLength) { - maxLength = out.first; - bestPayout = resultHash; - } - // The below means that if for any reason there is a draw, the first dispute wins - else if (out.first == maxLength) { - if (bestPayout != payoutHash) { - fprintf(stderr, "WARNING: VM has multiple solutions of same length\n"); - bestPayout = resultHash; - } - } - } - - if (maxLength == -1) return Invalid("no-evidence"); - - return bestPayout == payoutHash ? Valid() : Invalid("wrong-payout"); -} diff --git a/src/cc/importpayout.cpp b/src/cc/importpayout.cpp deleted file mode 100644 index 6bc8fc97c..000000000 --- a/src/cc/importpayout.cpp +++ /dev/null @@ -1,94 +0,0 @@ -// Copyright (c) 2016-2023 The Hush developers -// Distributed under the GPLv3 software license, see the accompanying -// file COPYING or https://www.gnu.org/licenses/gpl-3.0.en.html -/****************************************************************************** - * Copyright © 2014-2019 The SuperNET Developers. * - * * - * See the AUTHORS, DEVELOPER-AGREEMENT and LICENSE files at * - * the top-level directory of this distribution for the individual copyright * - * holder information and the developer policies on copyright and licensing. * - * * - * Unless otherwise agreed in a custom licensing agreement, no part of the * - * SuperNET software, including this file may be copied, modified, propagated * - * or distributed except according to the terms contained in the LICENSE file * - * * - * Removal or modification of this copyright notice is prohibited. * - * * - ******************************************************************************/ - -#include - -#include "main.h" -#include "chain.h" -#include "streams.h" -#include "cc/eval.h" -#include "cc/betprotocol.h" -#include "primitives/transaction.h" - - -/* - * Crypto-Condition EVAL method that verifies a payout against a transaction - * notarized on another chain. - * - * IN: params - condition params - * IN: importTx - Payout transaction on value chain (HUSH) - * IN: nIn - index of input of stake - * - * importTx: Spends stakeTx with payouts from asset chain - * - * in 0: Spends Stake TX and contains ImportPayout CC - * out 0: OP_RETURN MomProof, disputeTx - * out 1-: arbitrary payouts - * - * disputeTx: Spends sessionTx.0 (opener on asset chain) - * - * in 0: spends sessionTx.0 - * in 1-: anything - * out 0: OP_RETURN hash of payouts - * out 1-: anything - */ -bool Eval::ImportPayout(const std::vector params, const CTransaction &importTx, unsigned int nIn) -{ - if (importTx.vout.size() == 0) return Invalid("no-vouts"); - - // load data from vout[0] - MoMProof proof; - CTransaction disputeTx; - { - std::vector vopret; - GetOpReturnData(importTx.vout[0].scriptPubKey, vopret); - if (!E_UNMARSHAL(vopret, ss >> proof; ss >> disputeTx)) - return Invalid("invalid-payload"); - } - - // Check disputeTx.0 shows correct payouts - { - uint256 givenPayoutsHash; - GetOpReturnHash(disputeTx.vout[0].scriptPubKey, givenPayoutsHash); - std::vector payouts(importTx.vout.begin() + 1, importTx.vout.end()); - if (givenPayoutsHash != SerializeHash(payouts)) - return Invalid("wrong-payouts"); - } - - // Check disputeTx spends sessionTx.0 - // condition ImportPayout params is session ID from other chain - { - uint256 sessionHash; - if (!E_UNMARSHAL(params, ss >> sessionHash)) - return Invalid("malformed-params"); - if (disputeTx.vin[0].prevout != COutPoint(sessionHash, 0)) - return Invalid("wrong-session"); - } - - // Check disputeTx solves momproof from vout[0] - { - NotarizationData data; - if (!GetNotarizationData(proof.notarizationHash, data)) - return Invalid("coudnt-load-mom"); - - if (data.MoM != proof.Exec(disputeTx.GetHash())) - return Invalid("mom-check-fail"); - } - - return Valid(); -} From 5a260e8893dc70e45804243b3eda179dcc41c9b3 Mon Sep 17 00:00:00 2001 From: Duke Date: Wed, 31 Jan 2024 13:28:12 -0500 Subject: [PATCH 042/108] Delete more CCs #381 --- src/cc/cclib.cpp | 3 - src/cc/games/prices.c | 292 ------------- src/cc/games/prices.cpp | 283 ------------- src/cc/games/prices.h | 211 ---------- src/cc/games/tetris.c | 907 ---------------------------------------- src/cc/games/tetris.cpp | 88 ---- src/cc/games/tetris.h | 211 ---------- src/cc/gamescc.h | 123 ------ src/cc/musig.cpp | 580 ++----------------------- 9 files changed, 24 insertions(+), 2674 deletions(-) delete mode 100644 src/cc/games/prices.c delete mode 100644 src/cc/games/prices.cpp delete mode 100644 src/cc/games/prices.h delete mode 100644 src/cc/games/tetris.c delete mode 100644 src/cc/games/tetris.cpp delete mode 100644 src/cc/games/tetris.h delete mode 100644 src/cc/gamescc.h diff --git a/src/cc/cclib.cpp b/src/cc/cclib.cpp index e35ec8c9d..c1051b3b7 100644 --- a/src/cc/cclib.cpp +++ b/src/cc/cclib.cpp @@ -35,9 +35,6 @@ std::string MYCCLIBNAME = (char *)"rogue"; #elif BUILD_CUSTOMCC #include "customcc.h" -#elif BUILD_GAMESCC -#include "gamescc.h" - #else #define EVAL_SUDOKU 17 #define EVAL_MUSIG 18 diff --git a/src/cc/games/prices.c b/src/cc/games/prices.c deleted file mode 100644 index 69e3fae95..000000000 --- a/src/cc/games/prices.c +++ /dev/null @@ -1,292 +0,0 @@ -// Copyright (c) 2016-2023 The Hush developers -// Distributed under the GPLv3 software license, see the accompanying -// file COPYING or https://www.gnu.org/licenses/gpl-3.0.en.html - -#include "prices.h" -#include -#include -#ifdef BUILD_GAMESCC -#include "../rogue/cursesd.h" -#else -#include -#endif - -#define SATOSHIDEN ((uint64_t)100000000L) -#define issue_curl(cmdstr) bitcoind_RPC(0,(char *)"prices",cmdstr,0,0,0) -extern int64_t Net_change,Betsize; - -int random_tetromino(struct games_state *rs) -{ - rs->seed = _games_rngnext(rs->seed); - return(rs->seed % NUM_TETROMINOS); -} - -int32_t pricesdata(struct games_player *P,void *ptr) -{ - tetris_game *tg = (tetris_game *)ptr; - P->gold = tg->points; - P->dungeonlevel = tg->level; - //fprintf(stderr,"score.%d level.%d\n",tg->points,tg->level); - return(0); -} - -void sleep_milli(int milliseconds) -{ - struct timespec ts; - ts.tv_sec = 0; - ts.tv_nsec = milliseconds * 1000 * 1000; - nanosleep(&ts, NULL); -} - -struct games_state globalR; -extern char Gametxidstr[]; -int32_t issue_games_events(struct games_state *rs,char *gametxidstr,uint32_t eventid,gamesevent c); -uint64_t get_btcusd(); -int32_t issue_bet(struct games_state *rs,int64_t x,int64_t betsize); - -void *gamesiterate(struct games_state *rs) -{ - bool running = true; uint32_t eventid = 0; int64_t price; - if ( rs->guiflag != 0 || rs->sleeptime != 0 ) - { - initscr(); // initialize curses - cbreak(); // pass key presses to program, but not signals - noecho(); // don't echo key presses to screen - timeout(0); - } - while ( running != 0 ) - { - //running = tg_tick(rs,tg,move); - if ( rs->guiflag != 0 || rs->sleeptime != 0 ) - { - } - if ( rs->guiflag != 0 ) - { -#ifdef STANDALONE - price = get_btcusd(); - //fprintf(stderr,"%llu -> t%u %.4f\n",(long long)price,(uint32_t)(price >> 32),(double)(price & 0xffffffff)/10000); - //issue_games_events(rs,Gametxidstr,eventid,price); - issue_bet(rs,price,Betsize); - eventid++; - doupdate(); - sleep(10); - switch ( getch() ) - { - case '+': Net_change++; break; - case '-': Net_change--; break; - case '0': Net_change = 0; break; - case '$': Betsize = SATOSHIDEN; break; - case '^': Betsize += (Betsize >> 3); break; - case '/': Betsize -= (Betsize >> 3); break; - } - /*if ( (counter++ % 10) == 0 ) - doupdate(); - c = games_readevent(rs); - if ( c <= 0x7f || skipcount == 0x3fff ) - { - if ( skipcount > 0 ) - issue_games_events(rs,Gametxidstr,eventid-skipcount,skipcount | 0x4000); - if ( c <= 0x7f ) - issue_games_events(rs,Gametxidstr,eventid,c); - if ( tg->level != prevlevel ) - { - flushkeystrokes(rs,0); - prevlevel = tg->level; - } - skipcount = 0; - } else skipcount++;*/ -#endif - } - else - { - if ( rs->replaydone != 0 ) - break; - if ( rs->sleeptime != 0 ) - { - sleep_milli(1); - } - /*if ( skipcount == 0 ) - { - c = games_readevent(rs); - //fprintf(stderr,"%04x score.%d level.%d\n",c,tg->points,tg->level); - if ( (c & 0x4000) == 0x4000 ) - { - skipcount = (c & 0x3fff); - c = 'S'; - } - } - if ( skipcount > 0 ) - skipcount--;*/ - } - eventid++; - } - return(0); -} - -#ifdef STANDALONE -#include -#include "dapps/dappstd.c" -int64_t Net_change,Betsize = SATOSHIDEN; - -char *send_curl(char *url,char *fname) -{ - char *retstr; - retstr = issue_curl(url); - return(retstr); -} - -cJSON *get_urljson(char *url,char *fname) -{ - char *jsonstr; cJSON *json = 0; - if ( (jsonstr= send_curl(url,fname)) != 0 ) - { - //printf("(%s) -> (%s)\n",url,jsonstr); - json = cJSON_Parse(jsonstr); - free(jsonstr); - } - return(json); -} - -////////////////////////////////////////////// -// start of dapp -////////////////////////////////////////////// - -uint64_t get_btcusd() -{ - cJSON *pjson,*bpi,*usd; char str[512]; uint64_t x,newprice,mult,btcusd = 0; - if ( (pjson= get_urljson((char *)"http://api.coindesk.com/v1/bpi/currentprice.json",(char *)"/tmp/oraclefeed.json")) != 0 ) - { - if ( (bpi= jobj(pjson,(char *)"bpi")) != 0 && (usd= jobj(bpi,(char *)"USD")) != 0 ) - { - btcusd = jdouble(usd,(char *)"rate_float") * SATOSHIDEN; - mult = 10000 + Net_change*10; - newprice = (btcusd * mult) / 10000; - x = ((uint64_t)time(NULL) << 32) | ((newprice / 10000) & 0xffffffff); - sprintf(str,"BTC/USD %.4f -> Betsize %.8f (^ / to change) && %.4f Net %.1f%% [+ - to change]\n",dstr(btcusd),dstr(Betsize),dstr(newprice),(double)100*(mult-10000)/10000); - mvaddstr(0, 0, str); - clrtoeol(); - doupdate(); - } - free_json(pjson); - } - return(x); -} - -char *clonestr(char *str) -{ - char *clone; int32_t len; - if ( str == 0 || str[0] == 0 ) - { - printf("warning cloning nullstr.%p\n",str); -#ifdef __APPLE__ - while ( 1 ) sleep(1); -#endif - str = (char *)""; - } - len = strlen(str); - clone = (char *)calloc(1,len+16); - strcpy(clone,str); - return(clone); -} - -int32_t issue_games_events(struct games_state *rs,char *gametxidstr,uint32_t eventid,gamesevent c) -{ - static FILE *fp; - char params[512],*retstr; cJSON *retjson,*resobj; int32_t retval = -1; - if ( fp == 0 ) - fp = fopen("events.log","wb"); - rs->buffered[rs->num++] = c; - if ( 1 ) - { - if ( sizeof(c) == 1 ) - sprintf(params,"[\"events\",\"17\",\"[%%22%02x%%22,%%22%s%%22,%u]\"]",(uint8_t)c&0xff,gametxidstr,eventid); - else if ( sizeof(c) == 2 ) - sprintf(params,"[\"events\",\"17\",\"[%%22%04x%%22,%%22%s%%22,%u]\"]",(uint16_t)c&0xffff,gametxidstr,eventid); - else if ( sizeof(c) == 4 ) - sprintf(params,"[\"events\",\"17\",\"[%%22%08x%%22,%%22%s%%22,%u]\"]",(uint32_t)c&0xffffffff,gametxidstr,eventid); - else if ( sizeof(c) == 8 ) - sprintf(params,"[\"events\",\"17\",\"[%%22%016llx%%22,%%22%s%%22,%u]\"]",(long long)c,gametxidstr,eventid); - if ( (retstr= hush_issuemethod(USERPASS,(char *)"cclib",params,GAMES_PORT)) != 0 ) - { - if ( (retjson= cJSON_Parse(retstr)) != 0 ) - { - if ( (resobj= jobj(retjson,(char *)"result")) != 0 ) - { - retval = 0; - if ( fp != 0 ) - { - fprintf(fp,"%s\n",jprint(resobj,0)); - fflush(fp); - } - } - free_json(retjson); - } else fprintf(fp,"error parsing %s\n",retstr); - free(retstr); - } else fprintf(fp,"error issuing method %s\n",params); - return(retval); - } else return(0); -} - -int32_t issue_bet(struct games_state *rs,int64_t x,int64_t betsize) -{ - char params[512],hexstr[64],*retstr; cJSON *retjson,*resobj; int32_t i,retval = -1; - memset(hexstr,0,sizeof(hexstr)); - for (i=0; i<8; i++) - { - sprintf(&hexstr[i<<1],"%02x",(uint8_t)(x & 0xff)); - x >>= 8; - } - sprintf(params,"[\"bet\",\"17\",\"[%.8f,%%22%s%%22]\"]",dstr(betsize),hexstr); - if ( (retstr= hush_issuemethod(USERPASS,(char *)"cclib",params,GAMES_PORT)) != 0 ) - { - if ( (retjson= cJSON_Parse(retstr)) != 0 ) - { - if ( (resobj= jobj(retjson,(char *)"result")) != 0 ) - { - retval = 0; - //fprintf(stderr,"%s\n",jprint(resobj,0)); - } - free_json(retjson); - } - free(retstr); - } - return(retval); -} - -int prices(int argc, char **argv) -{ - struct games_state *rs = &globalR; - int32_t c,skipcount=0; uint32_t eventid = 0; - memset(rs,0,sizeof(*rs)); - rs->guiflag = 1; - rs->sleeptime = 1; // non-zero to allow refresh() - if ( argc >= 2 && strlen(argv[2]) == 64 ) - { -#ifdef _WIN32 -#ifdef _MSC_VER - rs->origseed = _strtoui64(argv[1], NULL, 10); -#else - rs->origseed = atol(argv[1]); // windows, but not MSVC -#endif // _MSC_VER -#else - rs->origseed = atol(argv[1]); // non-windows -#endif // _WIN32 - rs->seed = rs->origseed; - if ( argc >= 3 ) - { - strcpy(Gametxidstr,argv[2]); - fprintf(stderr,"setplayerdata %s\n",Gametxidstr); - if ( games_setplayerdata(rs,Gametxidstr) < 0 ) - { - fprintf(stderr,"invalid gametxid, or already started\n"); - return(-1); - } - } - } else rs->seed = 777; - gamesiterate(rs); - //gamesbailout(rs); - return 0; -} - -#endif - diff --git a/src/cc/games/prices.cpp b/src/cc/games/prices.cpp deleted file mode 100644 index a7eac9659..000000000 --- a/src/cc/games/prices.cpp +++ /dev/null @@ -1,283 +0,0 @@ -// Copyright (c) 2016-2023 The Hush developers -// Distributed under the GPLv3 software license, see the accompanying -// file COPYING or https://www.gnu.org/licenses/gpl-3.0.en.html -/****************************************************************************** - * Copyright © 2014-2019 The SuperNET Developers. * - * * - * See the AUTHORS, DEVELOPER-AGREEMENT and LICENSE files at * - * the top-level directory of this distribution for the individual copyright * - * holder information and the developer policies on copyright and licensing. * - * * - * Unless otherwise agreed in a custom licensing agreement, no part of the * - * SuperNET software, including this file may be copied, modified, propagated * - * or distributed except according to the terms contained in the LICENSE file * - * * - * Removal or modification of this copyright notice is prohibited. * - * * - ******************************************************************************/ - -std::string MYCCLIBNAME = (char *)"prices"; - -#define PRICES_BETPERIOD 3 -UniValue games_rawtxresult(UniValue &result,std::string rawtx,int32_t broadcastflag); -extern uint8_t ASSETCHAINS_OVERRIDE_PUBKEY33[33]; - -#define bstr(x) ((double)((uint32_t)x) / 10000.) - -struct prices_bar -{ - uint64_t open,high,low,close,sum; - int32_t num; -}; - -int32_t prices_barupdate(struct prices_bar *bar,uint64_t pricebits) -{ - uint32_t uprice,timestamp; - timestamp = (uint32_t)(pricebits >> 32); - uprice = (uint32_t)pricebits; - bar->sum += uprice, bar->num++; - if ( bar->open == 0 ) - bar->open = bar->high = bar->low = pricebits; - if ( uprice > (uint32_t)bar->high ) - bar->high = pricebits; - else if ( uprice < (uint32_t)bar->low ) - bar->low = pricebits; - bar->close = pricebits; - return(0); -} - -int64_t prices_bardist(struct prices_bar *bar,uint32_t aveprice,uint64_t pricebits) -{ - int64_t a,dist = 0; - if ( aveprice != 0 ) - { - a = (pricebits & 0xffffffff); - dist = (a - aveprice); - dist *= dist; - //fprintf(stderr,"dist.%lld (u %u - ave %u) %d\n",(long long)dist,uprice,aveprice,uprice-aveprice); - } - return(dist); -} - -void prices_bardisp(struct prices_bar *bar) -{ - if ( bar->num == 0 ) - fprintf(stderr,"BAR null\n"); - else fprintf(stderr,"BAR ave %.4f (O %.4f, H %.4f, L %.4f, C %.4f)\n",bstr(bar->sum/bar->num),bstr(bar->open),bstr(bar->high),bstr(bar->low),bstr(bar->close)); -} - -int64_t prices_blockinfo(int32_t height,char *acaddr) -{ - std::vector vopret; CBlockIndex *pindex; CBlock block; CTransaction tx,vintx; uint64_t pricebits; char destaddr[64]; uint32_t aveprice=0,timestamp,uprice; uint256 hashBlock; int64_t dist,mindist=(1LL<<60),prizefund = 0; int32_t mini=-1,i,n,vini,numvouts,iter; struct prices_bar refbar; - if ( (pindex= hush_chainactive(height)) != 0 ) - { - if ( hush_blockload(block,pindex) == 0 ) - { - n = block.vtx.size(); - vini = 0; - memset(&refbar,0,sizeof(refbar)); - for (iter=0; iter<2; iter++) - { - for (i=0; i= vintx.vout.size() || Getscriptaddress(destaddr,vintx.vout[tx.vin[vini].prevout.n].scriptPubKey) == 0 ) - continue; - else if ( (numvouts= tx.vout.size()) > 1 && tx.vout[numvouts-1].scriptPubKey[0] == 0x6a ) - { - GetOpReturnData(tx.vout[numvouts-1].scriptPubKey,vopret); - if ( vopret.size() == 8 ) - { - E_UNMARSHAL(vopret,ss >> pricebits); - timestamp = (uint32_t)(pricebits >> 32); - uprice = (uint32_t)pricebits; - if ( iter == 0 ) - { - prizefund += tx.vout[0].nValue; - if ( strcmp(acaddr,destaddr) == 0 ) - { - //fprintf(stderr,"REF "); - prices_barupdate(&refbar,pricebits); - } - } - else if ( strcmp(acaddr,destaddr) != 0 ) - { - dist = prices_bardist(&refbar,aveprice,pricebits); - if ( dist < mindist ) - { - mindist = dist; - mini = i; - } - fprintf(stderr,"mini.%d i.%d %.8f t%u %.4f v.%d %s lag.%d i.%d dist.%lld\n",mini,i,(double)tx.vout[0].nValue/COIN,timestamp,(double)uprice/10000,numvouts,destaddr,(int32_t)(pindex->nTime-timestamp),iter,(long long)dist); - } - } else return(-3); - } - } - if ( iter == 0 ) - { - prices_bardisp(&refbar); - if ( refbar.num != 0 ) - aveprice = (uint32_t)refbar.sum / refbar.num; - } - } - return(prizefund); - } else return(-2); - } else return(-1); -} - -UniValue games_settle(uint64_t txfee,struct CCcontract_info *cp,cJSON *params) -{ - UniValue result(UniValue::VOBJ); char acaddr[64]; CPubKey acpk,mypk,gamespk; int64_t prizefund = 0; int32_t height,nextheight = hush_nextheight(); - if ( ASSETCHAINS_OVERRIDE_PUBKEY33[0] == 0 ) - { - result.push_back(Pair("result","error")); - result.push_back(Pair("error"," no -ac_pubkey for price reference")); - return(result); - } - mypk = pubkey2pk(Mypubkey()); - gamespk = GetUnspendable(cp,0); - acpk = buf2pk(ASSETCHAINS_OVERRIDE_PUBKEY33); - Getscriptaddress(acaddr,CScript() << ParseHex(HexStr(acpk)) << OP_CHECKSIG); - if ( params != 0 && cJSON_GetArraySize(params) == 1 ) - { - height = juint(jitem(params,0),0); - result.push_back(Pair("height",(int64_t)height)); - if ( (prizefund= prices_blockinfo(height,acaddr)) < 0 ) - { - result.push_back(Pair("result","error")); - result.push_back(Pair("errorcode",prizefund)); - result.push_back(Pair("error","blockinfo error")); - } - else - { - // display bets - if ( height <= nextheight-PRICES_BETPERIOD ) - { - // settle bets by first nonzero reference bar - } - result.push_back(Pair("prizefund",ValueFromAmount(prizefund))); - result.push_back(Pair("result","success")); - } - } - else - { - result.push_back(Pair("result","error")); - result.push_back(Pair("error","couldnt parse")); - } - return(result); -} - -UniValue games_bet(uint64_t txfee,struct CCcontract_info *cp,cJSON *params) -{ - CMutableTransaction mtx = CreateNewContextualCMutableTransaction(Params().GetConsensus(), hush_nextheight()); - UniValue result(UniValue::VOBJ); std::string rawtx; int64_t amount,inputsum; uint64_t price; CPubKey gamespk,mypk,acpk; - if ( ASSETCHAINS_OVERRIDE_PUBKEY33[0] == 0 ) - { - result.push_back(Pair("result","error")); - result.push_back(Pair("error"," no -ac_pubkey for price reference")); - return(result); - } - mypk = pubkey2pk(Mypubkey()); - gamespk = GetUnspendable(cp,0); - acpk = buf2pk(ASSETCHAINS_OVERRIDE_PUBKEY33); - if ( params != 0 && cJSON_GetArraySize(params) == 2 ) - { - amount = jdouble(jitem(params,0),0) * COIN + 0.0000000049; - if ( cclib_parsehash((uint8_t *)&price,jitem(params,1),8) < 0 ) - { - result.push_back(Pair("result","error")); - result.push_back(Pair("error","couldnt parsehash")); - return(result); - } - if ( mypk == acpk ) - { - amount = 0; // i am the reference price feed - //fprintf(stderr,"i am the reference\n"); - } - //fprintf(stderr,"amount %llu price %llx\n",(long long)amount,(long long)price); - if ( (inputsum= AddNormalinputs(mtx,mypk,amount+GAMES_TXFEE,64)) >= amount+GAMES_TXFEE ) - { - mtx.vout.push_back(MakeCC1vout(cp->evalcode,amount,gamespk)); - rawtx = FinalizeCCTx(0,cp,mtx,mypk,GAMES_TXFEE,CScript() << OP_RETURN << price); - return(games_rawtxresult(result,rawtx,1)); - } - else - { - result.push_back(Pair("result","error")); - result.push_back(Pair("error","not enough funds")); - } - } - else - { - result.push_back(Pair("result","error")); - result.push_back(Pair("error","couldnt parse")); - } - return(result); -} - -void prices_update(uint32_t timestamp,uint32_t uprice,int32_t ismine) -{ - //fprintf(stderr,"%s t%u %.4f %16llx\n",ismine!=0?"mine":"ext ",timestamp,(double)uprice/10000,(long long)((uint64_t)timestamp<<32) | uprice); -} - -// game specific code for daemon -void games_packitemstr(char *packitemstr,struct games_packitem *item) -{ - strcpy(packitemstr,""); -} - -int64_t games_cashout(struct games_player *P) -{ - int32_t dungeonlevel = P->dungeonlevel; int64_t mult=1000,cashout = 0; - cashout = (uint64_t)P->gold * mult * dungeonlevel * dungeonlevel; - return(cashout); -} - -void pricesplayerjson(UniValue &obj,struct games_player *P) -{ - obj.push_back(Pair("packsize",(int64_t)P->packsize)); - obj.push_back(Pair("hitpoints",(int64_t)P->hitpoints)); - obj.push_back(Pair("strength",(int64_t)(P->strength&0xffff))); - obj.push_back(Pair("maxstrength",(int64_t)(P->strength>>16))); - obj.push_back(Pair("level",(int64_t)P->level)); - obj.push_back(Pair("experience",(int64_t)P->experience)); - obj.push_back(Pair("dungeonlevel",(int64_t)P->dungeonlevel)); -} - -int32_t disp_gamesplayer(char *str,struct games_player *P) -{ - str[0] = 0; - //if ( P->gold <= 0 )//|| P->hitpoints <= 0 || (P->strength&0xffff) <= 0 || P->level <= 0 || P->experience <= 0 || P->dungeonlevel <= 0 ) - // return(-1); - sprintf(str," <- playerdata: gold.%d hp.%d strength.%d/%d level.%d exp.%d dl.%d",P->gold,P->hitpoints,P->strength&0xffff,P->strength>>16,P->level,P->experience,P->dungeonlevel); - return(0); -} - -int32_t games_payloadrecv(CPubKey pk,uint32_t timestamp,std::vector payload) -{ - uint256 gametxid; int32_t i,len; char str[67]; int64_t price; uint32_t eventid = 0; - if ( (len= payload.size()) > 36 ) - { - len -= 36; - for (i=0; i<32; i++) - ((uint8_t *)&gametxid)[i] = payload[len+i]; - eventid = (uint32_t)payload[len+32]; - eventid |= (uint32_t)payload[len+33] << 8; - eventid |= (uint32_t)payload[len+34] << 16; - eventid |= (uint32_t)payload[len+35] << 24; - for (i=0; i> 32),(uint32_t)(price & 0xffffffff),pk == pubkey2pk(Mypubkey())); - //fprintf(stderr,"%llu -> t%u %.4f ",(long long)price,(uint32_t)(price >> 32),(double)(price & 0xffffffff)/10000); - //fprintf(stderr," got payload, from %s %s/e%d\n",pubkey33_str(str,(uint8_t *)&pk),gametxid.GetHex().c_str(),eventid); - return(0); - } else return(-1); -} - -bool games_validate(struct CCcontract_info *cp,int32_t height,Eval *eval,const CTransaction tx) -{ - return(true); -} - diff --git a/src/cc/games/prices.h b/src/cc/games/prices.h deleted file mode 100644 index 1debb9445..000000000 --- a/src/cc/games/prices.h +++ /dev/null @@ -1,211 +0,0 @@ -// Copyright (c) 2016-2023 The Hush developers -// Distributed under the GPLv3 software license, see the accompanying -// file COPYING or https://www.gnu.org/licenses/gpl-3.0.en.html - -#ifndef H_PRICES_H -#define H_PRICES_H - -/***************************************************************************/ -/** https://github.com/brenns10/tetris - @file main.c - @author Stephen Brennan - @date Created Wednesday, 10 June 2015 - @brief Main program for tetris. - @copyright Copyright (c) 2015, Stephen Brennan. Released under the Revised - BSD License. See LICENSE.txt for details. - *******************************************************************************/ - -/* - Convert a tetromino type to its corresponding cell. - */ -#define TYPE_TO_CELL(x) ((x)+1) - -/* - Strings for how you would print a tetris board. - */ -#define TC_EMPTY_STR " " -#define TC_BLOCK_STR "\u2588" - -/* - Questions about a tetris cell. - */ -#define TC_IS_EMPTY(x) ((x) == TC_EMPTY) -#define TC_IS_FILLED(x) (!TC_IS_EMPTY(x)) - -/* - How many cells in a tetromino? - */ -#define TETRIS 4 -/* - How many tetrominos? - */ -#define NUM_TETROMINOS 7 -/* - How many orientations of a tetromino? - */ -#define NUM_ORIENTATIONS 4 - -/* - Level constants. - */ -#define MAX_LEVEL 19 -#define LINES_PER_LEVEL 10 - -/* - A "cell" is a 1x1 block within a tetris board. - */ -typedef enum { - TC_EMPTY, TC_CELLI, TC_CELLJ, TC_CELLL, TC_CELLO, TC_CELLS, TC_CELLT, TC_CELLZ -} tetris_cell; - -/* - A "type" is a type/shape of a tetromino. Not including orientation. - */ -typedef enum { - TET_I, TET_J, TET_L, TET_O, TET_S, TET_T, TET_Z -} tetris_type; - -/* - A row,column pair. Negative numbers allowed, because we need them for - offsets. - */ -typedef struct { - int row; - int col; -} tetris_location; - -/* - A "block" is a struct that contains information about a tetromino. - Specifically, what type it is, what orientation it has, and where it is. - */ -typedef struct { - int typ; - int ori; - tetris_location loc; -} tetris_block; - -/* - All possible moves to give as input to the game. - */ -typedef enum { - TM_LEFT, TM_RIGHT, TM_CLOCK, TM_COUNTER, TM_DROP, TM_HOLD, TM_NONE -} tetris_move; - -/* - A game object! - */ -typedef struct { - /* - Game board stuff: - */ - int rows; - int cols; - /* - Scoring information: - */ - int points; - int level; - /* - Falling block is the one currently going down. Next block is the one that - will be falling after this one. Stored is the block that you can swap out. - */ - tetris_block falling; - tetris_block next; - tetris_block stored; - /* - Number of game ticks until the block will move down. - */ - int ticks_till_gravity; - /* - Number of lines until you advance to the next level. - */ - int lines_remaining; - char board[]; -} tetris_game; - -/* - This array stores all necessary information about the cells that are filled by - each tetromino. The first index is the type of the tetromino (i.e. shape, - e.g. I, J, Z, etc.). The next index is the orientation (0-3). The final - array contains 4 tetris_location objects, each mapping to an offset from a - point on the upper left that is the tetromino "origin". - */ -extern const tetris_location TETROMINOS[NUM_TETROMINOS][NUM_ORIENTATIONS][TETRIS]; - -/* - This array tells you how many ticks per gravity by level. Decreases as level - increases, to add difficulty. - */ -extern const int GRAVITY_LEVEL[MAX_LEVEL+1]; - -// Data structure manipulation. -void tg_init(tetris_game *obj, int rows, int cols); -tetris_game *tg_create(struct games_state *rs,int rows, int cols); -void tg_destroy(tetris_game *obj); -void tg_delete(tetris_game *obj); -tetris_game *tg_load(FILE *f); -void tg_save(tetris_game *obj, FILE *f); - -// Public methods not related to memory: -char tg_get(tetris_game *obj, int row, int col); -bool tg_check(tetris_game *obj, int row, int col); -bool tg_tick(struct games_state *rs,tetris_game *obj, tetris_move move); -void tg_print(tetris_game *obj, FILE *f); - -/****************************************************************************** - * Copyright © 2014-2019 The SuperNET Developers. * - * * - * See the AUTHORS, DEVELOPER-AGREEMENT and LICENSE files at * - * the top-level directory of this distribution for the individual copyright * - * holder information and the developer policies on copyright and licensing. * - * * - * Unless otherwise agreed in a custom licensing agreement, no part of the * - * SuperNET software, including this file may be copied, modified, propagated * - * or distributed except according to the terms contained in the LICENSE file * - * * - * Removal or modification of this copyright notice is prohibited. * - * * - ******************************************************************************/ -#define GAMENAME "prices" // name of executable -#define GAMEMAIN prices // main program of game -#define GAMEPLAYERJSON pricesplayerjson // displays game specific json -#define GAMEDATA pricesdata // extracts data from game specific variables into games_state -#define CHAINNAME "PRICES" // -ac_name= -typedef uint64_t gamesevent; // can be 8, 16, 32, or 64 bits - -#define MAXPACK 23 -struct games_packitem -{ - int32_t type,launch,count,which,hplus,dplus,arm,flags,group; - char damage[8],hurldmg[8]; -}; - -struct games_player -{ - int32_t gold,hitpoints,strength,level,experience,packsize,dungeonlevel,amulet; - struct games_packitem gamespack[MAXPACK]; -}; - -struct games_state -{ - uint64_t seed,origseed; - char *keystrokeshex; - uint32_t needflush,replaydone; - int32_t numkeys,ind,num,guiflag,counter,sleeptime,playersize,restoring,lastnum; - FILE *logfp; - struct games_player P; - gamesevent buffered[5000],*keystrokes; - uint8_t playerdata[8192]; -}; -extern struct games_state globalR; -void *gamesiterate(struct games_state *rs); -int32_t flushkeystrokes(struct games_state *rs,int32_t waitflag); - -void games_packitemstr(char *packitemstr,struct games_packitem *item); -uint64_t _games_rngnext(uint64_t initseed); -int32_t games_replay2(uint8_t *newdata,uint64_t seed,gamesevent *keystrokes,int32_t num,struct games_player *player,int32_t sleepmillis); -gamesevent games_revendian(gamesevent revx); -int32_t disp_gamesplayer(char *str,struct games_player *P); - -#endif - diff --git a/src/cc/games/tetris.c b/src/cc/games/tetris.c deleted file mode 100644 index d7de6f278..000000000 --- a/src/cc/games/tetris.c +++ /dev/null @@ -1,907 +0,0 @@ -// Copyright (c) 2016-2023 The Hush developers -// Distributed under the GPLv3 software license, see the accompanying -// file COPYING or https://www.gnu.org/licenses/gpl-3.0.en.html - -#include "tetris.h" - -/* - In order to port a game into gamesCC, the RNG needs to be seeded with the gametxid seed, also events needs to be broadcast using issue_games_events. Also the game engine needs to be daemonized, preferably by putting all globals into a single data structure. - - also, the standalone game needs to support argv of seed gametxid, along with replay args - */ - -int random_tetromino(struct games_state *rs) -{ - rs->seed = _games_rngnext(rs->seed); - return(rs->seed % NUM_TETROMINOS); -} - -int32_t tetrisdata(struct games_player *P,void *ptr) -{ - tetris_game *tg = (tetris_game *)ptr; - P->gold = tg->points; - P->dungeonlevel = tg->level; - //fprintf(stderr,"score.%d level.%d\n",tg->points,tg->level); - return(0); -} - -/***************************************************************************/ -/** https://github.com/brenns10/tetris - @file main.c - @author Stephen Brennan - @date Created Wednesday, 10 June 2015 - @brief Main program for tetris. - @copyright Copyright (c) 2015, Stephen Brennan. Released under the Revised - BSD License. See LICENSE.txt for details. - *******************************************************************************/ - - -#include // for FILE -#include // for bool -#include -#include -#include -#include -#include -#include - -#ifdef BUILD_GAMESCC -#include "../rogue/cursesd.h" -#else -#include -#endif - - -#define MAX(X,Y) ((X) > (Y) ? (X) : (Y)) -#define MIN(X,Y) ((X) < (Y) ? (X) : (Y)) - -/******************************************************************************* - Array Definitions - *******************************************************************************/ - -const tetris_location TETROMINOS[NUM_TETROMINOS][NUM_ORIENTATIONS][TETRIS] = -{ - // I - {{{1, 0}, {1, 1}, {1, 2}, {1, 3}}, - {{0, 2}, {1, 2}, {2, 2}, {3, 2}}, - {{3, 0}, {3, 1}, {3, 2}, {3, 3}}, - {{0, 1}, {1, 1}, {2, 1}, {3, 1}}}, - // J - {{{0, 0}, {1, 0}, {1, 1}, {1, 2}}, - {{0, 1}, {0, 2}, {1, 1}, {2, 1}}, - {{1, 0}, {1, 1}, {1, 2}, {2, 2}}, - {{0, 1}, {1, 1}, {2, 0}, {2, 1}}}, - // L - {{{0, 2}, {1, 0}, {1, 1}, {1, 2}}, - {{0, 1}, {1, 1}, {2, 1}, {2, 2}}, - {{1, 0}, {1, 1}, {1, 2}, {2, 0}}, - {{0, 0}, {0, 1}, {1, 1}, {2, 1}}}, - // O - {{{0, 1}, {0, 2}, {1, 1}, {1, 2}}, - {{0, 1}, {0, 2}, {1, 1}, {1, 2}}, - {{0, 1}, {0, 2}, {1, 1}, {1, 2}}, - {{0, 1}, {0, 2}, {1, 1}, {1, 2}}}, - // S - {{{0, 1}, {0, 2}, {1, 0}, {1, 1}}, - {{0, 1}, {1, 1}, {1, 2}, {2, 2}}, - {{1, 1}, {1, 2}, {2, 0}, {2, 1}}, - {{0, 0}, {1, 0}, {1, 1}, {2, 1}}}, - // T - {{{0, 1}, {1, 0}, {1, 1}, {1, 2}}, - {{0, 1}, {1, 1}, {1, 2}, {2, 1}}, - {{1, 0}, {1, 1}, {1, 2}, {2, 1}}, - {{0, 1}, {1, 0}, {1, 1}, {2, 1}}}, - // Z - {{{0, 0}, {0, 1}, {1, 1}, {1, 2}}, - {{0, 2}, {1, 1}, {1, 2}, {2, 1}}, - {{1, 0}, {1, 1}, {2, 1}, {2, 2}}, - {{0, 1}, {1, 0}, {1, 1}, {2, 0}}}, -}; - -const int GRAVITY_LEVEL[MAX_LEVEL+1] = { - // 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, - 50, 48, 46, 44, 42, 40, 38, 36, 34, 32, - //10, 11, 12, 13, 14, 15, 16, 17, 18, 19, - 30, 28, 26, 24, 22, 20, 16, 12, 8, 4 -}; - -/******************************************************************************* - Helper Functions for Blocks - *******************************************************************************/ - -void sleep_milli(int milliseconds) -{ - struct timespec ts; - ts.tv_sec = 0; - ts.tv_nsec = milliseconds * 1000 * 1000; - nanosleep(&ts, NULL); -} - -/* - Return the block at the given row and column. - */ -char tg_get(tetris_game *obj, int row, int column) -{ - return obj->board[obj->cols * row + column]; -} - -/* - Set the block at the given row and column. - */ -static void tg_set(tetris_game *obj, int row, int column, char value) -{ - obj->board[obj->cols * row + column] = value; -} - -/* - Check whether a row and column are in bounds. - */ -bool tg_check(tetris_game *obj, int row, int col) -{ - return 0 <= row && row < obj->rows && 0 <= col && col < obj->cols; -} - -/* - Place a block onto the board. - */ -static void tg_put(tetris_game *obj, tetris_block block) -{ - int i; - for (i = 0; i < TETRIS; i++) { - tetris_location cell = TETROMINOS[block.typ][block.ori][i]; - tg_set(obj, block.loc.row + cell.row, block.loc.col + cell.col, - TYPE_TO_CELL(block.typ)); - } -} - -/* - Clear a block out of the board. - */ -static void tg_remove(tetris_game *obj, tetris_block block) -{ - int i; - for (i = 0; i < TETRIS; i++) { - tetris_location cell = TETROMINOS[block.typ][block.ori][i]; - tg_set(obj, block.loc.row + cell.row, block.loc.col + cell.col, TC_EMPTY); - } -} - -/* - Check if a block can be placed on the board. - */ -static bool tg_fits(tetris_game *obj, tetris_block block) -{ - int i, r, c; - for (i = 0; i < TETRIS; i++) { - tetris_location cell = TETROMINOS[block.typ][block.ori][i]; - r = block.loc.row + cell.row; - c = block.loc.col + cell.col; - if (!tg_check(obj, r, c) || TC_IS_FILLED(tg_get(obj, r, c))) { - return false; - } - } - return true; -} - -/* - Create a new falling block and populate the next falling block with a random - one. - */ -static void tg_new_falling(struct games_state *rs,tetris_game *obj) -{ - // Put in a new falling tetromino. - obj->falling = obj->next; - obj->next.typ = random_tetromino(rs); - obj->next.ori = 0; - obj->next.loc.row = 0; - obj->next.loc.col = obj->cols/2 - 2; -} - -/******************************************************************************* - Game Turn Helpers - *******************************************************************************/ - -/* - Tick gravity, and move the block down if gravity should act. - */ -static void tg_do_gravity_tick(struct games_state *rs,tetris_game *obj) -{ - obj->ticks_till_gravity--; - if (obj->ticks_till_gravity <= 0) { - tg_remove(obj, obj->falling); - obj->falling.loc.row++; - if (tg_fits(obj, obj->falling)) { - obj->ticks_till_gravity = GRAVITY_LEVEL[obj->level]; - } else { - obj->falling.loc.row--; - tg_put(obj, obj->falling); - - tg_new_falling(rs,obj); - } - tg_put(obj, obj->falling); - } -} - -/* - Move the falling tetris block left (-1) or right (+1). - */ -static void tg_move(tetris_game *obj, int direction) -{ - tg_remove(obj, obj->falling); - obj->falling.loc.col += direction; - if (!tg_fits(obj, obj->falling)) { - obj->falling.loc.col -= direction; - } - tg_put(obj, obj->falling); -} - -/* - Send the falling tetris block to the bottom. - */ -static void tg_down(struct games_state *rs,tetris_game *obj) -{ - tg_remove(obj, obj->falling); - while (tg_fits(obj, obj->falling)) { - obj->falling.loc.row++; - } - obj->falling.loc.row--; - tg_put(obj, obj->falling); - tg_new_falling(rs,obj); -} - -/* - Rotate the falling block in either direction (+/-1). - */ -static void tg_rotate(tetris_game *obj, int direction) -{ - tg_remove(obj, obj->falling); - - while (true) { - obj->falling.ori = (obj->falling.ori + direction) % NUM_ORIENTATIONS; - - // If the new orientation fits, we're done. - if (tg_fits(obj, obj->falling)) - break; - - // Otherwise, try moving left to make it fit. - obj->falling.loc.col--; - if (tg_fits(obj, obj->falling)) - break; - - // Finally, try moving right to make it fit. - obj->falling.loc.col += 2; - if (tg_fits(obj, obj->falling)) - break; - - // Put it back in its original location and try the next orientation. - obj->falling.loc.col--; - // Worst case, we come back to the original orientation and it fits, so this - // loop will terminate. - } - - tg_put(obj, obj->falling); -} - -/* - Swap the falling block with the block in the hold buffer. - */ -static void tg_hold(struct games_state *rs,tetris_game *obj) -{ - tg_remove(obj, obj->falling); - if (obj->stored.typ == -1) { - obj->stored = obj->falling; - tg_new_falling(rs,obj); - } else { - int typ = obj->falling.typ, ori = obj->falling.ori; - obj->falling.typ = obj->stored.typ; - obj->falling.ori = obj->stored.ori; - obj->stored.typ = typ; - obj->stored.ori = ori; - while (!tg_fits(obj, obj->falling)) { - obj->falling.loc.row--; - if (tg_fits(obj, obj->falling)) { - break; - } - obj->falling.loc.col--; - if (tg_fits(obj, obj->falling)) { - break; - } - obj->falling.loc.col += 2; - } - } - tg_put(obj, obj->falling); -} - -/* - Perform the action specified by the move. - */ -static void tg_handle_move(struct games_state *rs,tetris_game *obj, tetris_move move) -{ - switch (move) { - case TM_LEFT: - //fprintf(stderr,"LEFT "); - tg_move(obj, -1); - break; - case TM_RIGHT: - //fprintf(stderr,"RIGHT "); - tg_move(obj, 1); - break; - case TM_DROP: - tg_down(rs,obj); - break; - case TM_CLOCK: - tg_rotate(obj, 1); - break; - case TM_COUNTER: - tg_rotate(obj, -1); - break; - case TM_HOLD: - tg_hold(rs,obj); - break; - default: - // pass - break; - } -} - -/* - Return true if line i is full. - */ -static bool tg_line_full(tetris_game *obj, int i) -{ - int j; - for (j = 0; j < obj->cols; j++) { - if (TC_IS_EMPTY(tg_get(obj, i, j))) - return false; - } - return true; -} - -/* - Shift every row above r down one. - */ -static void tg_shift_lines(tetris_game *obj, int r) -{ - int i, j; - for (i = r-1; i >= 0; i--) { - for (j = 0; j < obj->cols; j++) { - tg_set(obj, i+1, j, tg_get(obj, i, j)); - tg_set(obj, i, j, TC_EMPTY); - } - } -} - -/* - Find rows that are filled, remove them, shift, and return the number of - cleared rows. - */ -static int tg_check_lines(tetris_game *obj) -{ - int i, nlines = 0; - tg_remove(obj, obj->falling); // don't want to mess up falling block - - for (i = obj->rows-1; i >= 0; i--) { - if (tg_line_full(obj, i)) { - tg_shift_lines(obj, i); - i++; // do this line over again since they're shifted - nlines++; - } - } - - tg_put(obj, obj->falling); // replace - return nlines; -} - -/* - Adjust the score for the game, given how many lines were just cleared. - */ -static void tg_adjust_score(tetris_game *obj, int lines_cleared) -{ - static int line_multiplier[] = {0, 40, 100, 300, 1200}; - obj->points += line_multiplier[lines_cleared] * (obj->level + 1); - if (lines_cleared >= obj->lines_remaining) { - obj->level = MIN(MAX_LEVEL, obj->level + 1); - lines_cleared -= obj->lines_remaining; - obj->lines_remaining = LINES_PER_LEVEL - lines_cleared; - } else { - obj->lines_remaining -= lines_cleared; - } -} - -/* - Return true if the game is over. - */ -static bool tg_game_over(tetris_game *obj) -{ - int i, j; - bool over = false; - tg_remove(obj, obj->falling); - for (i = 0; i < 2; i++) { - for (j = 0; j < obj->cols; j++) { - if (TC_IS_FILLED(tg_get(obj, i, j))) { - over = true; - } - } - } - tg_put(obj, obj->falling); - return over; -} - -/******************************************************************************* - Main Public Functions - *******************************************************************************/ - -/* - Do a single game tick: process gravity, user input, and score. Return true if - the game is still running, false if it is over. - */ -bool tg_tick(struct games_state *rs,tetris_game *obj, tetris_move move) -{ - int lines_cleared; - // Handle gravity. - tg_do_gravity_tick(rs,obj); - - // Handle input. - tg_handle_move(rs,obj, move); - - // Check for cleared lines - lines_cleared = tg_check_lines(obj); - - tg_adjust_score(obj, lines_cleared); - - // Return whether the game will continue (NOT whether it's over) - return !tg_game_over(obj); -} - -void tg_init(struct games_state *rs,tetris_game *obj, int rows, int cols) -{ - // Initialization logic - obj->rows = rows; - obj->cols = cols; - //obj->board = (char *)malloc(rows * cols); - memset(obj->board, TC_EMPTY, rows * cols); - obj->points = 0; - obj->level = 0; - obj->ticks_till_gravity = GRAVITY_LEVEL[obj->level]; - obj->lines_remaining = LINES_PER_LEVEL; - //srand(time(NULL)); - tg_new_falling(rs,obj); - tg_new_falling(rs,obj); - obj->stored.typ = -1; - obj->stored.ori = 0; - obj->stored.loc.row = 0; - obj->next.loc.col = obj->cols/2 - 2; - //printf("%d", obj->falling.loc.col); -} - -tetris_game *tg_create(struct games_state *rs,int rows, int cols) -{ - tetris_game *obj = (tetris_game *)malloc(sizeof(tetris_game) + rows*cols); - tg_init(rs,obj, rows, cols); - return obj; -} - -/*void tg_destroy(tetris_game *obj) -{ - // Cleanup logic - free(obj->board); -}*/ - -void tg_delete(tetris_game *obj) { - //tg_destroy(obj); - free(obj); -} - -/* - Load a game from a file. - -tetris_game *tg_load(FILE *f) -{ - tetris_game *obj = (tetris_game *)malloc(sizeof(tetris_game)); - if (fread(obj, sizeof(tetris_game), 1, f) != 1 ) - { - fprintf(stderr,"read game error\n"); - free(obj); - obj = 0; - } - else - { - obj->board = (char *)malloc(obj->rows * obj->cols); - if (fread(obj->board, sizeof(char), obj->rows * obj->cols, f) != obj->rows * obj->cols ) - { - fprintf(stderr,"fread error\n"); - free(obj->board); - free(obj); - obj = 0; - } - } - return obj; -}*/ - -/* - Save a game to a file. - -void tg_save(tetris_game *obj, FILE *f) -{ - if (fwrite(obj, sizeof(tetris_game), 1, f) != 1 ) - fprintf(stderr,"error writing tetrisgame\n"); - else if (fwrite(obj->board, sizeof(char), obj->rows * obj->cols, f) != obj->rows * obj->cols ) - fprintf(stderr,"error writing board\n"); -}*/ - -/* - Print a game board to a file. Really just for early debugging. - */ -void tg_print(tetris_game *obj, FILE *f) { - int i, j; - for (i = 0; i < obj->rows; i++) { - for (j = 0; j < obj->cols; j++) { - if (TC_IS_EMPTY(tg_get(obj, i, j))) { - fputs(TC_EMPTY_STR, f); - } else { - fputs(TC_BLOCK_STR, f); - } - } - fputc('\n', f); - } -} - -/* - 2 columns per cell makes the game much nicer. - */ -#define COLS_PER_CELL 2 -/* - Macro to print a cell of a specific type to a window. - */ -#define ADD_BLOCK(w,x) waddch((w),' '|A_REVERSE|COLOR_PAIR(x)); \ -waddch((w),' '|A_REVERSE|COLOR_PAIR(x)) -#define ADD_EMPTY(w) waddch((w), ' '); waddch((w), ' ') - -/* - Print the tetris board onto the ncurses window. - */ -void display_board(WINDOW *w, tetris_game *obj) -{ - int i, j; - box(w, 0, 0); - for (i = 0; i < obj->rows; i++) { - wmove(w, 1 + i, 1); - for (j = 0; j < obj->cols; j++) { - if (TC_IS_FILLED(tg_get(obj, i, j))) { - ADD_BLOCK(w,tg_get(obj, i, j)); - } else { - ADD_EMPTY(w); - } - } - } - wnoutrefresh(w); -} - -/* - Display a tetris piece in a dedicated window. - */ -void display_piece(WINDOW *w, tetris_block block) -{ - int b; - tetris_location c; - wclear(w); - box(w, 0, 0); - if (block.typ == -1) { - wnoutrefresh(w); - return; - } - for (b = 0; b < TETRIS; b++) { - c = TETROMINOS[block.typ][block.ori][b]; - wmove(w, c.row + 1, c.col * COLS_PER_CELL + 1); - ADD_BLOCK(w, TYPE_TO_CELL(block.typ)); - } - wnoutrefresh(w); -} - -/* - Display score information in a dedicated window. - */ -void display_score(WINDOW *w, tetris_game *tg) -{ - wclear(w); - box(w, 0, 0); - wprintw(w, (char *)"Score\n%d\n", tg->points); - wprintw(w, (char *)"Level\n%d\n", tg->level); - wprintw(w, (char *)"Lines\n%d\n", tg->lines_remaining); - wnoutrefresh(w); -} - -/* - Save and exit the game. - -void save(tetris_game *game, WINDOW *w) -{ - FILE *f; - - wclear(w); - box(w, 0, 0); // return the border - wmove(w, 1, 1); - wprintw(w, (char *)"Save and exit? [Y/n] "); - wrefresh(w); - timeout(-1); - if (getch() == 'n') { - timeout(0); - return; - } - f = fopen("tetris.save", "w"); - tg_save(game, f); - fclose(f); - tg_delete(game); - endwin(); - fprintf(stderr,"Game saved to \"tetris.save\".\n"); - fprintf(stderr,"Resume by passing the filename as an argument to this program.\n"); - exit(EXIT_SUCCESS); -}*/ - -/* - Do the NCURSES initialization steps for color blocks. - */ -void init_colors(void) -{ - start_color(); - //init_color(COLOR_ORANGE, 1000, 647, 0); - init_pair(TC_CELLI, COLOR_CYAN, COLOR_BLACK); - init_pair(TC_CELLJ, COLOR_BLUE, COLOR_BLACK); - init_pair(TC_CELLL, COLOR_WHITE, COLOR_BLACK); - init_pair(TC_CELLO, COLOR_YELLOW, COLOR_BLACK); - init_pair(TC_CELLS, COLOR_GREEN, COLOR_BLACK); - init_pair(TC_CELLT, COLOR_MAGENTA, COLOR_BLACK); - init_pair(TC_CELLZ, COLOR_RED, COLOR_BLACK); -} - -struct games_state globalR; -extern char Gametxidstr[]; -int32_t issue_games_events(struct games_state *rs,char *gametxidstr,uint32_t eventid,gamesevent c); -gamesevent games_readevent(struct games_state *rs); - -void *gamesiterate(struct games_state *rs) -{ - uint32_t counter = 0; bool running = true; tetris_move move = TM_NONE; - gamesevent c; uint16_t skipcount=0; int32_t prevlevel; uint32_t eventid = 0; tetris_game *tg; - WINDOW *board, *next, *hold, *score; - if ( rs->guiflag != 0 || rs->sleeptime != 0 ) - { - // NCURSES initialization: - initscr(); // initialize curses - cbreak(); // pass key presses to program, but not signals - noecho(); // don't echo key presses to screen - keypad(stdscr, TRUE); // allow arrow keys - timeout(0); // no blocking on getch() - curs_set(0); // set the cursor to invisible - init_colors(); // setup tetris colors - } - tg = tg_create(rs,22, 10); - prevlevel = tg->level; - // Create windows for each section of the interface. - board = newwin(tg->rows + 2, 2 * tg->cols + 2, 0, 0); - next = newwin(6, 10, 0, 2 * (tg->cols + 1) + 1); - hold = newwin(6, 10, 7, 2 * (tg->cols + 1) + 1); - score = newwin(6, 10, 14, 2 * (tg->cols + 1 ) + 1); - while ( running != 0 ) - { - running = tg_tick(rs,tg,move); - if ( 1 && (rs->guiflag != 0 || rs->sleeptime != 0) ) - { - display_board(board,tg); - display_piece(next,tg->next); - display_piece(hold,tg->stored); - display_score(score,tg); - } - if ( rs->guiflag != 0 ) - { -#ifdef STANDALONE - sleep_milli(15); - if ( (counter++ % 10) == 0 ) - doupdate(); - c = games_readevent(rs); - if ( c <= 0x7f || skipcount == 0x3fff ) - { - if ( skipcount > 0 ) - issue_games_events(rs,Gametxidstr,eventid-skipcount,skipcount | 0x4000); - if ( c <= 0x7f ) - issue_games_events(rs,Gametxidstr,eventid,c); - if ( tg->level != prevlevel ) - { - flushkeystrokes(rs,0); - prevlevel = tg->level; - } - skipcount = 0; - } else skipcount++; -#endif - } - else - { - if ( rs->replaydone != 0 ) - break; - if ( rs->sleeptime != 0 ) - { - sleep_milli(1); - if ( (counter++ % 20) == 0 ) - doupdate(); - } - if ( skipcount == 0 ) - { - c = games_readevent(rs); - //fprintf(stderr,"%04x score.%d level.%d\n",c,tg->points,tg->level); - if ( (c & 0x4000) == 0x4000 ) - { - skipcount = (c & 0x3fff); - c = 'S'; - } - } - if ( skipcount > 0 ) - skipcount--; - } - eventid++; - switch ( c ) - { - case 'h': - move = TM_LEFT; - break; - case 'l': - move = TM_RIGHT; - break; - case 'k': - move = TM_CLOCK; - break; - case 'j': - move = TM_DROP; - break; - case 'q': - running = false; - move = TM_NONE; - break; - /*case 'p': - wclear(board); - box(board, 0, 0); - wmove(board, tg->rows/2, (tg->cols*COLS_PER_CELL-6)/2); - wprintw(board, "PAUSED"); - wrefresh(board); - timeout(-1); - getch(); - timeout(0); - move = TM_NONE; - break; - case 's': - save(tg, board); - move = TM_NONE; - break;*/ - case ' ': - move = TM_HOLD; - break; - default: - move = TM_NONE; - } - } - return(tg); -} - -#ifdef STANDALONE -/* - Main tetris game! - */ -#include "dapps/dappstd.c" - - -char *clonestr(char *str) -{ - char *clone; int32_t len; - if ( str == 0 || str[0] == 0 ) - { - printf("warning cloning nullstr.%p\n",str); -#ifdef __APPLE__ - while ( 1 ) sleep(1); -#endif - str = (char *)""; - } - len = strlen(str); - clone = (char *)calloc(1,len+16); - strcpy(clone,str); - return(clone); -} - -int32_t issue_games_events(struct games_state *rs,char *gametxidstr,uint32_t eventid,gamesevent c) -{ - static FILE *fp; - char params[512],*retstr; cJSON *retjson,*resobj; int32_t retval = -1; - if ( fp == 0 ) - fp = fopen("events.log","wb"); - rs->buffered[rs->num++] = c; - if ( 0 ) - { - if ( sizeof(c) == 1 ) - sprintf(params,"[\"events\",\"17\",\"[%%22%02x%%22,%%22%s%%22,%u]\"]",(uint8_t)c&0xff,gametxidstr,eventid); - else if ( sizeof(c) == 2 ) - sprintf(params,"[\"events\",\"17\",\"[%%22%04x%%22,%%22%s%%22,%u]\"]",(uint16_t)c&0xffff,gametxidstr,eventid); - else if ( sizeof(c) == 4 ) - sprintf(params,"[\"events\",\"17\",\"[%%22%08x%%22,%%22%s%%22,%u]\"]",(uint32_t)c&0xffffffff,gametxidstr,eventid); - else if ( sizeof(c) == 8 ) - sprintf(params,"[\"events\",\"17\",\"[%%22%016llx%%22,%%22%s%%22,%u]\"]",(long long)c,gametxidstr,eventid); - if ( (retstr= hush_issuemethod(USERPASS,(char *)"cclib",params,GAMES_PORT)) != 0 ) - { - if ( (retjson= cJSON_Parse(retstr)) != 0 ) - { - if ( (resobj= jobj(retjson,(char *)"result")) != 0 ) - { - retval = 0; - if ( fp != 0 ) - { - fprintf(fp,"%s\n",jprint(resobj,0)); - fflush(fp); - } - } - free_json(retjson); - } else fprintf(fp,"error parsing %s\n",retstr); - free(retstr); - } else fprintf(fp,"error issuing method %s\n",params); - return(retval); - } else return(0); -} - -int tetris(int argc, char **argv) -{ - struct games_state *rs = &globalR; - int32_t c,skipcount=0; uint32_t eventid = 0; tetris_game *tg = 0; - memset(rs,0,sizeof(*rs)); - rs->guiflag = 1; - rs->sleeptime = 1; // non-zero to allow refresh() - if ( argc >= 2 && strlen(argv[2]) == 64 ) - { -#ifdef _WIN32 -#ifdef _MSC_VER - rs->origseed = _strtoui64(argv[1], NULL, 10); -#else - rs->origseed = atol(argv[1]); // windows, but not MSVC -#endif // _MSC_VER -#else - rs->origseed = atol(argv[1]); // non-windows -#endif // _WIN32 - rs->seed = rs->origseed; - if ( argc >= 3 ) - { - strcpy(Gametxidstr,argv[2]); - fprintf(stderr,"setplayerdata %s\n",Gametxidstr); - if ( games_setplayerdata(rs,Gametxidstr) < 0 ) - { - fprintf(stderr,"invalid gametxid, or already started\n"); - return(-1); - } - } - } else rs->seed = 777; - - /* Load file if given a filename. - if (argc >= 2) { - FILE *f = fopen(argv[1], "r"); - if (f == NULL) { - perror("tetris"); - exit(EXIT_FAILURE); - } - tg = tg_load(f); - fclose(f); - } else { - // Otherwise create new game. - tg = tg_create(rs,22, 10); - }*/ - - // Game loop - tg = (tetris_game *)gamesiterate(rs); - gamesbailout(rs); - // Deinitialize NCurses - wclear(stdscr); - endwin(); - // Output ending message. - printf("Game over!\n"); - printf("You finished with %d points on level %d.\n", tg->points, tg->level); - - // Deinitialize Tetris - tg_delete(tg); - return 0; -} - -#endif - diff --git a/src/cc/games/tetris.cpp b/src/cc/games/tetris.cpp deleted file mode 100644 index b0ffaff56..000000000 --- a/src/cc/games/tetris.cpp +++ /dev/null @@ -1,88 +0,0 @@ -// Copyright (c) 2016-2023 The Hush developers - -/****************************************************************************** - * Copyright © 2014-2019 The SuperNET Developers. * - * * - * See the AUTHORS, DEVELOPER-AGREEMENT and LICENSE files at * - * the top-level directory of this distribution for the individual copyright * - * holder information and the developer policies on copyright and licensing. * - * * - * Unless otherwise agreed in a custom licensing agreement, no part of the * - * SuperNET software, including this file may be copied, modified, propagated * - * or distributed except according to the terms contained in the LICENSE file * - * * - * Removal or modification of this copyright notice is prohibited. * - * * - ******************************************************************************/ - -std::string MYCCLIBNAME = (char *)"gamescc"; - -// game specific code for daemon -void games_packitemstr(char *packitemstr,struct games_packitem *item) -{ - strcpy(packitemstr,""); -} - -int64_t games_cashout(struct games_player *P) -{ - int32_t dungeonlevel = P->dungeonlevel; int64_t mult=10000,cashout = 0; - cashout = (uint64_t)P->gold * mult; - return(cashout); -} - -void tetrisplayerjson(UniValue &obj,struct games_player *P) -{ - obj.push_back(Pair("packsize",(int64_t)P->packsize)); - obj.push_back(Pair("hitpoints",(int64_t)P->hitpoints)); - obj.push_back(Pair("strength",(int64_t)(P->strength&0xffff))); - obj.push_back(Pair("maxstrength",(int64_t)(P->strength>>16))); - obj.push_back(Pair("level",(int64_t)P->level)); - obj.push_back(Pair("experience",(int64_t)P->experience)); - obj.push_back(Pair("dungeonlevel",(int64_t)P->dungeonlevel)); -} - -int32_t disp_gamesplayer(char *str,struct games_player *P) -{ - str[0] = 0; - //if ( P->gold <= 0 )//|| P->hitpoints <= 0 || (P->strength&0xffff) <= 0 || P->level <= 0 || P->experience <= 0 || P->dungeonlevel <= 0 ) - // return(-1); - sprintf(str," <- playerdata: gold.%d hp.%d strength.%d/%d level.%d exp.%d dl.%d",P->gold,P->hitpoints,P->strength&0xffff,P->strength>>16,P->level,P->experience,P->dungeonlevel); - return(0); -} - -int32_t games_payloadrecv(CPubKey pk,uint32_t timestamp,std::vector payload) -{ - uint256 gametxid; int32_t i,len; char str[67]; uint32_t eventid = 0; - if ( (len= payload.size()) > 36 ) - { - len -= 36; - for (i=0; i<32; i++) - ((uint8_t *)&gametxid)[i] = payload[len+i]; - eventid = (uint32_t)payload[len+32]; - eventid |= (uint32_t)payload[len+33] << 8; - eventid |= (uint32_t)payload[len+34] << 16; - eventid |= (uint32_t)payload[len+35] << 24; - //for (i=0; i -#include -#define GAMES_RNGMULT 11109 -#define GAMES_RNGOFFSET 13849 -#define GAMES_MAXRNGS 10000 - -#ifndef STANDALONE - -#define ENABLE_WALLET -extern CWallet* pwalletMain; - -#include "CCinclude.h" -#include "secp256k1.h" - - -#define EVAL_GAMES (EVAL_FAUCET2+1) -#define GAMES_TXFEE 10000 -#define GAMES_MAXITERATIONS 777 -#define GAMES_MAXKEYSTROKESGAP 60 -#define GAMES_MAXPLAYERS 64 -#define GAMES_REGISTRATIONSIZE (100 * 10000) -#define GAMES_REGISTRATION 1 - - -#define MYCCNAME "games" - -std::string Games_pname; - -#define RPC_FUNCS \ - { (char *)MYCCNAME, (char *)"rng", (char *)"hash,playerid", 1, 2, ' ', EVAL_GAMES }, \ - { (char *)MYCCNAME, (char *)"rngnext", (char *)"seed", 1, 1, ' ', EVAL_GAMES }, \ - { (char *)MYCCNAME, (char *)"fund", (char *)"amount", 1, 1, ' ', EVAL_GAMES }, \ - { (char *)MYCCNAME, (char *)"players", (char *)"no params", 0, 0, ' ', EVAL_GAMES }, \ - { (char *)MYCCNAME, (char *)"games", (char *)"no params", 0, 0, ' ', EVAL_GAMES }, \ - { (char *)MYCCNAME, (char *)"pending", (char *)"no params", 0, 0, ' ', EVAL_GAMES }, \ - { (char *)MYCCNAME, (char *)"setname", (char *)"pname", 1, 1, ' ', EVAL_GAMES }, \ - { (char *)MYCCNAME, (char *)"newgame", (char *)"maxplayers,buyin", 2, 2, 'C', EVAL_GAMES }, \ - { (char *)MYCCNAME, (char *)"playerinfo", (char *)"playertxid", 1, 1, ' ', EVAL_GAMES }, \ - { (char *)MYCCNAME, (char *)"gameinfo", (char *)"gametxid", 1, 1, ' ', EVAL_GAMES }, \ - { (char *)MYCCNAME, (char *)"keystrokes", (char *)"txid,hexstr", 2, 2, 'K', EVAL_GAMES }, \ - { (char *)MYCCNAME, (char *)"bailout", (char *)"gametxid", 1, 1, 'Q', EVAL_GAMES }, \ - { (char *)MYCCNAME, (char *)"highlander", (char *)"gametxid", 1, 1, 'H', EVAL_GAMES }, \ - { (char *)MYCCNAME, (char *)"events", (char *)"eventshex [gametxid [eventid]]", 1, 3, ' ', EVAL_GAMES }, \ - { (char *)MYCCNAME, (char *)"extract", (char *)"gametxid [pubkey]", 1, 2, ' ', EVAL_GAMES }, \ - { (char *)MYCCNAME, (char *)"bet", (char *)"amount hexstr", 2, 2, ' ', EVAL_GAMES }, \ - { (char *)MYCCNAME, (char *)"settle", (char *)"height", 1, 1, ' ', EVAL_GAMES }, \ - { (char *)MYCCNAME, (char *)"register", (char *)"gametxid [playertxid]", 1, 2, 'R', EVAL_GAMES }, - -bool games_validate(struct CCcontract_info *cp,int32_t height,Eval *eval,const CTransaction tx); -UniValue games_rng(uint64_t txfee,struct CCcontract_info *cp,cJSON *params); -UniValue games_rngnext(uint64_t txfee,struct CCcontract_info *cp,cJSON *params); -UniValue games_fund(uint64_t txfee,struct CCcontract_info *cp,cJSON *params); -UniValue games_players(uint64_t txfee,struct CCcontract_info *cp,cJSON *params); -UniValue games_games(uint64_t txfee,struct CCcontract_info *cp,cJSON *params); -UniValue games_pending(uint64_t txfee,struct CCcontract_info *cp,cJSON *params); -UniValue games_setname(uint64_t txfee,struct CCcontract_info *cp,cJSON *params); -UniValue games_newgame(uint64_t txfee,struct CCcontract_info *cp,cJSON *params); -UniValue games_playerinfo(uint64_t txfee,struct CCcontract_info *cp,cJSON *params); -UniValue games_gameinfo(uint64_t txfee,struct CCcontract_info *cp,cJSON *params); -UniValue games_keystrokes(uint64_t txfee,struct CCcontract_info *cp,cJSON *params); -UniValue games_bailout(uint64_t txfee,struct CCcontract_info *cp,cJSON *params); -UniValue games_highlander(uint64_t txfee,struct CCcontract_info *cp,cJSON *params); -UniValue games_events(uint64_t txfee,struct CCcontract_info *cp,cJSON *params); -UniValue games_extract(uint64_t txfee,struct CCcontract_info *cp,cJSON *params); -UniValue games_register(uint64_t txfee,struct CCcontract_info *cp,cJSON *params); -UniValue games_bet(uint64_t txfee,struct CCcontract_info *cp,cJSON *params); -UniValue games_settle(uint64_t txfee,struct CCcontract_info *cp,cJSON *params); - -#define CUSTOM_DISPATCH \ -if ( cp->evalcode == EVAL_GAMES ) \ -{ \ - if ( strcmp(method,"rng") == 0 ) \ - return(games_rng(txfee,cp,params)); \ - else if ( strcmp(method,"rngnext") == 0 ) \ - return(games_rngnext(txfee,cp,params)); \ - else if ( strcmp(method,"newgame") == 0 ) \ - return(games_newgame(txfee,cp,params)); \ - else if ( strcmp(method,"gameinfo") == 0 ) \ - return(games_gameinfo(txfee,cp,params)); \ - else if ( strcmp(method,"register") == 0 ) \ - return(games_register(txfee,cp,params)); \ - else if ( strcmp(method,"events") == 0 ) \ - return(games_events(txfee,cp,params)); \ - else if ( strcmp(method,"players") == 0 ) \ - return(games_players(txfee,cp,params)); \ - else if ( strcmp(method,"games") == 0 ) \ - return(games_games(txfee,cp,params)); \ - else if ( strcmp(method,"pending") == 0 ) \ - return(games_pending(txfee,cp,params)); \ - else if ( strcmp(method,"setname") == 0 ) \ - return(games_setname(txfee,cp,params)); \ - else if ( strcmp(method,"playerinfo") == 0 ) \ - return(games_playerinfo(txfee,cp,params)); \ - else if ( strcmp(method,"keystrokes") == 0 ) \ - return(games_keystrokes(txfee,cp,params)); \ - else if ( strcmp(method,"extract") == 0 ) \ - return(games_extract(txfee,cp,params)); \ - else if ( strcmp(method,"bailout") == 0 ) \ - return(games_bailout(txfee,cp,params)); \ - else if ( strcmp(method,"highlander") == 0 ) \ - return(games_highlander(txfee,cp,params)); \ - else if ( strcmp(method,"fund") == 0 ) \ - return(games_fund(txfee,cp,params)); \ - else if ( strcmp(method,"bet") == 0 ) \ - return(games_bet(txfee,cp,params)); \ - else if ( strcmp(method,"settle") == 0 ) \ - return(games_settle(txfee,cp,params)); \ - else \ - { \ - result.push_back(Pair("result","error")); \ - result.push_back(Pair("error","invalid gamescc method")); \ - return(result); \ - } \ -} -#endif - -#endif diff --git a/src/cc/musig.cpp b/src/cc/musig.cpp index 1c050c112..6aafe5fd5 100644 --- a/src/cc/musig.cpp +++ b/src/cc/musig.cpp @@ -202,14 +202,6 @@ struct secp256k1_context_struct { //#include "../secp256k1/include/secp256k1_schnorrsig.h" #include "../secp256k1/include/secp256k1_musig.h" - -extern "C" int secp256k1_ecmult_multi_var(const secp256k1_ecmult_context *ctx, secp256k1_scratch *scratch, secp256k1_gej *r, const secp256k1_scalar *inp_g_sc, secp256k1_ecmult_multi_callback cb, void *cbdata, size_t n); -extern "C" int secp256k1_schnorrsig_verify(const secp256k1_context* ctx, const secp256k1_schnorrsig *sig, const unsigned char *msg32, const secp256k1_pubkey *pk); -extern "C" int secp256k1_schnorrsig_parse(const secp256k1_context* ctx, secp256k1_schnorrsig* sig, const unsigned char *in64); -extern "C" int secp256k1_musig_pubkey_combine(const secp256k1_context* ctx, secp256k1_scratch_space *scratch, secp256k1_pubkey *combined_pk, unsigned char *pk_hash32, const secp256k1_pubkey *pubkeys, size_t n_pubkeys); -extern "C" int secp256k1_musig_session_initialize(const secp256k1_context* ctx, secp256k1_musig_session *session, secp256k1_musig_session_signer_data *signers, unsigned char *nonce_commitment32, const unsigned char *session_id32, const unsigned char *msg32, const secp256k1_pubkey *combined_pk, const unsigned char *pk_hash32, size_t n_signers, size_t my_index, const unsigned char *seckey); -extern "C" int secp256k1_schnorrsig_serialize(const secp256k1_context* ctx, unsigned char *out64, const secp256k1_schnorrsig* sig); - #define MUSIG_PREVN 0 // for now, just use vout0 for the musig output #define MUSIG_TXFEE 10000 @@ -243,631 +235,107 @@ struct musig_info *musig_infocreate(int32_t myind,int32_t num) void musig_infofree(struct musig_info *mp) { - if ( mp->partial_sig != 0 ) - { - GetRandBytes((uint8_t *)mp->partial_sig,mp->num*sizeof(*mp->partial_sig)); - free(mp->partial_sig); - } - if ( mp->nonces != 0 ) - { - GetRandBytes((uint8_t *)mp->nonces,mp->num*sizeof(*mp->nonces)); - free(mp->nonces); - } - if ( mp->signer_data != 0 ) - { - GetRandBytes((uint8_t *)mp->signer_data,mp->num*sizeof(*mp->signer_data)); - free(mp->signer_data); - } - if ( mp->nonce_commitments != 0 ) - { - GetRandBytes((uint8_t *)mp->nonce_commitments,mp->num*32); - free(mp->nonce_commitments); - } - if ( mp->commitment_ptrs != 0 ) - { - GetRandBytes((uint8_t *)mp->commitment_ptrs,mp->num*sizeof(*mp->commitment_ptrs)); - free(mp->commitment_ptrs); - } - GetRandBytes((uint8_t *)mp,sizeof(*mp)); - free(mp); } CScript musig_sendopret(uint8_t funcid,CPubKey pk) { - CScript opret; uint8_t evalcode = EVAL_MUSIG; - opret << OP_RETURN << E_MARSHAL(ss << evalcode << funcid << pk); + CScript opret; return(opret); } uint8_t musig_sendopretdecode(CPubKey &pk,CScript scriptPubKey) { - std::vector vopret; uint8_t e,f; - GetOpReturnData(scriptPubKey,vopret); - if ( vopret.size() > 2 && E_UNMARSHAL(vopret,ss >> e; ss >> f; ss >> pk) != 0 && e == EVAL_MUSIG && f == 'x' ) - { - return(f); - } return(0); } CScript musig_spendopret(uint8_t funcid,CPubKey pk,std::vector musig64) { - CScript opret; uint8_t evalcode = EVAL_MUSIG; - opret << OP_RETURN << E_MARSHAL(ss << evalcode << funcid << pk << musig64); + CScript opret; return(opret); } uint8_t musig_spendopretdecode(CPubKey &pk,std::vector &musig64,CScript scriptPubKey) { - std::vector vopret; uint8_t e,f; - GetOpReturnData(scriptPubKey,vopret); - if ( vopret.size() > 2 && E_UNMARSHAL(vopret,ss >> e; ss >> f; ss >> pk; ss >> musig64) != 0 && e == EVAL_MUSIG && f == 'y' ) - { - return(f); - } return(0); } int32_t musig_parsepubkey(secp256k1_context *ctx,secp256k1_pubkey &spk,cJSON *item) { - char *hexstr; - if ( (hexstr= jstr(item,0)) != 0 && is_hexstr(hexstr,0) == 66 ) - { - CPubKey pk(ParseHex(hexstr)); - if ( secp256k1_ec_pubkey_parse(ctx,&spk,pk.begin(),33) > 0 ) - return(1); - } else return(-1); + return -1; } int32_t musig_msghash(uint8_t *msg,uint256 prevhash,int32_t prevn,CTxOut vout,CPubKey pk) { - CScript data; uint256 hash; int32_t len = 0; - data << E_MARSHAL(ss << prevhash << prevn << vout << pk); - hash = Hash(data.begin(),data.end()); - memcpy(msg,&hash,sizeof(hash)); return(0); } int32_t musig_prevoutmsg(uint8_t *msg,uint256 sendtxid,CScript scriptPubKey) { - CTransaction vintx; uint256 hashBlock; int32_t numvouts; CTxOut vout; CPubKey pk; - memset(msg,0,32); - if ( myGetTransaction(sendtxid,vintx,hashBlock) != 0 && (numvouts= vintx.vout.size()) > 1 ) - { - if ( musig_sendopretdecode(pk,vintx.vout[numvouts-1].scriptPubKey) == 'x' ) - { - vout.nValue = vintx.vout[MUSIG_PREVN].nValue - MUSIG_TXFEE; - vout.scriptPubKey = scriptPubKey; - return(musig_msghash(msg,sendtxid,MUSIG_PREVN,vout,pk)); - } - } return(-1); } UniValue musig_calcmsg(uint64_t txfee,struct CCcontract_info *cp,cJSON *params) { - UniValue result(UniValue::VOBJ); uint256 sendtxid; int32_t i,zeros=0; uint8_t msg[32]; char *scriptstr,str[65]; int32_t n; - if ( params != 0 && (n= cJSON_GetArraySize(params)) > 0 ) - { - if ( n == 2 ) - { - sendtxid = juint256(jitem(params,0)); - scriptstr = jstr(jitem(params,1),0); - if ( is_hexstr(scriptstr,0) != 0 ) - { - CScript scriptPubKey; - scriptPubKey.resize(strlen(scriptstr)/2); - decode_hex(&scriptPubKey[0],strlen(scriptstr)/2,scriptstr); - musig_prevoutmsg(msg,sendtxid,scriptPubKey); - for (i=0; i<32; i++) - { - sprintf(&str[i<<1],"%02x",msg[i]); - if ( msg[i] == 0 ) - zeros++; - } - str[64] = 0; - if ( zeros != 32 ) - { - result.push_back(Pair("msg",str)); - result.push_back(Pair("result","success")); - return(result); - } else return(cclib_error(result,"null result, make sure params are sendtxid, scriptPubKey")); - } else return(cclib_error(result,"script is not hex")); - } else return(cclib_error(result,"need exactly 2 parameters: sendtxid, scriptPubKey")); - } else return(cclib_error(result,"couldnt parse params")); + UniValue result(UniValue::VOBJ); + return result; } UniValue musig_combine(uint64_t txfee,struct CCcontract_info *cp,cJSON *params) { - static secp256k1_context *ctx; - size_t clen = CPubKey::PUBLIC_KEY_SIZE; - UniValue result(UniValue::VOBJ); CPubKey pk; int32_t i,n; uint8_t pkhash[32]; char *hexstr,str[67]; secp256k1_pubkey combined_pk,spk; std::vector pubkeys; - if ( ctx == 0 ) - ctx = secp256k1_context_create(SECP256K1_CONTEXT_SIGN | SECP256K1_CONTEXT_VERIFY); - if ( params != 0 && (n= cJSON_GetArraySize(params)) > 0 ) - { - //fprintf(stderr,"n.%d args.(%s)\n",n,jprint(params,0)); - for (i=0; i 0 ) - { - if ( secp256k1_ec_pubkey_serialize(ctx,(uint8_t *)pk.begin(),&clen,&combined_pk,SECP256K1_EC_COMPRESSED) > 0 && clen == 33 ) - { - for (i=0; i<32; i++) - sprintf(&str[i<<1],"%02x",pkhash[i]); - str[64] = 0; - result.push_back(Pair("pkhash",str)); - - for (i=0; i<33; i++) - sprintf(&str[i<<1],"%02x",((uint8_t *)pk.begin())[i]); - str[66] = 0; - result.push_back(Pair("combined_pk",str)); - result.push_back(Pair("result","success")); - return(result); - } else return(cclib_error(result,"error serializeing combined_pk")); - } else return(cclib_error(result,"error combining pukbeys")); - } else return(cclib_error(result,"need pubkeys params")); + UniValue result(UniValue::VOBJ); + return result; } UniValue musig_session(uint64_t txfee,struct CCcontract_info *cp,cJSON *params) { - static secp256k1_context *ctx; - UniValue result(UniValue::VOBJ); int32_t i,n,myind,num,musiglocation; char *pkstr,*pkhashstr,*msgstr; uint8_t session[32],msg[32],pkhash[32],privkey[32],pub33[33]; CPubKey pk; char str[67]; - if ( ctx == 0 ) - ctx = secp256k1_context_create(SECP256K1_CONTEXT_SIGN | SECP256K1_CONTEXT_VERIFY); - if ( params != 0 && (n= cJSON_GetArraySize(params)) >= 5 ) - { - myind = juint(jitem(params,0),0); - num = juint(jitem(params,1),0); - if ( myind < 0 || myind >= num || num <= 0 ) - return(cclib_error(result,"illegal myindex and numsigners")); - if ( n > 5 ) - musiglocation = juint(jitem(params,5),0); - else if ( n == 5 ) - musiglocation = 0; - //printf("number of params.%i musiglocation.%i\n",n,musiglocation); - if ( MUSIG.size() > musiglocation ) - { - for (int i = 0; i < MUSIG.size()-1; i++) - musig_infofree(MUSIG[i]); - MUSIG.clear(); - } - struct musig_info *temp_musig = musig_infocreate(myind,num); - MUSIG.push_back(temp_musig); - if ( musig_parsepubkey(ctx,MUSIG[musiglocation]->combined_pk,jitem(params,2)) < 0 ) - return(cclib_error(result,"error parsing combined_pubkey")); - else if ( cclib_parsehash(MUSIG[musiglocation]->pkhash,jitem(params,3),32) < 0 ) - return(cclib_error(result,"error parsing pkhash")); - else if ( cclib_parsehash(MUSIG[musiglocation]->msg,jitem(params,4),32) < 0 ) - return(cclib_error(result,"error parsing msg")); - Myprivkey(privkey); - GetRandBytes(session,32); - /** Initializes a signing session for a signer - * - * Returns: 1: session is successfully initialized - * 0: session could not be initialized: secret key or secret nonce overflow - * Args: ctx: pointer to a context object, initialized for signing (cannot - * be NULL) - * Out: session: the session structure to initialize (cannot be NULL) - * signers: an array of signers' data to be initialized. Array length must - * equal to `n_signers` (cannot be NULL) - * nonce_commitment32: filled with a 32-byte commitment to the generated nonce - * (cannot be NULL) - * In: session_id32: a *unique* 32-byte ID to assign to this session (cannot be - * NULL). If a non-unique session_id32 was given then a partial - * signature will LEAK THE SECRET KEY. - * msg32: the 32-byte message to be signed. Shouldn't be NULL unless you - * require sharing public nonces before the message is known - * because it reduces nonce misuse resistance. If NULL, must be - * set with `musig_session_set_msg` before signing and verifying. - * combined_pk: the combined public key of all signers (cannot be NULL) - * pk_hash32: the 32-byte hash of the signers' individual keys (cannot be - * NULL) - * n_signers: length of signers array. Number of signers participating in - * the MuSig. Must be greater than 0 and at most 2^32 - 1. - * my_index: index of this signer in the signers array - * seckey: the signer's 32-byte secret key (cannot be NULL) - */ - //fprintf(stderr, "SESSION: struct_size.%li using struct %i\n",MUSIG.size(), musiglocation); - if ( secp256k1_musig_session_initialize(ctx,&MUSIG[musiglocation]->session,MUSIG[musiglocation]->signer_data, &MUSIG[musiglocation]->nonce_commitments[MUSIG[musiglocation]->myind * 32],session,MUSIG[musiglocation]->msg,&MUSIG[musiglocation]->combined_pk,MUSIG[musiglocation]->pkhash,MUSIG[musiglocation]->num,MUSIG[musiglocation]->myind,privkey) > 0 ) - { - memset(session,0,sizeof(session)); - result.push_back(Pair("myind",(int64_t)myind)); - result.push_back(Pair("numsigners",(int64_t)num)); - for (i=0; i<32; i++) - sprintf(&str[i<<1],"%02x",MUSIG[musiglocation]->nonce_commitments[MUSIG[musiglocation]->myind*32 + i]); - str[64] = 0; - if ( n == 5 ) - MUSIG[musiglocation]->numcommits = 1; - result.push_back(Pair("commitment",str)); - result.push_back(Pair("result","success")); - memset(privkey,0,sizeof(privkey)); - return(result); - } - else - { - memset(privkey,0,sizeof(privkey)); - memset(session,0,sizeof(session)); - return(cclib_error(result,"couldnt initialize session")); - } - } else return(cclib_error(result,"wrong number of params, need 5: myindex, numsigners, combined_pk, pkhash, msg32")); + UniValue result(UniValue::VOBJ); + return result; } UniValue musig_commit(uint64_t txfee,struct CCcontract_info *cp,cJSON *params) { - static secp256k1_context *ctx; - size_t clen = CPubKey::PUBLIC_KEY_SIZE; - UniValue result(UniValue::VOBJ); int32_t i,n,ind,myind; uint8_t pkhash[32]; CPubKey pk; char str[67]; - if ( ctx == 0 ) - ctx = secp256k1_context_create(SECP256K1_CONTEXT_SIGN | SECP256K1_CONTEXT_VERIFY); - if ( params != 0 && (n= cJSON_GetArraySize(params)) >= 3 ) - { - if ( n > 3 ) - myind = juint(jitem(params,3),0); - else if ( n == 3 ) - myind = 0; - if ( cclib_parsehash(pkhash,jitem(params,0),32) < 0 ) - return(cclib_error(result,"error parsing pkhash")); - else if ( memcmp(MUSIG[myind]->pkhash,pkhash,32) != 0 ) - return(cclib_error(result,"pkhash doesnt match session pkhash")); - else if ( (ind= juint(jitem(params,1),0)) < 0 || ind >= MUSIG[myind]->num ) - return(cclib_error(result,"illegal ind for session")); - else if ( cclib_parsehash(&MUSIG[myind]->nonce_commitments[ind*32],jitem(params,2),32) < 0 ) - return(cclib_error(result,"error parsing commitment")); - /** Gets the signer's public nonce given a list of all signers' data with commitments - * - * Returns: 1: public nonce is written in nonce - * 0: signer data is missing commitments or session isn't initialized - * for signing - * Args: ctx: pointer to a context object (cannot be NULL) - * session: the signing session to get the nonce from (cannot be NULL) - * signers: an array of signers' data initialized with - * `musig_session_initialize`. Array length must equal to - * `n_commitments` (cannot be NULL) - * Out: nonce: the nonce (cannot be NULL) - * In: commitments: array of 32-byte nonce commitments (cannot be NULL) - * n_commitments: the length of commitments and signers array. Must be the total - * number of signers participating in the MuSig. - */ - result.push_back(Pair("added_index",ind)); - //fprintf(stderr, "COMMIT: struct_size.%li using_struct.%i added_index.%i\n",MUSIG.size(), myind, ind); - MUSIG[myind]->numcommits++; - if ( MUSIG[myind]->numcommits >= MUSIG[myind]->num && secp256k1_musig_session_get_public_nonce(ctx,&MUSIG[myind]->session,MUSIG[myind]->signer_data,&MUSIG[myind]->nonces[MUSIG[myind]->myind],MUSIG[myind]->commitment_ptrs,MUSIG[myind]->num) > 0 ) - { - if ( secp256k1_ec_pubkey_serialize(ctx,(uint8_t *)pk.begin(),&clen,&MUSIG[myind]->nonces[MUSIG[myind]->myind],SECP256K1_EC_COMPRESSED) > 0 && clen == 33 ) - { - for (i=0; i<33; i++) - sprintf(&str[i<<1],"%02x",((uint8_t *)pk.begin())[i]); - str[66] = 0; - if ( n == 3 ) - MUSIG[myind]->numnonces = 1; - result.push_back(Pair("myind",MUSIG[myind]->myind)); - result.push_back(Pair("nonce",str)); - result.push_back(Pair("result","success")); - } else return(cclib_error(result,"error serializing nonce (pubkey)")); - } - else - { - result.push_back(Pair("status","not enough commitments")); - result.push_back(Pair("result","success")); - } - return(result); - } else return(cclib_error(result,"wrong number of params, need 3: pkhash, ind, commitment")); + UniValue result(UniValue::VOBJ); + return result; } UniValue musig_nonce(uint64_t txfee,struct CCcontract_info *cp,cJSON *params) { - static secp256k1_context *ctx; - UniValue result(UniValue::VOBJ); int32_t i,n,ind,myind; uint8_t pkhash[32],psig[32]; CPubKey pk; char str[67]; - if ( ctx == 0 ) - ctx = secp256k1_context_create(SECP256K1_CONTEXT_SIGN | SECP256K1_CONTEXT_VERIFY); - if ( params != 0 && (n= cJSON_GetArraySize(params)) >= 3 ) - { - if ( n > 3 ) - myind = juint(jitem(params,3),0); - else if ( n == 3 ) - myind = 0; - if ( cclib_parsehash(pkhash,jitem(params,0),32) < 0 ) - return(cclib_error(result,"error parsing pkhash")); - else if ( memcmp(MUSIG[myind]->pkhash,pkhash,32) != 0 ) - return(cclib_error(result,"pkhash doesnt match session pkhash")); - else if ( (ind= juint(jitem(params,1),0)) < 0 || ind >= MUSIG[myind]->num ) - return(cclib_error(result,"illegal ind for session")); - else if ( musig_parsepubkey(ctx,MUSIG[myind]->nonces[ind],jitem(params,2)) < 0 ) - return(cclib_error(result,"error parsing nonce")); - result.push_back(Pair("added_index",ind)); - /** Checks a signer's public nonce against a commitment to said nonce, and update - * data structure if they match - * - * Returns: 1: commitment was valid, data structure updated - * 0: commitment was invalid, nothing happened - * Args: ctx: pointer to a context object (cannot be NULL) - * signer: pointer to the signer data to update (cannot be NULL). Must have - * been used with `musig_session_get_public_nonce` or initialized - * with `musig_session_initialize_verifier`. - * In: nonce: signer's alleged public nonce (cannot be NULL) - */ - MUSIG[myind]->numnonces++; - //fprintf(stderr, "NONCE: struct_size.%li using_struct.%i added_index.%i numnounces.%i num.%i\n",MUSIG.size(), myind, ind, MUSIG[myind]->numnonces, MUSIG[myind]->num); - if ( MUSIG[myind]->numnonces < MUSIG[myind]->num ) - { - result.push_back(Pair("status","not enough nonces")); - result.push_back(Pair("result","success")); - return(result); - } - for (i=0; inum; i++) - { - if ( secp256k1_musig_set_nonce(ctx,&MUSIG[myind]->signer_data[i],&MUSIG[myind]->nonces[i]) == 0 ) - return(cclib_error(result,"error setting nonce")); - } - /** Updates a session with the combined public nonce of all signers. The combined - * public nonce is the sum of every signer's public nonce. - * - * Returns: 1: nonces are successfully combined - * 0: a signer's nonce is missing - * Args: ctx: pointer to a context object (cannot be NULL) - * session: session to update with the combined public nonce (cannot be - * NULL) - * signers: an array of signers' data, which must have had public nonces - * set with `musig_set_nonce`. Array length must equal to `n_signers` - * (cannot be NULL) - * n_signers: the length of the signers array. Must be the total number of - * signers participating in the MuSig. - * Out: nonce_is_negated: a pointer to an integer that indicates if the combined - * public nonce had to be negated. - * adaptor: point to add to the combined public nonce. If NULL, nothing is - * added to the combined nonce. - */ - if ( secp256k1_musig_session_combine_nonces(ctx,&MUSIG[myind]->session,MUSIG[myind]->signer_data,MUSIG[myind]->num,NULL,NULL) > 0 ) - { - if ( secp256k1_musig_partial_sign(ctx,&MUSIG[myind]->session,&MUSIG[myind]->partial_sig[MUSIG[myind]->myind]) > 0 ) - { - if ( secp256k1_musig_partial_signature_serialize(ctx,psig,&MUSIG[myind]->partial_sig[MUSIG[myind]->myind]) > 0 ) - { - for (i=0; i<32; i++) - sprintf(&str[i<<1],"%02x",psig[i]); - str[64] = 0; - result.push_back(Pair("myind",MUSIG[myind]->myind)); - result.push_back(Pair("partialsig",str)); - result.push_back(Pair("result","success")); - if ( n == 3 ) - MUSIG[myind]->numpartials = 1; - return(result); - } else return(cclib_error(result,"error serializing partial sig")); - } else return(cclib_error(result,"error making partial sig")); - } else return(cclib_error(result,"error combining nonces")); - } else return(cclib_error(result,"wrong number of params, need 3: pkhash, ind, nonce")); + UniValue result(UniValue::VOBJ); + return result; } UniValue musig_partialsig(uint64_t txfee,struct CCcontract_info *cp,cJSON *params) { - static secp256k1_context *ctx; - UniValue result(UniValue::VOBJ); int32_t i,ind,n,myind; uint8_t pkhash[32],psig[32],out64[64]; char str[129]; secp256k1_schnorrsig sig; - if ( ctx == 0 ) - ctx = secp256k1_context_create(SECP256K1_CONTEXT_SIGN | SECP256K1_CONTEXT_VERIFY); - if ( params != 0 && (n= cJSON_GetArraySize(params)) >= 3 ) - { - if ( n > 3 ) - myind = juint(jitem(params,3),0); - else if ( n == 3 ) - myind = 0; - if ( cclib_parsehash(pkhash,jitem(params,0),32) < 0 ) - return(cclib_error(result,"error parsing pkhash")); - else if ( memcmp(MUSIG[myind]->pkhash,pkhash,32) != 0 ) - return(cclib_error(result,"pkhash doesnt match session pkhash")); - else if ( (ind= juint(jitem(params,1),0)) < 0 || ind >= MUSIG[myind]->num ) - return(cclib_error(result,"illegal ind for session")); - else if ( cclib_parsehash(psig,jitem(params,2),32) < 0 ) - return(cclib_error(result,"error parsing psig")); - else if ( secp256k1_musig_partial_signature_parse(ctx,&MUSIG[myind]->partial_sig[ind],psig) == 0 ) - return(cclib_error(result,"error parsing partialsig")); - result.push_back(Pair("added_index",ind)); - //fprintf(stderr, "SIG: struct_size.%li using_struct.%i added_index.%i\n",MUSIG.size(), myind, ind); - MUSIG[myind]->numpartials++; - if ( MUSIG[myind]->numpartials >= MUSIG[myind]->num && secp256k1_musig_partial_sig_combine(ctx,&MUSIG[myind]->session,&sig,MUSIG[myind]->partial_sig,MUSIG[myind]->num) > 0 ) - { - if ( secp256k1_schnorrsig_serialize(ctx,out64,&sig) > 0 ) - { - result.push_back(Pair("result","success")); - for (i=0; i<64; i++) - sprintf(&str[i<<1],"%02x",out64[i]); - str[128] = 0; - result.push_back(Pair("combinedsig",str)); - } else return(cclib_error(result,"error serializing combinedsig")); - } - else - { - if ( secp256k1_musig_partial_signature_serialize(ctx,psig,&MUSIG[myind]->partial_sig[MUSIG[myind]->myind]) > 0 ) - { - result.push_back(Pair("myind",ind)); - for (i=0; i<32; i++) - sprintf(&str[i<<1],"%02x",psig[i]); - str[64] = 0; - result.push_back(Pair("partialsig",str)); - result.push_back(Pair("result","success")); - result.push_back(Pair("status","need more partialsigs")); - } else return(cclib_error(result,"error generating my partialsig")); - } - return(result); - } else return(cclib_error(result,"wrong number of params, need 3: pkhash, ind, partialsig")); + UniValue result(UniValue::VOBJ); + return result; } //int testmain(void); UniValue musig_verify(uint64_t txfee,struct CCcontract_info *cp,cJSON *params) { - static secp256k1_context *ctx; - UniValue result(UniValue::VOBJ); int32_t i,n; uint8_t msg[32],musig64[64]; secp256k1_pubkey combined_pk; secp256k1_schnorrsig musig; char str[129]; - //testmain(); - if ( ctx == 0 ) - ctx = secp256k1_context_create(SECP256K1_CONTEXT_SIGN | SECP256K1_CONTEXT_VERIFY); - if ( params != 0 && (n= cJSON_GetArraySize(params)) == 3 ) - { - if ( cclib_parsehash(msg,jitem(params,0),32) < 0 ) - return(cclib_error(result,"error parsing pkhash")); - else if ( musig_parsepubkey(ctx,combined_pk,jitem(params,1)) < 0 ) - return(cclib_error(result,"error parsing combined_pk")); - else if ( cclib_parsehash(musig64,jitem(params,2),64) < 0 ) - return(cclib_error(result,"error parsing musig64")); - for (i=0; i<32; i++) - sprintf(&str[i*2],"%02x",msg[i]); - str[64] = 0; - result.push_back(Pair("msg",str)); - result.push_back(Pair("combined_pk",jstr(jitem(params,1),0))); - for (i=0; i<64; i++) - sprintf(&str[i*2],"%02x",musig64[i]); - str[128] = 0; - result.push_back(Pair("combinedsig",str)); - if ( secp256k1_schnorrsig_parse(ctx,&musig,&musig64[0]) > 0 ) - { - if ( secp256k1_schnorrsig_verify(ctx,&musig,msg,&combined_pk) > 0 ) - { - result.push_back(Pair("result","success")); - return(result); - } else return(cclib_error(result,"musig didnt verify")); - } else return(cclib_error(result,"couldnt parse musig64")); - } else return(cclib_error(result,"wrong number of params, need 3: msg, combined_pk, combinedsig")); + UniValue result(UniValue::VOBJ); + return result; } -// helpers for rpc calls that generate/validate onchain tx - UniValue musig_rawtxresult(UniValue &result,std::string rawtx) { - CTransaction tx; - if ( rawtx.size() > 0 ) - { - result.push_back(Pair("hex",rawtx)); - if ( DecodeHexTx(tx,rawtx) != 0 ) - { - //if ( broadcastflag != 0 && myAddtomempool(tx) != 0 ) - // RelayTransaction(tx); - result.push_back(Pair("txid",tx.GetHash().ToString())); - result.push_back(Pair("result","success")); - } else result.push_back(Pair("error","decode hex")); - } else result.push_back(Pair("error","couldnt finalize CCtx")); - return(result); + UniValue result(UniValue::VOBJ); + return result; } UniValue musig_send(uint64_t txfee,struct CCcontract_info *cp,cJSON *params) { - CMutableTransaction mtx = CreateNewContextualCMutableTransaction(Params().GetConsensus(), hush_nextheight()); - UniValue result(UniValue::VOBJ); int32_t n; char *hexstr; std::string rawtx; int64_t amount; CPubKey musigpk,mypk; - if ( txfee == 0 ) - txfee = MUSIG_TXFEE; - mypk = pubkey2pk(Mypubkey()); - musigpk = GetUnspendable(cp,0); - if ( params != 0 && (n= cJSON_GetArraySize(params)) > 0 ) - { - if ( n == 2 && (hexstr= jstr(jitem(params,0),0)) != 0 && is_hexstr(hexstr,0) == 66 ) - { - CPubKey pk(ParseHex(hexstr)); - amount = jdouble(jitem(params,1),0) * COIN + 0.0000000049; - if ( amount >= 3*txfee && AddNormalinputs(mtx,mypk,amount+2*txfee,64) >= amount+2*txfee ) - { - mtx.vout.push_back(MakeCC1vout(cp->evalcode,amount+txfee,musigpk)); - rawtx = FinalizeCCTx(0,cp,mtx,mypk,txfee,musig_sendopret('x',pk)); - return(musig_rawtxresult(result,rawtx)); - } else return(cclib_error(result,"couldnt find funds or less than 0.0003")); - } else return(cclib_error(result,"must have 2 params: pk, amount")); - } else return(cclib_error(result,"not enough parameters")); + UniValue result(UniValue::VOBJ); + return result; } UniValue musig_spend(uint64_t txfee,struct CCcontract_info *cp,cJSON *params) { - static secp256k1_context *ctx; - CMutableTransaction mtx = CreateNewContextualCMutableTransaction(Params().GetConsensus(), hush_nextheight()); - UniValue result(UniValue::VOBJ); std::string rawtx; CPubKey mypk,pk; secp256k1_pubkey combined_pk; char *scriptstr,*musigstr; uint8_t msg[32]; CTransaction vintx; uint256 prevhash,hashBlock; int32_t i,n,numvouts; char str[129]; CTxOut vout; secp256k1_schnorrsig musig; - if ( ctx == 0 ) - ctx = secp256k1_context_create(SECP256K1_CONTEXT_SIGN | SECP256K1_CONTEXT_VERIFY); - if ( params != 0 && (n= cJSON_GetArraySize(params)) > 0 ) - { - if ( n == 3 ) - { - prevhash = juint256(jitem(params,0)); - scriptstr = jstr(jitem(params,1),0); - musigstr = jstr(jitem(params,2),0); - if ( is_hexstr(scriptstr,0) != 0 && is_hexstr(musigstr,0) == 128 ) - { - if ( txfee == 0 ) - txfee = MUSIG_TXFEE; - mypk = pubkey2pk(Mypubkey()); - std::vector musig64(ParseHex(musigstr)); - CScript scriptPubKey; - scriptPubKey.resize(strlen(scriptstr)/2); - decode_hex(&scriptPubKey[0],strlen(scriptstr)/2,scriptstr); - if ( myGetTransaction(prevhash,vintx,hashBlock) != 0 && (numvouts= vintx.vout.size()) > 1 ) - { - vout.nValue = vintx.vout[0].nValue - txfee; - vout.scriptPubKey = scriptPubKey; - if ( musig_sendopretdecode(pk,vintx.vout[numvouts-1].scriptPubKey) == 'x' ) - { - if ( secp256k1_schnorrsig_parse((const secp256k1_context *)ctx,&musig,(const uint8_t *)&musig64[0]) > 0 && - secp256k1_ec_pubkey_parse(ctx,&combined_pk,pk.begin(),33) > 0 ) - { - musig_prevoutmsg(msg,prevhash,vout.scriptPubKey); - { - for (i=0; i<32; i++) - sprintf(&str[i*2],"%02x",msg[i]); - str[64] = 0; - result.push_back(Pair("msg",str)); - for (i=0; i<33; i++) - sprintf(&str[i*2],"%02x",((uint8_t *)pk.begin())[i]); - str[66] = 0; - result.push_back(Pair("combined_pk",str)); - for (i=0; i<64; i++) - sprintf(&str[i*2],"%02x",musig64[i]); - str[128] = 0; - result.push_back(Pair("combinedsig",str)); - } - if ( !secp256k1_schnorrsig_verify((const secp256k1_context *)ctx,&musig,(const uint8_t *)msg,(const secp256k1_pubkey *)&combined_pk) ) - { - return(cclib_error(result,"musig didnt validate")); - } - mtx.vin.push_back(CTxIn(prevhash,MUSIG_PREVN)); - mtx.vout.push_back(vout); - rawtx = FinalizeCCTx(0,cp,mtx,mypk,txfee,musig_spendopret('y',pk,musig64)); - return(musig_rawtxresult(result,rawtx)); - } else return(cclib_error(result,"couldnt parse pk or musig")); - } else return(cclib_error(result,"couldnt decode send opret")); - } else return(cclib_error(result,"couldnt find vin0")); - } else return(cclib_error(result,"script or musig is not hex")); - } else return(cclib_error(result,"need to have exactly 3 params sendtxid, scriptPubKey, musig")); - } else return(cclib_error(result,"params parse error")); + UniValue result(UniValue::VOBJ); + return result; } bool musig_validate(struct CCcontract_info *cp,int32_t height,Eval *eval,const CTransaction tx) { - static secp256k1_context *ctx; - secp256k1_pubkey combined_pk; CPubKey pk,checkpk; secp256k1_schnorrsig musig; uint256 hashBlock; CTransaction vintx; int32_t numvouts; std::vector musig64; uint8_t msg[32]; - if ( ctx == 0 ) - ctx = secp256k1_context_create(SECP256K1_CONTEXT_SIGN | SECP256K1_CONTEXT_VERIFY); - if ( tx.vout.size() != 2 ) - return eval->Invalid("numvouts != 2"); - else if ( tx.vin.size() != 1 ) - return eval->Invalid("numvins != 1"); - else if ( IsCCInput(tx.vin[0].scriptSig) == 0 ) - return eval->Invalid("illegal normal vin0"); - else if ( myGetTransaction(tx.vin[0].prevout.hash,vintx,hashBlock) != 0 && (numvouts= vintx.vout.size()) > 1 ) - { - if ( musig_sendopretdecode(pk,vintx.vout[numvouts-1].scriptPubKey) == 'x' ) - { - if ( musig_spendopretdecode(checkpk,musig64,tx.vout[tx.vout.size()-1].scriptPubKey) == 'y' ) - { - if ( pk == checkpk ) - { - if ( secp256k1_schnorrsig_parse((const secp256k1_context *)ctx,&musig,(const uint8_t *)&musig64[0]) > 0 && - secp256k1_ec_pubkey_parse(ctx,&combined_pk,pk.begin(),33) > 0 ) - { - musig_prevoutmsg(msg,tx.vin[0].prevout.hash,tx.vout[0].scriptPubKey); - if ( !secp256k1_schnorrsig_verify((const secp256k1_context *)ctx,&musig,(const uint8_t *)msg,(const secp256k1_pubkey *)&combined_pk) ) - return eval->Invalid("failed schnorrsig_verify"); - else return(true); - } else return eval->Invalid("couldnt parse pk or musig"); - } else return eval->Invalid("combined_pk didnt match send opret"); - } else return eval->Invalid("failed decode musig spendopret"); - } else return eval->Invalid("couldnt decode send opret"); - } else return eval->Invalid("couldnt find vin0 tx"); + return false; } From a97dcf6022337c0f7fab50321d18c63a17fe9038 Mon Sep 17 00:00:00 2001 From: Duke Date: Wed, 31 Jan 2024 13:50:03 -0500 Subject: [PATCH 043/108] Delete more CCs #381 --- src/cc/CCassets.h | 18 - src/cc/CCassetstx.cpp | 762 ------------------------------------------ 2 files changed, 780 deletions(-) diff --git a/src/cc/CCassets.h b/src/cc/CCassets.h index c0b64f131..3b03570f8 100644 --- a/src/cc/CCassets.h +++ b/src/cc/CCassets.h @@ -46,23 +46,5 @@ int64_t AssetValidateBuyvin(struct CCcontract_info *cp,Eval* eval,int64_t &tmppr int64_t AssetValidateSellvin(struct CCcontract_info *cp,Eval* eval,int64_t &tmpprice,std::vector &tmporigpubkey,char *CCaddr,char *origaddr,const CTransaction &tx,uint256 assetid); bool AssetCalcAmounts(struct CCcontract_info *cpAssets, int64_t &inputs, int64_t &outputs, Eval* eval, const CTransaction &tx, uint256 assetid); -// CCassetstx -//int64_t GetAssetBalance(CPubKey pk,uint256 tokenid); // --> GetTokenBalance() -int64_t AddAssetInputs(struct CCcontract_info *cp, CMutableTransaction &mtx, CPubKey pk, uint256 assetid, int64_t total, int32_t maxinputs); - -UniValue AssetOrders(uint256 tokenid, CPubKey pubkey, uint8_t additionalEvalCode); -//UniValue AssetInfo(uint256 tokenid); -//UniValue AssetList(); -//std::string CreateAsset(int64_t txfee,int64_t assetsupply,std::string name,std::string description); -//std::string AssetTransfer(int64_t txfee,uint256 assetid,std::vector destpubkey,int64_t total); -//std::string AssetConvert(int64_t txfee,uint256 assetid,std::vector destpubkey,int64_t total,int32_t evalcode); - -std::string CreateBuyOffer(int64_t txfee,int64_t bidamount,uint256 assetid,int64_t pricetotal); -std::string CancelBuyOffer(int64_t txfee,uint256 assetid,uint256 bidtxid); -std::string FillBuyOffer(int64_t txfee,uint256 assetid,uint256 bidtxid,int64_t fillamount); -std::string CreateSell(int64_t txfee,int64_t askamount,uint256 assetid,int64_t pricetotal); -std::string CreateSwap(int64_t txfee,int64_t askamount,uint256 assetid,uint256 assetid2,int64_t pricetotal); -std::string CancelSell(int64_t txfee,uint256 assetid,uint256 asktxid); -std::string FillSell(int64_t txfee,uint256 assetid,uint256 assetid2,uint256 asktxid,int64_t fillamount); #endif diff --git a/src/cc/CCassetstx.cpp b/src/cc/CCassetstx.cpp index a0c893937..596f3643b 100644 --- a/src/cc/CCassetstx.cpp +++ b/src/cc/CCassetstx.cpp @@ -19,765 +19,3 @@ #include "CCassets.h" #include "CCtokens.h" - -UniValue AssetOrders(uint256 refassetid, CPubKey pk, uint8_t additionalEvalCode) -{ - UniValue result(UniValue::VARR); - - struct CCcontract_info *cpAssets, assetsC; - struct CCcontract_info *cpTokens, tokensC; - - cpAssets = CCinit(&assetsC, EVAL_ASSETS); - cpTokens = CCinit(&tokensC, EVAL_TOKENS); - - auto addOrders = [&](struct CCcontract_info *cp, std::vector >::const_iterator it) - { - uint256 txid, hashBlock, assetid, assetid2; - int64_t price; - std::vector origpubkey; - CTransaction ordertx; - uint8_t funcid, evalCode; - char numstr[32], funcidstr[16], origaddr[64], origtokenaddr[64]; - - txid = it->first.txhash; - LOGSTREAM("ccassets", CCLOG_DEBUG2, stream << "addOrders() checking txid=" << txid.GetHex() << std::endl); - if ( myGetTransaction(txid, ordertx, hashBlock) != 0 ) - { - // for logging: funcid = DecodeAssetOpRet(vintx.vout[vintx.vout.size() - 1].scriptPubKey, evalCode, assetid, assetid2, price, origpubkey); - if (ordertx.vout.size() > 0 && (funcid = DecodeAssetTokenOpRet(ordertx.vout[ordertx.vout.size()-1].scriptPubKey, evalCode, assetid, assetid2, price, origpubkey)) != 0) - { - LOGSTREAM("ccassets", CCLOG_DEBUG2, stream << "addOrders() checking ordertx.vout.size()=" << ordertx.vout.size() << " funcid=" << (char)(funcid ? funcid : ' ') << " assetid=" << assetid.GetHex() << std::endl); - - if (pk == CPubKey() && (refassetid == zeroid || assetid == refassetid) // tokenorders - || pk != CPubKey() && pk == pubkey2pk(origpubkey) && (funcid == 'S' || funcid == 's')) // mytokenorders, returns only asks (is this correct?) - { - - LOGSTREAM("ccassets", CCLOG_DEBUG2, stream << "addOrders() it->first.index=" << it->first.index << " ordertx.vout[it->first.index].nValue=" << ordertx.vout[it->first.index].nValue << std::endl); - if (ordertx.vout[it->first.index].nValue == 0) { - LOGSTREAM("ccassets", CCLOG_DEBUG2, stream << "addOrders() order with value=0 skipped" << std::endl); - return; - } - - UniValue item(UniValue::VOBJ); - - funcidstr[0] = funcid; - funcidstr[1] = 0; - item.push_back(Pair("funcid", funcidstr)); - item.push_back(Pair("txid", txid.GetHex())); - item.push_back(Pair("vout", (int64_t)it->first.index)); - if (funcid == 'b' || funcid == 'B') - { - sprintf(numstr, "%.8f", (double)ordertx.vout[it->first.index].nValue / COIN); - item.push_back(Pair("amount", numstr)); - sprintf(numstr, "%.8f", (double)ordertx.vout[0].nValue / COIN); - item.push_back(Pair("bidamount", numstr)); - } - else - { - sprintf(numstr, "%llu", (long long)ordertx.vout[it->first.index].nValue); - item.push_back(Pair("amount", numstr)); - sprintf(numstr, "%llu", (long long)ordertx.vout[0].nValue); - item.push_back(Pair("askamount", numstr)); - } - if (origpubkey.size() == CPubKey::COMPRESSED_PUBLIC_KEY_SIZE) - { - GetCCaddress(cp, origaddr, pubkey2pk(origpubkey)); - item.push_back(Pair("origaddress", origaddr)); - GetTokensCCaddress(cpTokens, origtokenaddr, pubkey2pk(origpubkey)); - item.push_back(Pair("origtokenaddress", origtokenaddr)); - } - if (assetid != zeroid) - item.push_back(Pair("tokenid", assetid.GetHex())); - if (assetid2 != zeroid) - item.push_back(Pair("otherid", assetid2.GetHex())); - if (price > 0) - { - if (funcid == 's' || funcid == 'S' || funcid == 'e' || funcid == 'e') - { - sprintf(numstr, "%.8f", (double)price / COIN); - item.push_back(Pair("totalrequired", numstr)); - sprintf(numstr, "%.8f", (double)price / (COIN * ordertx.vout[0].nValue)); - item.push_back(Pair("price", numstr)); - } - else - { - item.push_back(Pair("totalrequired", (int64_t)price)); - sprintf(numstr, "%.8f", (double)ordertx.vout[0].nValue / (price * COIN)); - item.push_back(Pair("price", numstr)); - } - } - result.push_back(item); - LOGSTREAM("ccassets", CCLOG_DEBUG1, stream << "addOrders() added order funcId=" << (char)(funcid ? funcid : ' ') << " it->first.index=" << it->first.index << " ordertx.vout[it->first.index].nValue=" << ordertx.vout[it->first.index].nValue << " tokenid=" << assetid.GetHex() << std::endl); - } - } - } - }; - - std::vector > unspentOutputsTokens, unspentOutputsDualEvalTokens, unspentOutputsCoins; - - char assetsUnspendableAddr[64]; - GetCCaddress(cpAssets, assetsUnspendableAddr, GetUnspendable(cpAssets, NULL)); - SetCCunspents(unspentOutputsCoins, assetsUnspendableAddr,true); - - char assetsTokensUnspendableAddr[64]; - std::vector vopretNonfungible; - if (refassetid != zeroid) { - GetNonfungibleData(refassetid, vopretNonfungible); - if (vopretNonfungible.size() > 0) - cpAssets->additionalTokensEvalcode2 = vopretNonfungible.begin()[0]; - } - GetTokensCCaddress(cpAssets, assetsTokensUnspendableAddr, GetUnspendable(cpAssets, NULL)); - SetCCunspents(unspentOutputsTokens, assetsTokensUnspendableAddr,true); - - // tokenbids: - for (std::vector >::const_iterator itCoins = unspentOutputsCoins.begin(); - itCoins != unspentOutputsCoins.end(); - itCoins++) - addOrders(cpAssets, itCoins); - - // tokenasks: - for (std::vector >::const_iterator itTokens = unspentOutputsTokens.begin(); - itTokens != unspentOutputsTokens.end(); - itTokens++) - addOrders(cpAssets, itTokens); - - if (additionalEvalCode != 0) { //this would be mytokenorders - char assetsDualEvalTokensUnspendableAddr[64]; - - // try also dual eval tokenasks (and we do not need bids): - cpAssets->additionalTokensEvalcode2 = additionalEvalCode; - GetTokensCCaddress(cpAssets, assetsDualEvalTokensUnspendableAddr, GetUnspendable(cpAssets, NULL)); - SetCCunspents(unspentOutputsDualEvalTokens, assetsDualEvalTokensUnspendableAddr,true); - - for (std::vector >::const_iterator itDualEvalTokens = unspentOutputsDualEvalTokens.begin(); - itDualEvalTokens != unspentOutputsDualEvalTokens.end(); - itDualEvalTokens++) - addOrders(cpAssets, itDualEvalTokens); - } - return(result); -} - -// not used (use TokenCreate instead) -/* std::string CreateAsset(int64_t txfee,int64_t assetsupply,std::string name,std::string description) -{ - CMutableTransaction mtx = CreateNewContextualCMutableTransaction(Params().GetConsensus(), hush_nextheight()); - CPubKey mypk; struct CCcontract_info *cp,C; - if ( assetsupply < 0 ) - { - fprintf(stderr,"negative assetsupply %lld\n",(long long)assetsupply); - return(""); - } - cp = CCinit(&C,EVAL_ASSETS); - if ( name.size() > 32 || description.size() > 4096 ) - { - fprintf(stderr,"name.%d or description.%d is too big\n",(int32_t)name.size(),(int32_t)description.size()); - return(""); - } - if ( txfee == 0 ) - txfee = 10000; - mypk = pubkey2pk(Mypubkey()); - if ( AddNormalinputs(mtx,mypk,assetsupply+2*txfee,64) > 0 ) - { - mtx.vout.push_back(MakeCC1vout(EVAL_ASSETS,assetsupply,mypk)); - mtx.vout.push_back(CTxOut(txfee,CScript() << ParseHex(cp->CChexstr) << OP_CHECKSIG)); - return(FinalizeCCTx(0,cp,mtx,mypk,txfee,EncodeAssetCreateOpRet('c',Mypubkey(),name,description))); - } - return(""); -} */ - -// not used (use TokenTransfer instead) -/* std::string AssetTransfer(int64_t txfee,uint256 assetid,std::vector destpubkey,int64_t total) -{ - CMutableTransaction mtx = CreateNewContextualCMutableTransaction(Params().GetConsensus(), hush_nextheight()); - CPubKey mypk; uint64_t mask; int64_t CCchange=0,inputs=0; struct CCcontract_info *cp,C; - if ( total < 0 ) - { - fprintf(stderr,"negative total %lld\n",(long long)total); - return(""); - } - cp = CCinit(&C,EVAL_ASSETS); - if ( txfee == 0 ) - txfee = 10000; - mypk = pubkey2pk(Mypubkey()); - if ( AddNormalinputs(mtx,mypk,txfee,3) > 0 ) - { - //n = outputs.size(); - //if ( n == amounts.size() ) - //{ - // for (i=0; i 0 ) - { - - if (inputs < total) { //added dimxy - std::cerr << "AssetTransfer(): insufficient funds" << std::endl; - return (""); - } - if ( inputs > total ) - CCchange = (inputs - total); - //for (i=0; i destpubkey,int64_t total,int32_t evalcode) -{ - CMutableTransaction mtx = CreateNewContextualCMutableTransaction(Params().GetConsensus(), hush_nextheight()); - CPubKey mypk; int64_t CCchange=0,inputs=0; struct CCcontract_info *cp,C; - if ( total < 0 ) - { - fprintf(stderr,"negative total %lld\n",(long long)total); - return(""); - } - cp = CCinit(&C,EVAL_ASSETS); - if ( txfee == 0 ) - txfee = 10000; - mypk = pubkey2pk(Mypubkey()); - if ( AddNormalinputs(mtx,mypk,txfee,3) > 0 ) - { - if ( (inputs= AddAssetInputs(cp,mtx,mypk,assetid,total,60)) > 0 ) - { - if ( inputs > total ) - CCchange = (inputs - total); - mtx.vout.push_back(MakeCC1vout(EVAL_ASSETS,CCchange,mypk)); - mtx.vout.push_back(MakeCC1vout(evalcode,total,pubkey2pk(destpubkey))); - return(FinalizeCCTx(0,cp,mtx,mypk,txfee,EncodeAssetOpRet('t',assetid,zeroid,0,Mypubkey()))); - } else fprintf(stderr,"not enough CC asset inputs for %.8f\n",(double)total/COIN); - } - return(""); -} */ - -// rpc tokenbid implementation, locks 'bidamount' coins for the 'pricetotal' of tokens -std::string CreateBuyOffer(int64_t txfee, int64_t bidamount, uint256 assetid, int64_t pricetotal) -{ - CMutableTransaction mtx = CreateNewContextualCMutableTransaction(Params().GetConsensus(), hush_nextheight()); - CPubKey mypk; - struct CCcontract_info *cpAssets, C; - uint256 hashBlock; - CTransaction vintx; - std::vector origpubkey; - std::string name,description; - int64_t inputs; - - std::cerr << "CreateBuyOffer() bidamount=" << bidamount << " numtokens(pricetotal)=" << pricetotal << std::endl; - - if (bidamount < 0 || pricetotal < 0) - { - fprintf(stderr,"negative bidamount %lld, pricetotal %lld\n", (long long)bidamount, (long long)pricetotal); - return(""); - } - if (myGetTransaction(assetid, vintx, hashBlock) == 0) - { - fprintf(stderr,"cant find assetid\n"); - return(""); - } - if (vintx.vout.size() > 0 && DecodeTokenCreateOpRet(vintx.vout[vintx.vout.size()-1].scriptPubKey, origpubkey, name, description) == 0) - { - fprintf(stderr,"assetid isnt assetcreation txid\n"); - return(""); - } - - cpAssets = CCinit(&C,EVAL_ASSETS); // NOTE: assets here! - if (txfee == 0) - txfee = 10000; - - mypk = pubkey2pk(Mypubkey()); - - if ((inputs = AddNormalinputs(mtx, mypk, bidamount+(2*txfee), 64)) > 0) - { - std::cerr << "CreateBuyOffer() inputs=" << inputs << std::endl; - if (inputs < bidamount+txfee) { - std::cerr << "CreateBuyOffer(): insufficient coins to make buy offer" << std::endl; - CCerror = strprintf("insufficient coins to make buy offer"); - return (""); - } - - CPubKey unspendableAssetsPubkey = GetUnspendable(cpAssets, 0); - mtx.vout.push_back(MakeCC1vout(EVAL_ASSETS, bidamount, unspendableAssetsPubkey)); - mtx.vout.push_back(MakeCC1vout(EVAL_ASSETS, txfee, mypk)); - std::vector voutTokenPubkeys; // should be empty - no token vouts - - return FinalizeCCTx(0, cpAssets, mtx, mypk, txfee, - EncodeTokenOpRet(assetid, voutTokenPubkeys, // TODO: actually this tx is not 'tokens', maybe it is better not to have token opret here but only asset opret. - std::make_pair(OPRETID_ASSETSDATA, EncodeAssetOpRet('b', zeroid, pricetotal, Mypubkey())))); // But still such token opret should not make problems because no token eval in these vouts - } - CCerror = strprintf("no coins found to make buy offer"); - return(""); -} - -// rpc tokenask implementation, locks 'askamount' tokens for the 'pricetotal' -std::string CreateSell(int64_t txfee,int64_t askamount,uint256 assetid,int64_t pricetotal) -{ - CMutableTransaction mtx = CreateNewContextualCMutableTransaction(Params().GetConsensus(), hush_nextheight()); - CPubKey mypk; - uint64_t mask; - int64_t inputs, CCchange; - struct CCcontract_info *cpAssets, assetsC; - struct CCcontract_info *cpTokens, tokensC; - - //std::cerr << "CreateSell() askamount=" << askamount << " pricetotal=" << pricetotal << std::endl; - - if (askamount < 0 || pricetotal < 0) { - fprintf(stderr,"negative askamount %lld, askamount %lld\n",(long long)pricetotal,(long long)askamount); - return(""); - } - - cpAssets = CCinit(&assetsC, EVAL_ASSETS); // NOTE: for signing - - - if (txfee == 0) - txfee = 10000; - - mypk = pubkey2pk(Mypubkey()); - if (AddNormalinputs(mtx, mypk, 2*txfee, 3) > 0) - { - std::vector vopretNonfungible; - mask = ~((1LL << mtx.vin.size()) - 1); - // add single-eval tokens (or non-fungible tokens): - cpTokens = CCinit(&tokensC, EVAL_TOKENS); // NOTE: adding inputs only from EVAL_TOKENS cc - if ((inputs = AddTokenCCInputs(cpTokens, mtx, mypk, assetid, askamount, 60, vopretNonfungible)) > 0) - { - if (inputs < askamount) { - //was: askamount = inputs; - std::cerr << "CreateSell(): insufficient tokens for ask" << std::endl; - CCerror = strprintf("insufficient tokens for ask"); - return (""); - } - - // if this is non-fungible tokens: - if( !vopretNonfungible.empty() ) - // set its evalcode - cpAssets->additionalTokensEvalcode2 = vopretNonfungible.begin()[0]; - - CPubKey unspendableAssetsPubkey = GetUnspendable(cpAssets, NULL); - mtx.vout.push_back(MakeTokensCC1vout(EVAL_ASSETS, cpAssets->additionalTokensEvalcode2, askamount, unspendableAssetsPubkey)); - mtx.vout.push_back(MakeCC1vout(EVAL_ASSETS, txfee, mypk)); //marker (seems, it is not for tokenorders) - if (inputs > askamount) - CCchange = (inputs - askamount); - if (CCchange != 0) - // change to single-eval or non-fungible token vout (although for non-fungible token change currently is not possible) - mtx.vout.push_back(MakeTokensCC1vout((cpAssets->additionalTokensEvalcode2) ? cpAssets->additionalTokensEvalcode2 : EVAL_TOKENS, CCchange, mypk)); - - std::vector voutTokenPubkeys; - voutTokenPubkeys.push_back(unspendableAssetsPubkey); - - return FinalizeCCTx(mask, cpTokens, mtx, mypk, txfee, - EncodeTokenOpRet(assetid, voutTokenPubkeys, - std::make_pair(OPRETID_ASSETSDATA, EncodeAssetOpRet('s', zeroid, pricetotal, Mypubkey())))); - } - else { - fprintf(stderr, "need some tokens to place ask\n"); - } - } - else { // dimxy added 'else', because it was misleading message before - fprintf(stderr, "need some native coins to place ask\n"); - } - return(""); -} - -////////////////////////// NOT IMPLEMENTED YET///////////////////////////////// -std::string CreateSwap(int64_t txfee,int64_t askamount,uint256 assetid,uint256 assetid2,int64_t pricetotal) -{ - CMutableTransaction mtx = CreateNewContextualCMutableTransaction(Params().GetConsensus(), hush_nextheight()); - CPubKey mypk; uint64_t mask; int64_t inputs,CCchange; CScript opret; struct CCcontract_info *cp,C; - - ////////////////////////// NOT IMPLEMENTED YET///////////////////////////////// - fprintf(stderr,"asset swaps disabled\n"); - return(""); - ////////////////////////// NOT IMPLEMENTED YET///////////////////////////////// - - if ( askamount < 0 || pricetotal < 0 ) - { - fprintf(stderr,"negative askamount %lld, askamount %lld\n",(long long)pricetotal,(long long)askamount); - return(""); - } - cp = CCinit(&C, EVAL_ASSETS); - - if ( txfee == 0 ) - txfee = 10000; - ////////////////////////// NOT IMPLEMENTED YET///////////////////////////////// - mypk = pubkey2pk(Mypubkey()); - - if (AddNormalinputs(mtx, mypk, txfee, 3) > 0) - { - mask = ~((1LL << mtx.vin.size()) - 1); - /*if ((inputs = AddAssetInputs(cp, mtx, mypk, assetid, askamount, 60)) > 0) - { - ////////////////////////// NOT IMPLEMENTED YET///////////////////////////////// - if (inputs < askamount) { - //was: askamount = inputs; - std::cerr << "CreateSwap(): insufficient tokens for ask" << std::endl; - CCerror = strprintf("insufficient tokens for ask"); - return (""); - } - ////////////////////////// NOT IMPLEMENTED YET///////////////////////////////// - CPubKey unspendablePubkey = GetUnspendable(cp, 0); - mtx.vout.push_back(MakeCC1vout(EVAL_ASSETS, askamount, unspendablePubkey)); - - if (inputs > askamount) - CCchange = (inputs - askamount); - if (CCchange != 0) - mtx.vout.push_back(MakeCC1vout(EVAL_ASSETS, CCchange, mypk)); - - ////////////////////////// NOT IMPLEMENTED YET///////////////////////////////// - std::vector voutTokenPubkeys; // should be empty - no token vouts - - if (assetid2 == zeroid) { - opret = EncodeTokenOpRet(assetid, voutTokenPubkeys, - EncodeAssetOpRet('s', zeroid, pricetotal, Mypubkey())); - } - else { - opret = EncodeTokenOpRet(assetid, voutTokenPubkeys, - EncodeAssetOpRet('e', assetid2, pricetotal, Mypubkey())); - } - ////////////////////////// NOT IMPLEMENTED YET///////////////////////////////// - return(FinalizeCCTx(mask,cp,mtx,mypk,txfee,opret)); - } - else { - fprintf(stderr, "need some assets to place ask\n"); - } */ - } - else { // dimxy added 'else', because it was misleading message before - fprintf(stderr,"need some native coins to place ask\n"); - } - - return(""); -} ////////////////////////// NOT IMPLEMENTED YET///////////////////////////////// - -// unlocks coins -std::string CancelBuyOffer(int64_t txfee,uint256 assetid,uint256 bidtxid) -{ - CMutableTransaction mtx = CreateNewContextualCMutableTransaction(Params().GetConsensus(), hush_nextheight()); - CTransaction vintx; uint64_t mask; - uint256 hashBlock; int64_t bidamount; - CPubKey mypk; struct CCcontract_info *cpAssets, C; - uint8_t funcid,dummyEvalCode; uint256 dummyAssetid, dummyAssetid2; int64_t dummyPrice; std::vector dummyOrigpubkey; - - cpAssets = CCinit(&C, EVAL_ASSETS); - - if (txfee == 0) - txfee = 10000; - - mypk = pubkey2pk(Mypubkey()); - - if (AddNormalinputs(mtx, mypk, txfee, 3) > 0) - { - mask = ~((1LL << mtx.vin.size()) - 1); - if (myGetTransaction(bidtxid, vintx, hashBlock) != 0) - { - std::vector vopretNonfungible; - GetNonfungibleData(assetid, vopretNonfungible); - - bidamount = vintx.vout[0].nValue; - mtx.vin.push_back(CTxIn(bidtxid, 0, CScript())); // coins in Assets - - if((funcid=DecodeAssetTokenOpRet(vintx.vout[vintx.vout.size() - 1].scriptPubKey, dummyEvalCode, dummyAssetid, dummyAssetid2, dummyPrice, dummyOrigpubkey))!=0) - { - if (funcid == 's') mtx.vin.push_back(CTxIn(bidtxid, 1, CScript())); // spend marker if funcid='b' - else if (funcid=='S') mtx.vin.push_back(CTxIn(bidtxid, 3, CScript())); // spend marker if funcid='B' - } - - mtx.vout.push_back(CTxOut(bidamount,CScript() << ParseHex(HexStr(mypk)) << OP_CHECKSIG)); - mtx.vout.push_back(CTxOut(txfee,CScript() << ParseHex(HexStr(mypk)) << OP_CHECKSIG)); - - std::vector voutTokenPubkeys; // should be empty, no token vouts - - return(FinalizeCCTx(mask, cpAssets, mtx, mypk, txfee, - EncodeTokenOpRet(assetid, voutTokenPubkeys, - std::make_pair(OPRETID_ASSETSDATA, EncodeAssetOpRet('o', zeroid, 0, Mypubkey()))))); - } - } - return(""); -} - -//unlocks tokens -std::string CancelSell(int64_t txfee,uint256 assetid,uint256 asktxid) -{ - CMutableTransaction mtx = CreateNewContextualCMutableTransaction(Params().GetConsensus(), hush_nextheight()); - CTransaction vintx; uint64_t mask; - uint256 hashBlock; int64_t askamount; - CPubKey mypk; - struct CCcontract_info *cpTokens, *cpAssets, tokensC, assetsC; - uint8_t funcid, dummyEvalCode; - uint256 dummyAssetid, dummyAssetid2; - int64_t dummyPrice; - std::vector dummyOrigpubkey; - - cpAssets = CCinit(&assetsC, EVAL_ASSETS); - - if (txfee == 0) - txfee = 10000; - - mypk = pubkey2pk(Mypubkey()); - - if (AddNormalinputs(mtx, mypk, txfee, 3) > 0) - { - mask = ~((1LL << mtx.vin.size()) - 1); - if (myGetTransaction(asktxid, vintx, hashBlock) != 0) - { - std::vector vopretNonfungible; - GetNonfungibleData(assetid, vopretNonfungible); - - askamount = vintx.vout[0].nValue; - mtx.vin.push_back(CTxIn(asktxid, 0, CScript())); - - if ((funcid=DecodeAssetTokenOpRet(vintx.vout[vintx.vout.size() - 1].scriptPubKey, dummyEvalCode, dummyAssetid, dummyAssetid2, dummyPrice, dummyOrigpubkey))!=0) - { - if (funcid == 's') - mtx.vin.push_back(CTxIn(asktxid, 1, CScript())); // marker if funcid='s' - else if (funcid=='S') - mtx.vin.push_back(CTxIn(asktxid, 3, CScript())); // marker if funcid='S' - } - - if (vopretNonfungible.size() > 0) - cpAssets->additionalTokensEvalcode2 = vopretNonfungible.begin()[0]; - - mtx.vout.push_back(MakeTokensCC1vout(cpAssets->additionalTokensEvalcode2 == 0 ? EVAL_TOKENS : cpAssets->additionalTokensEvalcode2, askamount, mypk)); // one-eval token vout - mtx.vout.push_back(CTxOut(txfee,CScript() << ParseHex(HexStr(mypk)) << OP_CHECKSIG)); - - std::vector voutTokenPubkeys; - voutTokenPubkeys.push_back(mypk); - - // this is only for unspendable addresses: - //CCaddr2set(cpTokens, EVAL_ASSETS, mypk, myPrivkey, myCCaddr); //do we need this? Seems FinalizeCCTx can attach to any evalcode cc addr by calling Getscriptaddress - - uint8_t unspendableAssetsPrivkey[32]; - char unspendableAssetsAddr[64]; - // init assets 'unspendable' privkey and pubkey - CPubKey unspendableAssetsPk = GetUnspendable(cpAssets, unspendableAssetsPrivkey); - GetCCaddress(cpAssets, unspendableAssetsAddr, unspendableAssetsPk); - - // add additional eval-tokens unspendable assets privkey: - CCaddr2set(cpAssets, EVAL_TOKENS, unspendableAssetsPk, unspendableAssetsPrivkey, unspendableAssetsAddr); - - return(FinalizeCCTx(mask, cpAssets, mtx, mypk, txfee, - EncodeTokenOpRet(assetid, voutTokenPubkeys, - std::make_pair(OPRETID_ASSETSDATA, EncodeAssetOpRet('x', zeroid, 0, Mypubkey()))))); - } - } - return(""); -} - -//send tokens, receive coins: -std::string FillBuyOffer(int64_t txfee,uint256 assetid,uint256 bidtxid,int64_t fillamount) -{ - CMutableTransaction mtx = CreateNewContextualCMutableTransaction(Params().GetConsensus(), hush_nextheight()); - CTransaction vintx; - uint256 hashBlock; - CPubKey mypk; - std::vector origpubkey; - int32_t bidvout=0; - uint64_t mask; - int64_t origprice, bidamount, paid_amount, remaining_required, inputs, CCchange=0; - struct CCcontract_info *cpTokens, tokensC; - struct CCcontract_info *cpAssets, assetsC; - - if (fillamount < 0) - { - fprintf(stderr,"negative fillamount %lld\n", (long long)fillamount); - return(""); - } - cpTokens = CCinit(&tokensC, EVAL_TOKENS); - - if (txfee == 0) - txfee = 10000; - - mypk = pubkey2pk(Mypubkey()); - - if (AddNormalinputs(mtx, mypk, 2*txfee, 3) > 0) - { - mask = ~((1LL << mtx.vin.size()) - 1); - if (myGetTransaction(bidtxid, vintx, hashBlock) != 0) - { - bidamount = vintx.vout[bidvout].nValue; - SetAssetOrigpubkey(origpubkey, origprice, vintx); - - mtx.vin.push_back(CTxIn(bidtxid, bidvout, CScript())); // Coins on Assets unspendable - - std::vector vopretNonfungible; - if ((inputs = AddTokenCCInputs(cpTokens, mtx, mypk, assetid, fillamount, 60, vopretNonfungible)) > 0) - { - if (inputs < fillamount) { - std::cerr << "FillBuyOffer(): insufficient tokens to fill buy offer" << std::endl; - CCerror = strprintf("insufficient tokens to fill buy offer"); - return (""); - } - - SetBidFillamounts(paid_amount, remaining_required, bidamount, fillamount, origprice); - - uint8_t additionalTokensEvalcode2 = 0; - if (vopretNonfungible.size() > 0) - additionalTokensEvalcode2 = vopretNonfungible.begin()[0]; - - if (inputs > fillamount) - CCchange = (inputs - fillamount); - - uint8_t unspendableAssetsPrivkey[32]; - cpAssets = CCinit(&assetsC, EVAL_ASSETS); - CPubKey unspendableAssetsPk = GetUnspendable(cpAssets, unspendableAssetsPrivkey); - - mtx.vout.push_back(MakeCC1vout(EVAL_ASSETS, bidamount - paid_amount, unspendableAssetsPk)); // vout0 coins remainder - mtx.vout.push_back(CTxOut(paid_amount,CScript() << ParseHex(HexStr(mypk)) << OP_CHECKSIG)); // vout1 coins to normal - mtx.vout.push_back(MakeTokensCC1vout(additionalTokensEvalcode2 == 0 ? EVAL_TOKENS : additionalTokensEvalcode2, fillamount, pubkey2pk(origpubkey))); // vout2 single-eval tokens sent to the originator - mtx.vout.push_back(MakeCC1vout(EVAL_ASSETS, txfee, origpubkey)); // vout3 marker to origpubkey - - if (CCchange != 0) - mtx.vout.push_back(MakeCC1vout(EVAL_TOKENS, CCchange, mypk)); // vout4 change in single-eval tokens - - fprintf(stderr,"FillBuyOffer() remaining %llu -> origpubkey\n", (long long)remaining_required); - - char unspendableAssetsAddr[64]; - cpAssets = CCinit(&assetsC, EVAL_ASSETS); - GetCCaddress(cpAssets, unspendableAssetsAddr, unspendableAssetsPk); - - // add additional unspendable addr from Assets: - CCaddr2set(cpTokens, EVAL_ASSETS, unspendableAssetsPk, unspendableAssetsPrivkey, unspendableAssetsAddr); - - // token vout verification pubkeys: - std::vector voutTokenPubkeys; - voutTokenPubkeys.push_back(pubkey2pk(origpubkey)); - - return(FinalizeCCTx(mask, cpTokens, mtx, mypk, txfee, - EncodeTokenOpRet(assetid, voutTokenPubkeys, - std::make_pair(OPRETID_ASSETSDATA, EncodeAssetOpRet('B', zeroid, remaining_required, origpubkey))))); - } else return("dont have any assets to fill bid"); - } - } - return("no normal coins left"); -} - - -// send coins, receive tokens -std::string FillSell(int64_t txfee, uint256 assetid, uint256 assetid2, uint256 asktxid, int64_t fillunits) -{ - CMutableTransaction mtx = CreateNewContextualCMutableTransaction(Params().GetConsensus(), hush_nextheight()); - CTransaction vintx,filltx; - uint256 hashBlock; - CPubKey mypk; - std::vector origpubkey; - double dprice; - uint64_t mask = 0; - int32_t askvout = 0; - int64_t received_assetoshis, total_nValue, orig_assetoshis, paid_nValue, remaining_nValue, inputs, CCchange=0; - //struct CCcontract_info *cpTokens, tokensC; - struct CCcontract_info *cpAssets, assetsC; - - if (fillunits < 0) - { - CCerror = strprintf("negative fillunits %lld\n",(long long)fillunits); - fprintf(stderr,"%s\n",CCerror.c_str()); - return(""); - } - if (assetid2 != zeroid) - { - CCerror = "asset swaps disabled"; - fprintf(stderr,"%s\n",CCerror.c_str()); - return(""); - } - - std::vector vopretNonfungible; - uint8_t additionalTokensEvalcode2 = 0; - GetNonfungibleData(assetid, vopretNonfungible); - if (vopretNonfungible.size() > 0) - additionalTokensEvalcode2 = vopretNonfungible.begin()[0]; - - cpAssets = CCinit(&assetsC, EVAL_ASSETS); - - if (txfee == 0) - txfee = 10000; - - mypk = pubkey2pk(Mypubkey()); - //if (AddNormalinputs(mtx, mypk, 2*txfee, 3) > 0) - //{ - //mask = ~((1LL << mtx.vin.size()) - 1); - if (myGetTransaction(asktxid, vintx, hashBlock) != 0) - { - orig_assetoshis = vintx.vout[askvout].nValue; - SetAssetOrigpubkey(origpubkey, total_nValue, vintx); - dprice = (double)total_nValue / orig_assetoshis; - paid_nValue = dprice * fillunits; - - if (assetid2 != zeroid) { - inputs = 0; // = AddAssetInputs(cpAssets, mtx, mypk, assetid2, paid_nValue, 60); // not implemented yet - } - else - { - inputs = AddNormalinputs(mtx, mypk, 2 * txfee + paid_nValue, 60); // Better to use single AddNormalinputs() to allow payment if user has only single utxo with normal funds - mask = ~((1LL << mtx.vin.size()) - 1); - } - if (inputs > 0) - { - if (inputs < paid_nValue) { - std::cerr << "FillSell(): insufficient coins to fill sell" << std::endl; - CCerror = strprintf("insufficient coins to fill sell"); - return (""); - } - - // cc vin should be after normal vin - mtx.vin.push_back(CTxIn(asktxid, askvout, CScript())); - - if (assetid2 != zeroid) - SetSwapFillamounts(received_assetoshis, remaining_nValue, orig_assetoshis, paid_nValue, total_nValue); //not implemented correctly yet - else - SetAskFillamounts(received_assetoshis, remaining_nValue, orig_assetoshis, paid_nValue, total_nValue); - - if (assetid2 != zeroid && inputs > paid_nValue) - CCchange = (inputs - paid_nValue); - - // vout.0 tokens remainder to unspendable cc addr: - mtx.vout.push_back(MakeTokensCC1vout(EVAL_ASSETS, additionalTokensEvalcode2, orig_assetoshis - received_assetoshis, GetUnspendable(cpAssets, NULL))); - //vout.1 purchased tokens to self token single-eval or dual-eval token+nonfungible cc addr: - mtx.vout.push_back(MakeTokensCC1vout(additionalTokensEvalcode2 == 0 ? EVAL_TOKENS : additionalTokensEvalcode2, received_assetoshis, mypk)); - - if (assetid2 != zeroid) { - std::cerr << "FillSell() WARNING: asset swap not implemented yet! (paid_nValue)" << std::endl; - // TODO: change MakeCC1vout appropriately when implementing: - //mtx.vout.push_back(MakeCC1vout(EVAL_TOKENS, paid_nValue, origpubkey)); //vout.2 tokens... (swap is not implemented yet) - } - else { - //std::cerr << "FillSell() paid_value=" << paid_nValue << " origpubkey=" << HexStr(pubkey2pk(origpubkey)) << std::endl; - mtx.vout.push_back(CTxOut(paid_nValue, CScript() << origpubkey << OP_CHECKSIG)); //vout.2 coins to tokens seller's normal addr - } - mtx.vout.push_back(MakeCC1vout(EVAL_ASSETS,txfee,origpubkey)); //vout.3 marker to origpubkey - - // not implemented - if (CCchange != 0) { - std::cerr << "FillSell() WARNING: asset swap not implemented yet! (CCchange)" << std::endl; - // TODO: change MakeCC1vout appropriately when implementing: - //mtx.vout.push_back(MakeCC1vout(EVAL_ASSETS, CCchange, mypk)); //vout.3 coins in Assets cc addr (swap not implemented) - } - - uint8_t unspendableAssetsPrivkey[32]; - char unspendableAssetsAddr[64]; - // init assets 'unspendable' privkey and pubkey - CPubKey unspendableAssetsPk = GetUnspendable(cpAssets, unspendableAssetsPrivkey); - GetCCaddress(cpAssets, unspendableAssetsAddr, unspendableAssetsPk); - - // add additional eval-tokens unspendable assets privkey: - CCaddr2set(cpAssets, EVAL_TOKENS, unspendableAssetsPk, unspendableAssetsPrivkey, unspendableAssetsAddr); - - // vout verification pubkeys: - std::vector voutTokenPubkeys; - voutTokenPubkeys.push_back(mypk); - - cpAssets->additionalTokensEvalcode2 = additionalTokensEvalcode2; - - return(FinalizeCCTx(mask, cpAssets, mtx, mypk, txfee, - EncodeTokenOpRet(assetid, voutTokenPubkeys, - std::make_pair(OPRETID_ASSETSDATA, EncodeAssetOpRet(assetid2 != zeroid ? 'E' : 'S', assetid2, remaining_nValue, origpubkey))))); - } else { - CCerror = strprintf("filltx not enough utxos"); - fprintf(stderr,"%s\n", CCerror.c_str()); - } - } - //} - return(""); -} From 8811ba4502eebc7d980fdaa4a08f71bb92ed27f9 Mon Sep 17 00:00:00 2001 From: Duke Date: Wed, 31 Jan 2024 20:27:46 -0500 Subject: [PATCH 044/108] Delete more CCs #381 --- src/Makefile.am | 1 - src/cc/CCassetstx.cpp | 21 --------------------- 2 files changed, 22 deletions(-) delete mode 100644 src/cc/CCassetstx.cpp diff --git a/src/Makefile.am b/src/Makefile.am index 97ae53ae1..2685252ec 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -330,7 +330,6 @@ libbitcoin_wallet_a_SOURCES = \ transaction_builder.cpp \ wallet/rpcdump.cpp \ cc/CCassetsCore.cpp \ - cc/CCassetstx.cpp \ cc/CCtx.cpp \ wallet/rpcwallet.cpp \ wallet/rpchushwallet.cpp \ diff --git a/src/cc/CCassetstx.cpp b/src/cc/CCassetstx.cpp deleted file mode 100644 index 596f3643b..000000000 --- a/src/cc/CCassetstx.cpp +++ /dev/null @@ -1,21 +0,0 @@ -// Copyright (c) 2016-2023 The Hush developers -// Distributed under the GPLv3 software license, see the accompanying -// file COPYING or https://www.gnu.org/licenses/gpl-3.0.en.html -/****************************************************************************** - * Copyright © 2014-2019 The SuperNET Developers. * - * * - * See the AUTHORS, DEVELOPER-AGREEMENT and LICENSE files at * - * the top-level directory of this distribution for the individual copyright * - * holder information and the developer policies on copyright and licensing. * - * * - * Unless otherwise agreed in a custom licensing agreement, no part of the * - * SuperNET software, including this file may be copied, modified, propagated * - * or distributed except according to the terms contained in the LICENSE file * - * * - * Removal or modification of this copyright notice is prohibited. * - * * - ******************************************************************************/ - -#include "CCassets.h" -#include "CCtokens.h" - From 1c04972c816e0b45e2793a619d4262533cae7a42 Mon Sep 17 00:00:00 2001 From: Duke Date: Wed, 31 Jan 2024 20:46:37 -0500 Subject: [PATCH 045/108] Delete more CCs #381 --- src/Makefile.am | 2 - src/cc/CCassetsCore.cpp | 653 ---------------------------------------- 2 files changed, 655 deletions(-) delete mode 100644 src/cc/CCassetsCore.cpp diff --git a/src/Makefile.am b/src/Makefile.am index 2685252ec..d3bd209a4 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -272,7 +272,6 @@ libbitcoin_server_a_SOURCES = \ asyncrpcqueue.cpp \ bloom.cpp \ cc/eval.cpp \ - cc/CCassetsCore.cpp \ cc/CCcustom.cpp \ cc/CCtx.cpp \ cc/CCutils.cpp \ @@ -329,7 +328,6 @@ libbitcoin_wallet_a_SOURCES = \ zcash/Note.cpp \ transaction_builder.cpp \ wallet/rpcdump.cpp \ - cc/CCassetsCore.cpp \ cc/CCtx.cpp \ wallet/rpcwallet.cpp \ wallet/rpchushwallet.cpp \ diff --git a/src/cc/CCassetsCore.cpp b/src/cc/CCassetsCore.cpp deleted file mode 100644 index ea716b2b3..000000000 --- a/src/cc/CCassetsCore.cpp +++ /dev/null @@ -1,653 +0,0 @@ -// Copyright (c) 2016-2023 The Hush developers -// Distributed under the GPLv3 software license, see the accompanying -// file COPYING or https://www.gnu.org/licenses/gpl-3.0.en.html -/****************************************************************************** - * Copyright © 2014-2018 The SuperNET Developers. * - * * - * See the AUTHORS, DEVELOPER-AGREEMENT and LICENSE files at * - * the top-level directory of this distribution for the individual copyright * - * holder information and the developer policies on copyright and licensing. * - * * - * Unless otherwise agreed in a custom licensing agreement, no part of the * - * SuperNET software, including this file may be copied, modified, propagated * - * or distributed except according to the terms contained in the LICENSE file * - * * - * Removal or modification of this copyright notice is prohibited. * - * * - ******************************************************************************/ - -#include "CCassets.h" - -/* - The SetAssetFillamounts() and ValidateAssetRemainder() work in tandem to calculate the vouts for a fill and to validate the vouts, respectively. - - This pair of functions are critical to make sure the trading is correct and is the trickiest part of the assets contract. - - //vin.0: normal input - //vin.1: unspendable.(vout.0 from buyoffer) buyTx.vout[0] - //vin.2+: valid CC output satisfies buyoffer (*tx.vin[2])->nValue - //vout.0: remaining amount of bid to unspendable - //vout.1: vin.1 value to signer of vin.2 - //vout.2: vin.2 assetoshis to original pubkey - //vout.3: CC output for assetoshis change (if any) - //vout.4: normal output for change (if any) - //vout.n-1: opreturn [EVAL_ASSETS] ['B'] [assetid] [remaining asset required] [origpubkey] - ValidateAssetRemainder(remaining_price,tx.vout[0].nValue,nValue,tx.vout[1].nValue,tx.vout[2].nValue,totalunits); - - Yes, this is quite confusing... - - In ValidateAssetRemainder the naming convention is nValue is the coin/asset with the offer on the books and "units" is what it is being paid in. The high level check is to make sure we didnt lose any coins or assets, the harder to validate is the actual price paid as the "orderbook" is in terms of the combined nValue for the combined totalunits. - - We assume that the effective unit cost in the orderbook is valid and that that amount was paid and also that any remainder will be close enough in effective unit cost to not matter. At the edge cases, this will probably be not true and maybe some orders wont be practically fillable when reduced to fractional state. However, the original pubkey that created the offer can always reclaim it. -*/ - -bool ValidateBidRemainder(int64_t remaining_units,int64_t remaining_nValue,int64_t orig_nValue,int64_t received_nValue,int64_t paidunits,int64_t totalunits) -{ - int64_t unitprice,recvunitprice,newunitprice=0; - if ( orig_nValue == 0 || received_nValue == 0 || paidunits == 0 || totalunits == 0 ) - { - fprintf(stderr,"ValidateAssetRemainder() orig_nValue == %llu || received_nValue == %llu || paidunits == %llu || totalunits == %llu\n",(long long)orig_nValue,(long long)received_nValue,(long long)paidunits,(long long)totalunits); - return(false); - } - else if ( totalunits != (remaining_units + paidunits) ) - { - fprintf(stderr,"ValidateAssetRemainder() totalunits %llu != %llu (remaining_units %llu + %llu paidunits)\n",(long long)totalunits,(long long)(remaining_units + paidunits),(long long)remaining_units,(long long)paidunits); - return(false); - } - else if ( orig_nValue != (remaining_nValue + received_nValue) ) - { - fprintf(stderr,"ValidateAssetRemainder() orig_nValue %llu != %llu (remaining_nValue %llu + %llu received_nValue)\n",(long long)orig_nValue,(long long)(remaining_nValue - received_nValue),(long long)remaining_nValue,(long long)received_nValue); - return(false); - } - else - { - //unitprice = (orig_nValue * COIN) / totalunits; - //recvunitprice = (received_nValue * COIN) / paidunits; - //if ( remaining_units != 0 ) - // newunitprice = (remaining_nValue * COIN) / remaining_units; - unitprice = (orig_nValue / totalunits); - recvunitprice = (received_nValue / paidunits); - if ( remaining_units != 0 ) - newunitprice = (remaining_nValue / remaining_units); - if ( recvunitprice < unitprice ) - { - fprintf(stderr,"ValidateAssetRemainder() error recvunitprice %.8f < %.8f unitprice, new unitprice %.8f\n",(double)recvunitprice/(COIN),(double)unitprice/(COIN),(double)newunitprice/(COIN)); - return(false); - } - fprintf(stderr,"ValidateAssetRemainder() orig %llu total %llu, recv %llu paid %llu,recvunitprice %.8f >= %.8f unitprice, new unitprice %.8f\n",(long long)orig_nValue,(long long)totalunits,(long long)received_nValue,(long long)paidunits,(double)recvunitprice/(COIN),(double)unitprice/(COIN),(double)newunitprice/(COIN)); - } - return(true); -} - -bool SetBidFillamounts(int64_t &received_nValue,int64_t &remaining_units,int64_t orig_nValue,int64_t &paidunits,int64_t totalunits) -{ - int64_t remaining_nValue,unitprice; double dprice; - if ( totalunits == 0 ) - { - received_nValue = remaining_units = paidunits = 0; - return(false); - } - if ( paidunits >= totalunits ) - { - paidunits = totalunits; - received_nValue = orig_nValue; - remaining_units = 0; - fprintf(stderr,"SetBidFillamounts() bid order totally filled!\n"); - return(true); - } - remaining_units = (totalunits - paidunits); - //unitprice = (orig_nValue * COIN) / totalunits; - //received_nValue = (paidunits * unitprice) / COIN; - unitprice = (orig_nValue / totalunits); - received_nValue = (paidunits * unitprice); - if ( unitprice > 0 && received_nValue > 0 && received_nValue <= orig_nValue ) - { - remaining_nValue = (orig_nValue - received_nValue); - printf("SetBidFillamounts() total.%llu - paid.%llu, remaining %llu <- %llu (%llu - %llu)\n",(long long)totalunits,(long long)paidunits,(long long)remaining_nValue,(long long)(orig_nValue - received_nValue),(long long)orig_nValue,(long long)received_nValue); - return(ValidateBidRemainder(remaining_units,remaining_nValue,orig_nValue,received_nValue,paidunits,totalunits)); - } else return(false); -} - -bool SetAskFillamounts(int64_t &received_assetoshis,int64_t &remaining_nValue,int64_t orig_assetoshis,int64_t &paid_nValue,int64_t total_nValue) -{ - int64_t remaining_assetoshis; double dunitprice; - if ( total_nValue == 0 ) - { - received_assetoshis = remaining_nValue = paid_nValue = 0; - return(false); - } - if ( paid_nValue >= total_nValue ) - { - paid_nValue = total_nValue; - received_assetoshis = orig_assetoshis; - remaining_nValue = 0; - fprintf(stderr,"SetAskFillamounts() ask order totally filled!\n"); - return(true); - } - remaining_nValue = (total_nValue - paid_nValue); - dunitprice = ((double)total_nValue / orig_assetoshis); - received_assetoshis = (paid_nValue / dunitprice); - fprintf(stderr,"SetAskFillamounts() remaining_nValue %.8f (%.8f - %.8f)\n",(double)remaining_nValue/COIN,(double)total_nValue/COIN,(double)paid_nValue/COIN); - fprintf(stderr,"SetAskFillamounts() unitprice %.8f received_assetoshis %llu orig %llu\n",dunitprice/COIN,(long long)received_assetoshis,(long long)orig_assetoshis); - if ( fabs(dunitprice) > SMALLVAL && received_assetoshis > 0 && received_assetoshis <= orig_assetoshis ) - { - remaining_assetoshis = (orig_assetoshis - received_assetoshis); - return(ValidateAskRemainder(remaining_nValue,remaining_assetoshis,orig_assetoshis,received_assetoshis,paid_nValue,total_nValue)); - } else return(false); -} - -bool ValidateAskRemainder(int64_t remaining_nValue,int64_t remaining_assetoshis,int64_t orig_assetoshis,int64_t received_assetoshis,int64_t paid_nValue,int64_t total_nValue) -{ - int64_t unitprice,recvunitprice,newunitprice=0; - if ( orig_assetoshis == 0 || received_assetoshis == 0 || paid_nValue == 0 || total_nValue == 0 ) - { - fprintf(stderr,"ValidateAssetRemainder() orig_assetoshis == %llu || received_assetoshis == %llu || paid_nValue == %llu || total_nValue == %llu\n",(long long)orig_assetoshis,(long long)received_assetoshis,(long long)paid_nValue,(long long)total_nValue); - return(false); - } - else if ( total_nValue != (remaining_nValue + paid_nValue) ) - { - fprintf(stderr,"ValidateAssetRemainder() total_nValue %llu != %llu (remaining_nValue %llu + %llu paid_nValue)\n",(long long)total_nValue,(long long)(remaining_nValue + paid_nValue),(long long)remaining_nValue,(long long)paid_nValue); - return(false); - } - else if ( orig_assetoshis != (remaining_assetoshis + received_assetoshis) ) - { - fprintf(stderr,"ValidateAssetRemainder() orig_assetoshis %llu != %llu (remaining_nValue %llu + %llu received_nValue)\n",(long long)orig_assetoshis,(long long)(remaining_assetoshis - received_assetoshis),(long long)remaining_assetoshis,(long long)received_assetoshis); - return(false); - } - else - { - unitprice = (total_nValue / orig_assetoshis); - recvunitprice = (paid_nValue / received_assetoshis); - if ( remaining_nValue != 0 ) - newunitprice = (remaining_nValue / remaining_assetoshis); - if ( recvunitprice < unitprice ) - { - fprintf(stderr,"ValidateAskRemainder() error recvunitprice %.8f < %.8f unitprice, new unitprice %.8f\n",(double)recvunitprice/COIN,(double)unitprice/COIN,(double)newunitprice/COIN); - return(false); - } - fprintf(stderr,"ValidateAskRemainder() got recvunitprice %.8f >= %.8f unitprice, new unitprice %.8f\n",(double)recvunitprice/COIN,(double)unitprice/COIN,(double)newunitprice/COIN); - } - return(true); -} - -bool SetSwapFillamounts(int64_t &received_assetoshis,int64_t &remaining_assetoshis2,int64_t orig_assetoshis,int64_t &paid_assetoshis2,int64_t total_assetoshis2) -{ - int64_t remaining_assetoshis; double dunitprice; - if ( total_assetoshis2 == 0 ) - { - fprintf(stderr,"SetSwapFillamounts() total_assetoshis2.0 origsatoshis.%llu paid_assetoshis2.%llu\n",(long long)orig_assetoshis,(long long)paid_assetoshis2); - received_assetoshis = remaining_assetoshis2 = paid_assetoshis2 = 0; - return(false); - } - if ( paid_assetoshis2 >= total_assetoshis2 ) - { - paid_assetoshis2 = total_assetoshis2; - received_assetoshis = orig_assetoshis; - remaining_assetoshis2 = 0; - fprintf(stderr,"SetSwapFillamounts() swap order totally filled!\n"); - return(true); - } - remaining_assetoshis2 = (total_assetoshis2 - paid_assetoshis2); - dunitprice = ((double)total_assetoshis2 / orig_assetoshis); - received_assetoshis = (paid_assetoshis2 / dunitprice); - fprintf(stderr,"SetSwapFillamounts() remaining_assetoshis2 %llu (%llu - %llu)\n",(long long)remaining_assetoshis2/COIN,(long long)total_assetoshis2/COIN,(long long)paid_assetoshis2/COIN); - fprintf(stderr,"SetSwapFillamounts() unitprice %.8f received_assetoshis %llu orig %llu\n",dunitprice/COIN,(long long)received_assetoshis,(long long)orig_assetoshis); - if ( fabs(dunitprice) > SMALLVAL && received_assetoshis > 0 && received_assetoshis <= orig_assetoshis ) - { - remaining_assetoshis = (orig_assetoshis - received_assetoshis); - return(ValidateAskRemainder(remaining_assetoshis2,remaining_assetoshis,orig_assetoshis,received_assetoshis,paid_assetoshis2,total_assetoshis2)); - } else return(false); -} - -bool ValidateSwapRemainder(int64_t remaining_price,int64_t remaining_nValue,int64_t orig_nValue,int64_t received_nValue,int64_t paidunits,int64_t totalunits) -{ - int64_t unitprice,recvunitprice,newunitprice=0; - if ( orig_nValue == 0 || received_nValue == 0 || paidunits == 0 || totalunits == 0 ) - { - fprintf(stderr,"ValidateAssetRemainder() orig_nValue == %llu || received_nValue == %llu || paidunits == %llu || totalunits == %llu\n",(long long)orig_nValue,(long long)received_nValue,(long long)paidunits,(long long)totalunits); - return(false); - } - else if ( totalunits != (remaining_price + paidunits) ) - { - fprintf(stderr,"ValidateAssetRemainder() totalunits %llu != %llu (remaining_price %llu + %llu paidunits)\n",(long long)totalunits,(long long)(remaining_price + paidunits),(long long)remaining_price,(long long)paidunits); - return(false); - } - else if ( orig_nValue != (remaining_nValue + received_nValue) ) - { - fprintf(stderr,"ValidateAssetRemainder() orig_nValue %llu != %llu (remaining_nValue %llu + %llu received_nValue)\n",(long long)orig_nValue,(long long)(remaining_nValue - received_nValue),(long long)remaining_nValue,(long long)received_nValue); - return(false); - } - else - { - unitprice = (orig_nValue * COIN) / totalunits; - recvunitprice = (received_nValue * COIN) / paidunits; - if ( remaining_price != 0 ) - newunitprice = (remaining_nValue * COIN) / remaining_price; - if ( recvunitprice < unitprice ) - { - fprintf(stderr,"ValidateAssetRemainder() error recvunitprice %.8f < %.8f unitprice, new unitprice %.8f\n",(double)recvunitprice/(COIN*COIN),(double)unitprice/(COIN*COIN),(double)newunitprice/(COIN*COIN)); - return(false); - } - fprintf(stderr,"ValidateAssetRemainder() recvunitprice %.8f >= %.8f unitprice, new unitprice %.8f\n",(double)recvunitprice/(COIN*COIN),(double)unitprice/(COIN*COIN),(double)newunitprice/(COIN*COIN)); - } - return(true); -} - -/* use EncodeTokenCreateOpRet instead: -CScript EncodeAssetCreateOpRet(uint8_t funcid,std::vector origpubkey,std::string name,std::string description) -{ - CScript opret; uint8_t evalcode = EVAL_ASSETS; - opret << OP_RETURN << E_MARSHAL(ss << evalcode << funcid << origpubkey << name << description); - return(opret); -} -*/ - -vscript_t EncodeAssetOpRet(uint8_t assetFuncId, uint256 assetid2, int64_t price, std::vector origpubkey) -{ - vscript_t vopret; - uint8_t evalcode = EVAL_ASSETS; - - switch ( assetFuncId ) - { - //case 't': this cannot be here - case 'x': case 'o': - vopret = /*<< OP_RETURN <<*/ E_MARSHAL(ss << evalcode << assetFuncId); - break; - case 's': case 'b': case 'S': case 'B': - vopret = /*<< OP_RETURN <<*/ E_MARSHAL(ss << evalcode << assetFuncId << price << origpubkey); - break; - case 'E': case 'e': - assetid2 = revuint256(assetid2); - vopret = /*<< OP_RETURN <<*/ E_MARSHAL(ss << evalcode << assetFuncId << assetid2 << price << origpubkey); - break; - default: - fprintf(stderr,"EncodeAssetOpRet: illegal funcid.%02x\n", assetFuncId); - //opret << OP_RETURN; - break; - } - return(vopret); -} - -/* it is for compatibility, do not use this for new contracts (use DecodeTokenCreateOpRet) -bool DecodeAssetCreateOpRet(const CScript &scriptPubKey, std::vector &origpubkey, std::string &name, std::string &description) -{ - std::vector vopret; uint8_t evalcode,funcid,*script; - GetOpReturnData(scriptPubKey, vopret); - script = (uint8_t *)vopret.data(); - if ( script != 0 && vopret.size() > 2 && script[0] == EVAL_ASSETS && script[1] == 'c' ) - { - if ( E_UNMARSHAL(vopret,ss >> evalcode; ss >> funcid; ss >> origpubkey; ss >> name; ss >> description) != 0 ) - return(true); - } - return(0); -} */ - -uint8_t DecodeAssetTokenOpRet(const CScript &scriptPubKey, uint8_t &assetsEvalCode, uint256 &tokenid, uint256 &assetid2, int64_t &price, std::vector &origpubkey) -{ - vscript_t vopretAssets; //, vopretAssetsStripped; - uint8_t *script, funcId = 0, assetsFuncId = 0, dummyEvalCode, dummyAssetFuncId; - uint256 dummyTokenid; - std::vector voutPubkeysDummy; - std::vector> oprets; - - tokenid = zeroid; - assetid2 = zeroid; - price = 0; - assetsEvalCode = 0; - assetsFuncId = 0; - - // First - decode token opret: - funcId = DecodeTokenOpRet(scriptPubKey, dummyEvalCode, tokenid, voutPubkeysDummy, oprets); - GetOpretBlob(oprets, OPRETID_ASSETSDATA, vopretAssets); - - LOGSTREAM((char *)"ccassets", CCLOG_DEBUG2, stream << "DecodeAssetTokenOpRet() from DecodeTokenOpRet returned funcId=" << (int)funcId << std::endl); - - if (funcId == 0 || vopretAssets.size() < 2) { - LOGSTREAM((char *)"ccassets", CCLOG_INFO, stream << "DecodeAssetTokenOpRet() incorrect opret or no asset's payload" << " funcId=" << (int)funcId << " vopretAssets.size()=" << vopretAssets.size() << std::endl); - return (uint8_t)0; - } - - //if (!E_UNMARSHAL(vopretAssets, { ss >> vopretAssetsStripped; })) { //strip string size - // std::cerr << "DecodeAssetTokenOpRet() could not unmarshal vopretAssetsStripped" << std::endl; - // return (uint8_t)0; - //} - - // additional check to prevent crash - if (vopretAssets.size() >= 2) { - - assetsEvalCode = vopretAssets.begin()[0]; - assetsFuncId = vopretAssets.begin()[1]; - - LOGSTREAM((char *)"ccassets", CCLOG_DEBUG2, stream << "DecodeAssetTokenOpRet() assetsEvalCode=" << (int)assetsEvalCode << " funcId=" << (char)(funcId ? funcId : ' ') << " assetsFuncId=" << (char)(assetsFuncId ? assetsFuncId : ' ') << std::endl); - - if (assetsEvalCode == EVAL_ASSETS) - { - //fprintf(stderr,"DecodeAssetTokenOpRet() decode.[%c] assetFuncId.[%c]\n", funcId, assetFuncId); - switch (assetsFuncId) - { - case 'x': case 'o': - if (vopretAssets.size() == 2) // no data after 'evalcode assetFuncId' allowed - { - return(assetsFuncId); - } - break; - case 's': case 'b': case 'S': case 'B': - if (E_UNMARSHAL(vopretAssets, ss >> dummyEvalCode; ss >> dummyAssetFuncId; ss >> price; ss >> origpubkey) != 0) - { - //fprintf(stderr,"DecodeAssetTokenOpRet() got price %llu\n",(long long)price); - return(assetsFuncId); - } - break; - case 'E': case 'e': - if (E_UNMARSHAL(vopretAssets, ss >> dummyEvalCode; ss >> dummyAssetFuncId; ss >> assetid2; ss >> price; ss >> origpubkey) != 0) - { - //fprintf(stderr,"DecodeAssetTokenOpRet() got price %llu\n",(long long)price); - assetid2 = revuint256(assetid2); - return(assetsFuncId); - } - break; - default: - break; - } - } - } - - LOGSTREAM((char *)"ccassets", CCLOG_INFO, stream << "DecodeAssetTokenOpRet() no asset's payload or incorrect assets funcId or evalcode" << " funcId=" << (int)funcId << " vopretAssets.size()=" << vopretAssets.size() << " assetsEvalCode=" << assetsEvalCode << " assetsFuncId=" << assetsFuncId << std::endl); - return (uint8_t)0; -} - -// extract sell/buy owner's pubkey from the opret -bool SetAssetOrigpubkey(std::vector &origpubkey,int64_t &price,const CTransaction &tx) -{ - uint256 assetid,assetid2; - uint8_t evalCode; - - if ( tx.vout.size() > 0 && DecodeAssetTokenOpRet(tx.vout[tx.vout.size()-1].scriptPubKey, evalCode, assetid, assetid2, price, origpubkey) != 0 ) - return(true); - else - return(false); -} - -// Calculate seller/buyer's dest cc address from ask/bid tx funcid -bool GetAssetorigaddrs(struct CCcontract_info *cp, char *origCCaddr, char *origNormalAddr, const CTransaction& vintx) -{ - uint256 assetid, assetid2; - int64_t price,nValue=0; - int32_t n; - uint8_t vintxFuncId; - std::vector origpubkey; - CScript script; - uint8_t evalCode; - - n = vintx.vout.size(); - if( n == 0 || (vintxFuncId = DecodeAssetTokenOpRet(vintx.vout[n-1].scriptPubKey, evalCode, assetid, assetid2, price, origpubkey)) == 0 ) - return(false); - - bool bGetCCaddr = false; - struct CCcontract_info *cpTokens, tokensC; - cpTokens = CCinit(&tokensC, EVAL_TOKENS); - - if (vintxFuncId == 's' || vintxFuncId == 'S') { - // bGetCCaddr = GetCCaddress(cpTokens, origCCaddr, pubkey2pk(origpubkey)); - cpTokens->additionalTokensEvalcode2 = cp->additionalTokensEvalcode2; // add non-fungible if present - bGetCCaddr = GetTokensCCaddress(cpTokens, origCCaddr, pubkey2pk(origpubkey)); // tokens to single-eval token or token+nonfungible - } - else if (vintxFuncId == 'b' || vintxFuncId == 'B') { - cpTokens->additionalTokensEvalcode2 = cp->additionalTokensEvalcode2; // add non-fungible if present - bGetCCaddr = GetTokensCCaddress(cpTokens, origCCaddr, pubkey2pk(origpubkey)); // tokens to single-eval token or token+nonfungible - } - else { - std::cerr << "GetAssetorigaddrs incorrect vintx funcid=" << (char)(vintxFuncId?vintxFuncId:' ') << std::endl; - return false; - } - if( bGetCCaddr && Getscriptaddress(origNormalAddr, CScript() << origpubkey << OP_CHECKSIG)) - return(true); - else - return(false); -} - - -int64_t AssetValidateCCvin(struct CCcontract_info *cp,Eval* eval,char *origCCaddr,char *origaddr,const CTransaction &tx,int32_t vini,CTransaction &vinTx) -{ - uint256 hashBlock; - uint256 assetid, assetid2; - int64_t tmpprice; - std::vector tmporigpubkey; - uint8_t evalCode; - - char destaddr[64], unspendableAddr[64]; - - origaddr[0] = destaddr[0] = origCCaddr[0] = 0; - - uint8_t funcid = 0; - if (tx.vout.size() > 0) { - uint256 assetid, assetid2; - int64_t tmpprice; - std::vector tmporigpubkey; - uint8_t evalCode; - - funcid = DecodeAssetTokenOpRet(tx.vout[tx.vout.size() - 1].scriptPubKey, evalCode, assetid, assetid2, tmpprice, tmporigpubkey); - } - - if( tx.vin.size() < 2 ) - return eval->Invalid("not enough for CC vins"); - else if( tx.vin[vini].prevout.n != 0 ) - return eval->Invalid("vin1 needs to be buyvin.vout[0]"); - else if( eval->GetTxUnconfirmed(tx.vin[vini].prevout.hash, vinTx,hashBlock) == 0 ) - { - std::cerr << "AssetValidateCCvin() cannot load vintx for vin=" << vini << " vintx id=" << tx.vin[vini].prevout.hash.GetHex() << std::endl; - return eval->Invalid("always should find CCvin, but didnt"); - } - // check source cc unspendable cc address: - // if fillSell or cancelSell --> should spend tokens from dual-eval token-assets unspendable addr - else if( (funcid == 'S' || funcid == 'x') && - (Getscriptaddress(destaddr, vinTx.vout[tx.vin[vini].prevout.n].scriptPubKey) == 0 || - !GetTokensCCaddress(cp, unspendableAddr, GetUnspendable(cp, NULL)) || - strcmp(destaddr, unspendableAddr) != 0)) - { - fprintf(stderr,"AssetValidateCCvin() cc addr %s is not dual token-evalcode=0x%02x asset unspendable addr %s\n", destaddr, (int)cp->evalcode, unspendableAddr); - return eval->Invalid("invalid vin assets CCaddr"); - } - // if fillBuy or cancelBuy --> should spend coins from asset unspendable addr - else if ((funcid == 'B' || funcid == 'o') && - (Getscriptaddress(destaddr, vinTx.vout[tx.vin[vini].prevout.n].scriptPubKey) == 0 || - !GetCCaddress(cp, unspendableAddr, GetUnspendable(cp, NULL)) || - strcmp(destaddr, unspendableAddr) != 0)) - { - fprintf(stderr, "AssetValidateCCvin() cc addr %s is not evalcode=0x%02x asset unspendable addr %s\n", destaddr, (int)cp->evalcode, unspendableAddr); - return eval->Invalid("invalid vin assets CCaddr"); - } - // end of check source unspendable cc address - //else if ( vinTx.vout[0].nValue < 10000 ) - // return eval->Invalid("invalid dust for buyvin"); - // get user dest cc and normal addresses: - else if( GetAssetorigaddrs(cp, origCCaddr, origaddr, vinTx) == 0 ) - return eval->Invalid("couldnt get origaddr for buyvin"); - - //fprintf(stderr,"AssetValidateCCvin() got %.8f to origaddr.(%s)\n", (double)vinTx.vout[tx.vin[vini].prevout.n].nValue/COIN,origaddr); - - if ( vinTx.vout[0].nValue == 0 ) - return eval->Invalid("null value CCvin"); - - return(vinTx.vout[0].nValue); -} - -int64_t AssetValidateBuyvin(struct CCcontract_info *cp,Eval* eval,int64_t &tmpprice,std::vector &tmporigpubkey,char *CCaddr,char *origaddr,const CTransaction &tx,uint256 refassetid) -{ - CTransaction vinTx; int64_t nValue; uint256 assetid,assetid2; uint8_t funcid, evalCode; - - CCaddr[0] = origaddr[0] = 0; - - // validate locked coins on Assets vin[1] - if ( (nValue= AssetValidateCCvin(cp, eval, CCaddr, origaddr, tx, 1, vinTx)) == 0 ) - return(0); - else if ( vinTx.vout[0].scriptPubKey.IsPayToCryptoCondition() == 0 ) - return eval->Invalid("invalid normal vout0 for buyvin"); - else if ((funcid = DecodeAssetTokenOpRet(vinTx.vout[vinTx.vout.size() - 1].scriptPubKey, evalCode, assetid, assetid2, tmpprice, tmporigpubkey)) == 'b' && - vinTx.vout[1].scriptPubKey.IsPayToCryptoCondition() == 0 ) // marker is only in 'b'? - return eval->Invalid("invalid normal vout1 for buyvin"); - else - { - //fprintf(stderr,"have %.8f checking assetid origaddr.(%s)\n",(double)nValue/COIN,origaddr); - if ( vinTx.vout.size() > 0 && funcid != 'b' && funcid != 'B' ) - return eval->Invalid("invalid opreturn for buyvin"); - else if ( refassetid != assetid ) - return eval->Invalid("invalid assetid for buyvin"); - //int32_t i; for (i=31; i>=0; i--) - // fprintf(stderr,"%02x",((uint8_t *)&assetid)[i]); - //fprintf(stderr," AssetValidateBuyvin assetid for %s\n",origaddr); - } - return(nValue); -} - -int64_t AssetValidateSellvin(struct CCcontract_info *cp,Eval* eval,int64_t &tmpprice,std::vector &tmporigpubkey,char *CCaddr,char *origaddr,const CTransaction &tx,uint256 assetid) -{ - CTransaction vinTx; int64_t nValue,assetoshis; - //fprintf(stderr,"AssetValidateSellvin()\n"); - if ( (nValue = AssetValidateCCvin(cp, eval, CCaddr, origaddr, tx, 1, vinTx)) == 0 ) - return(0); - if ( (assetoshis= IsAssetvout(cp, tmpprice, tmporigpubkey, vinTx, 0, assetid)) == 0 ) - return eval->Invalid("invalid missing CC vout0 for sellvin"); - else - return(assetoshis); -} - - -// validates opret for asset tx: -bool ValidateAssetOpret(CTransaction tx, int32_t v, uint256 assetid, int64_t &price, std::vector &origpubkey) { - - uint256 assetidOpret, assetidOpret2; - uint8_t funcid, evalCode; - - // this is just for log messages indentation fur debugging recursive calls: - int32_t n = tx.vout.size(); - - if ((funcid = DecodeAssetTokenOpRet(tx.vout[n - 1].scriptPubKey, evalCode, assetidOpret, assetidOpret2, price, origpubkey)) == 0) - { - std::cerr << "ValidateAssetOpret() DecodeAssetTokenOpRet returned funcId=0 for opret from txid=" << tx.GetHash().GetHex() << std::endl; - return(false); - } -/* it is now on token level: - else if (funcid == 'c') - { - if (assetid != zeroid && assetid == tx.GetHash() && v == 0) { - //std::cerr << "ValidateAssetOpret() this is the tokenbase 'c' tx, txid=" << tx.GetHash().GetHex() << " vout=" << v << " returning true" << std::endl; - return(true); - } - } - else if (funcid == 't') // TODO: check if this new block does not influence IsAssetVout - { - //std::cerr << "ValidateAssetOpret() assetid=" << assetid.GetHex() << " assetIdOpret=" << assetidOpret.GetHex() << " txid=" << tx.GetHash().GetHex() << std::endl; - if (assetid != zeroid && assetid == assetidOpret) { - //std::cerr << "ValidateAssetOpret() this is a transfer 't' tx, txid=" << tx.GetHash().GetHex() << " vout=" << v << " returning true" << std::endl; - return(true); - } - } */ - //else if ((funcid == 'b' || funcid == 'B') && v == 0) // critical! 'b'/'B' vout0 is NOT asset - // return(false); - else if (funcid != 'E') - { - if (assetid != zeroid && assetidOpret == assetid) - { - //std::cerr << "ValidateAssetOpret() returns true for not 'E', funcid=" << (char)funcid << std::endl; - return(true); - } - } - else if (funcid == 'E') // NOTE: not implemented yet! - { - if (v < 2 && assetid != zeroid && assetidOpret == assetid) - return(true); - else if (v == 2 && assetid != zeroid && assetidOpret2 == assetid) - return(true); - } - - //std::cerr << "ValidateAssetOpret() return false funcid=" << (char)funcid << " assetid=" << assetid.GetHex() << " assetIdOpret=" << assetidOpret.GetHex() << " txid=" << tx.GetHash().GetHex() << std::endl; - return false; -} - -// Checks if the vout is a really Asset CC vout -int64_t IsAssetvout(struct CCcontract_info *cp, int64_t &price, std::vector &origpubkey, const CTransaction& tx, int32_t v, uint256 refassetid) -{ - - //std::cerr << "IsAssetvout() entered for txid=" << tx.GetHash().GetHex() << " v=" << v << " for assetid=" << refassetid.GetHex() << std::endl; - - int32_t n = tx.vout.size(); - // just check boundaries: - if (v >= n - 1) { // just moved this up (dimxy) - std::cerr << "isAssetVout() internal err: (v >= n - 1), returning 0" << std::endl; - return(0); - } - - if (tx.vout[v].scriptPubKey.IsPayToCryptoCondition() != 0) // maybe check address too? dimxy: possibly no, because there are too many cases with different addresses here - { - // moved opret checking to this new reusable func (dimxy): - const bool valOpret = ValidateAssetOpret(tx, v, refassetid, price, origpubkey); - //std::cerr << "IsAssetvout() ValidateAssetOpret returned=" << std::boolalpha << valOpret << " for txid=" << tx.GetHash().GetHex() << " for assetid=" << refassetid.GetHex() << std::endl; - if (valOpret) { - //std::cerr << "IsAssetvout() ValidateAssetOpret returned true, returning nValue=" << tx.vout[v].nValue << " for txid=" << tx.GetHash().GetHex() << " for assetid=" << refassetid.GetHex() << std::endl; - return tx.vout[v].nValue; - } - - //fprintf(stderr,"IsAssetvout() CC vout v.%d of n=%d amount=%.8f txid=%s\n",v,n,(double)0/COIN, tx.GetHash().GetHex().c_str()); - } - //fprintf(stderr,"IsAssetvout() normal output v.%d %.8f\n",v,(double)tx.vout[v].nValue/COIN); - return(0); -} - -// sets cc inputs vs cc outputs and ensures they are equal: -bool AssetCalcAmounts(struct CCcontract_info *cpAssets, int64_t &inputs, int64_t &outputs, Eval* eval, const CTransaction &tx, uint256 assetid) -{ - CTransaction vinTx; uint256 hashBlock, id, id2; int32_t flag; int64_t assetoshis; std::vector tmporigpubkey; int64_t tmpprice; - int32_t numvins = tx.vin.size(); - int32_t numvouts = tx.vout.size(); - inputs = outputs = 0; - - struct CCcontract_info *cpTokens, C; - - cpTokens = CCinit(&C, EVAL_TOKENS); - - for (int32_t i = 0; iismyvin)(tx.vin[i].scriptSig)*/ (*cpTokens->ismyvin)(tx.vin[i].scriptSig) ) // || IsVinAllowed(tx.vin[i].scriptSig) != 0) - { - //std::cerr << indentStr << "AssetExactAmounts() eval is true=" << (eval != NULL) << " ismyvin=ok for_i=" << i << std::endl; - // we are not inside the validation code -- dimxy - if ((eval && eval->GetTxUnconfirmed(tx.vin[i].prevout.hash, vinTx, hashBlock) == 0) || (!eval && !myGetTransaction(tx.vin[i].prevout.hash, vinTx, hashBlock))) - { - std::cerr << "AssetCalcAmounts() cannot read vintx for i." << i << " numvins." << numvins << std::endl; - return (!eval) ? false : eval->Invalid("always should find vin tx, but didnt"); - } - else { - // validate vouts of vintx - //std::cerr << indentStr << "AssetExactAmounts() check vin i=" << i << " nValue=" << vinTx.vout[tx.vin[i].prevout.n].nValue << std::endl; - //assetoshis = IsAssetvout(cpAssets, tmpprice, tmporigpubkey, vinTx, tx.vin[i].prevout.n, assetid); - std::vector vopretExtra; - std::vector vinPubkeysEmpty; - - // TODO: maybe we do not need call to IsTokensVout here, cause we've already selected token vins - assetoshis = IsTokensvout(false, false, cpTokens, NULL, vinTx, tx.vin[i].prevout.n, assetid); - if (assetoshis != 0) - { - //std::cerr << "AssetCalcAmounts() vin i=" << i << " assetoshis=" << assetoshis << std::endl; - inputs += assetoshis; - } - } - } - } - - for (int32_t i = 0; i < numvouts-1; i++) - { - assetoshis = IsAssetvout(cpAssets, tmpprice, tmporigpubkey, tx, i, assetid); - if (assetoshis != 0) - { - //std::cerr << "AssetCalcAmounts() vout i=" << i << " assetoshis=" << assetoshis << std::endl; - outputs += assetoshis; - } - } - - //std::cerr << "AssetCalcAmounts() inputs=" << inputs << " outputs=" << outputs << " for txid=" << tx.GetHash().GetHex() << std::endl; - - /* we do not verify inputs == outputs here, - it's now done in Tokens */ - return(true); -} From 43cdfb08a268a84be55fbddf2eb35ea1a2865424 Mon Sep 17 00:00:00 2001 From: Duke Date: Sat, 10 Feb 2024 12:07:52 -0500 Subject: [PATCH 046/108] Delete more CCs #381 --- src/cc/cclib.cpp | 6 - src/cc/dilithium.c | 3732 -------------------------------------------- 2 files changed, 3738 deletions(-) delete mode 100644 src/cc/dilithium.c diff --git a/src/cc/cclib.cpp b/src/cc/cclib.cpp index c1051b3b7..48b69c7e5 100644 --- a/src/cc/cclib.cpp +++ b/src/cc/cclib.cpp @@ -641,10 +641,4 @@ int32_t cclib_parsehash(uint8_t *hash32,cJSON *item,int32_t len) #if BUILD_CUSTOMCC #include "customcc.cpp" - -#else -#include "musig.cpp" -#include "dilithium.c" -//#include "../secp256k1/src/modules/musig/example.c" #endif - diff --git a/src/cc/dilithium.c b/src/cc/dilithium.c deleted file mode 100644 index 7b531002d..000000000 --- a/src/cc/dilithium.c +++ /dev/null @@ -1,3732 +0,0 @@ -// Copyright (c) 2016-2023 The Hush developers -// Distributed under the GPLv3 software license, see the accompanying -// file COPYING or https://www.gnu.org/licenses/gpl-3.0.en.html - -/* Based on the public domain implementation in - * crypto_hash/keccakc512/simple/ from http://bench.cr.yp.to/supercop.html - * by Ronny Van Keer - * and the public domain "TweetFips202" implementation - * from https://twitter.com/tweetfips202 - * by Gilles Van Assche, Daniel J. Bernstein, and Peter Schwabe */ - -#include - -#define DBENCH_START() -#define DBENCH_STOP(arg) - -#include "dilithium.h" -#define NROUNDS 24 -#define ROL(a, offset) ((a << offset) ^ (a >> (64-offset))) - -/************************************************* -* Name: load64 -* -* Description: Load 8 bytes into uint64_t in little-endian order -* -* Arguments: - const uint8_t *x: pointer to input byte array -* -* Returns the loaded 64-bit unsigned integer -**************************************************/ -static uint64_t load64(const uint8_t *x) { - uint32_t i; - uint64_t r = 0; - - for (i = 0; i < 8; ++i) - r |= (uint64_t)x[i] << 8*i; - - return r; -} - -/************************************************* -* Name: store64 -* -* Description: Store a 64-bit integer to array of 8 bytes in little-endian order -* -* Arguments: - uint8_t *x: pointer to the output byte array (allocated) -* - uint64_t u: input 64-bit unsigned integer -**************************************************/ -static void store64(uint8_t *x, uint64_t u) { - uint32_t i; - - for(i = 0; i < 8; ++i) - x[i] = u >> 8*i; -} - -/* Keccak round constants */ -static const uint64_t KeccakF_RoundConstants[NROUNDS] = { - (uint64_t)0x0000000000000001ULL, - (uint64_t)0x0000000000008082ULL, - (uint64_t)0x800000000000808aULL, - (uint64_t)0x8000000080008000ULL, - (uint64_t)0x000000000000808bULL, - (uint64_t)0x0000000080000001ULL, - (uint64_t)0x8000000080008081ULL, - (uint64_t)0x8000000000008009ULL, - (uint64_t)0x000000000000008aULL, - (uint64_t)0x0000000000000088ULL, - (uint64_t)0x0000000080008009ULL, - (uint64_t)0x000000008000000aULL, - (uint64_t)0x000000008000808bULL, - (uint64_t)0x800000000000008bULL, - (uint64_t)0x8000000000008089ULL, - (uint64_t)0x8000000000008003ULL, - (uint64_t)0x8000000000008002ULL, - (uint64_t)0x8000000000000080ULL, - (uint64_t)0x000000000000800aULL, - (uint64_t)0x800000008000000aULL, - (uint64_t)0x8000000080008081ULL, - (uint64_t)0x8000000000008080ULL, - (uint64_t)0x0000000080000001ULL, - (uint64_t)0x8000000080008008ULL -}; - -/************************************************* -* Name: KeccakF1600_StatePermute -* -* Description: The Keccak F1600 Permutation -* -* Arguments: - uint64_t *state: pointer to input/output Keccak state -**************************************************/ -static void KeccakF1600_StatePermute(uint64_t *state) -{ - int round; - - uint64_t Aba, Abe, Abi, Abo, Abu; - uint64_t Aga, Age, Agi, Ago, Agu; - uint64_t Aka, Ake, Aki, Ako, Aku; - uint64_t Ama, Ame, Ami, Amo, Amu; - uint64_t Asa, Ase, Asi, Aso, Asu; - uint64_t BCa, BCe, BCi, BCo, BCu; - uint64_t Da, De, Di, Do, Du; - uint64_t Eba, Ebe, Ebi, Ebo, Ebu; - uint64_t Ega, Ege, Egi, Ego, Egu; - uint64_t Eka, Eke, Eki, Eko, Eku; - uint64_t Ema, Eme, Emi, Emo, Emu; - uint64_t Esa, Ese, Esi, Eso, Esu; - - //copyFromState(A, state) - Aba = state[ 0]; - Abe = state[ 1]; - Abi = state[ 2]; - Abo = state[ 3]; - Abu = state[ 4]; - Aga = state[ 5]; - Age = state[ 6]; - Agi = state[ 7]; - Ago = state[ 8]; - Agu = state[ 9]; - Aka = state[10]; - Ake = state[11]; - Aki = state[12]; - Ako = state[13]; - Aku = state[14]; - Ama = state[15]; - Ame = state[16]; - Ami = state[17]; - Amo = state[18]; - Amu = state[19]; - Asa = state[20]; - Ase = state[21]; - Asi = state[22]; - Aso = state[23]; - Asu = state[24]; - - for( round = 0; round < NROUNDS; round += 2 ) - { - // prepareTheta - BCa = Aba^Aga^Aka^Ama^Asa; - BCe = Abe^Age^Ake^Ame^Ase; - BCi = Abi^Agi^Aki^Ami^Asi; - BCo = Abo^Ago^Ako^Amo^Aso; - BCu = Abu^Agu^Aku^Amu^Asu; - - //thetaRhoPiChiIotaPrepareTheta(round , A, E) - Da = BCu^ROL(BCe, 1); - De = BCa^ROL(BCi, 1); - Di = BCe^ROL(BCo, 1); - Do = BCi^ROL(BCu, 1); - Du = BCo^ROL(BCa, 1); - - Aba ^= Da; - BCa = Aba; - Age ^= De; - BCe = ROL(Age, 44); - Aki ^= Di; - BCi = ROL(Aki, 43); - Amo ^= Do; - BCo = ROL(Amo, 21); - Asu ^= Du; - BCu = ROL(Asu, 14); - Eba = BCa ^((~BCe)& BCi ); - Eba ^= (uint64_t)KeccakF_RoundConstants[round]; - Ebe = BCe ^((~BCi)& BCo ); - Ebi = BCi ^((~BCo)& BCu ); - Ebo = BCo ^((~BCu)& BCa ); - Ebu = BCu ^((~BCa)& BCe ); - - Abo ^= Do; - BCa = ROL(Abo, 28); - Agu ^= Du; - BCe = ROL(Agu, 20); - Aka ^= Da; - BCi = ROL(Aka, 3); - Ame ^= De; - BCo = ROL(Ame, 45); - Asi ^= Di; - BCu = ROL(Asi, 61); - Ega = BCa ^((~BCe)& BCi ); - Ege = BCe ^((~BCi)& BCo ); - Egi = BCi ^((~BCo)& BCu ); - Ego = BCo ^((~BCu)& BCa ); - Egu = BCu ^((~BCa)& BCe ); - - Abe ^= De; - BCa = ROL(Abe, 1); - Agi ^= Di; - BCe = ROL(Agi, 6); - Ako ^= Do; - BCi = ROL(Ako, 25); - Amu ^= Du; - BCo = ROL(Amu, 8); - Asa ^= Da; - BCu = ROL(Asa, 18); - Eka = BCa ^((~BCe)& BCi ); - Eke = BCe ^((~BCi)& BCo ); - Eki = BCi ^((~BCo)& BCu ); - Eko = BCo ^((~BCu)& BCa ); - Eku = BCu ^((~BCa)& BCe ); - - Abu ^= Du; - BCa = ROL(Abu, 27); - Aga ^= Da; - BCe = ROL(Aga, 36); - Ake ^= De; - BCi = ROL(Ake, 10); - Ami ^= Di; - BCo = ROL(Ami, 15); - Aso ^= Do; - BCu = ROL(Aso, 56); - Ema = BCa ^((~BCe)& BCi ); - Eme = BCe ^((~BCi)& BCo ); - Emi = BCi ^((~BCo)& BCu ); - Emo = BCo ^((~BCu)& BCa ); - Emu = BCu ^((~BCa)& BCe ); - - Abi ^= Di; - BCa = ROL(Abi, 62); - Ago ^= Do; - BCe = ROL(Ago, 55); - Aku ^= Du; - BCi = ROL(Aku, 39); - Ama ^= Da; - BCo = ROL(Ama, 41); - Ase ^= De; - BCu = ROL(Ase, 2); - Esa = BCa ^((~BCe)& BCi ); - Ese = BCe ^((~BCi)& BCo ); - Esi = BCi ^((~BCo)& BCu ); - Eso = BCo ^((~BCu)& BCa ); - Esu = BCu ^((~BCa)& BCe ); - - // prepareTheta - BCa = Eba^Ega^Eka^Ema^Esa; - BCe = Ebe^Ege^Eke^Eme^Ese; - BCi = Ebi^Egi^Eki^Emi^Esi; - BCo = Ebo^Ego^Eko^Emo^Eso; - BCu = Ebu^Egu^Eku^Emu^Esu; - - //thetaRhoPiChiIotaPrepareTheta(round+1, E, A) - Da = BCu^ROL(BCe, 1); - De = BCa^ROL(BCi, 1); - Di = BCe^ROL(BCo, 1); - Do = BCi^ROL(BCu, 1); - Du = BCo^ROL(BCa, 1); - - Eba ^= Da; - BCa = Eba; - Ege ^= De; - BCe = ROL(Ege, 44); - Eki ^= Di; - BCi = ROL(Eki, 43); - Emo ^= Do; - BCo = ROL(Emo, 21); - Esu ^= Du; - BCu = ROL(Esu, 14); - Aba = BCa ^((~BCe)& BCi ); - Aba ^= (uint64_t)KeccakF_RoundConstants[round+1]; - Abe = BCe ^((~BCi)& BCo ); - Abi = BCi ^((~BCo)& BCu ); - Abo = BCo ^((~BCu)& BCa ); - Abu = BCu ^((~BCa)& BCe ); - - Ebo ^= Do; - BCa = ROL(Ebo, 28); - Egu ^= Du; - BCe = ROL(Egu, 20); - Eka ^= Da; - BCi = ROL(Eka, 3); - Eme ^= De; - BCo = ROL(Eme, 45); - Esi ^= Di; - BCu = ROL(Esi, 61); - Aga = BCa ^((~BCe)& BCi ); - Age = BCe ^((~BCi)& BCo ); - Agi = BCi ^((~BCo)& BCu ); - Ago = BCo ^((~BCu)& BCa ); - Agu = BCu ^((~BCa)& BCe ); - - Ebe ^= De; - BCa = ROL(Ebe, 1); - Egi ^= Di; - BCe = ROL(Egi, 6); - Eko ^= Do; - BCi = ROL(Eko, 25); - Emu ^= Du; - BCo = ROL(Emu, 8); - Esa ^= Da; - BCu = ROL(Esa, 18); - Aka = BCa ^((~BCe)& BCi ); - Ake = BCe ^((~BCi)& BCo ); - Aki = BCi ^((~BCo)& BCu ); - Ako = BCo ^((~BCu)& BCa ); - Aku = BCu ^((~BCa)& BCe ); - - Ebu ^= Du; - BCa = ROL(Ebu, 27); - Ega ^= Da; - BCe = ROL(Ega, 36); - Eke ^= De; - BCi = ROL(Eke, 10); - Emi ^= Di; - BCo = ROL(Emi, 15); - Eso ^= Do; - BCu = ROL(Eso, 56); - Ama = BCa ^((~BCe)& BCi ); - Ame = BCe ^((~BCi)& BCo ); - Ami = BCi ^((~BCo)& BCu ); - Amo = BCo ^((~BCu)& BCa ); - Amu = BCu ^((~BCa)& BCe ); - - Ebi ^= Di; - BCa = ROL(Ebi, 62); - Ego ^= Do; - BCe = ROL(Ego, 55); - Eku ^= Du; - BCi = ROL(Eku, 39); - Ema ^= Da; - BCo = ROL(Ema, 41); - Ese ^= De; - BCu = ROL(Ese, 2); - Asa = BCa ^((~BCe)& BCi ); - Ase = BCe ^((~BCi)& BCo ); - Asi = BCi ^((~BCo)& BCu ); - Aso = BCo ^((~BCu)& BCa ); - Asu = BCu ^((~BCa)& BCe ); - } - - //copyToState(state, A) - state[ 0] = Aba; - state[ 1] = Abe; - state[ 2] = Abi; - state[ 3] = Abo; - state[ 4] = Abu; - state[ 5] = Aga; - state[ 6] = Age; - state[ 7] = Agi; - state[ 8] = Ago; - state[ 9] = Agu; - state[10] = Aka; - state[11] = Ake; - state[12] = Aki; - state[13] = Ako; - state[14] = Aku; - state[15] = Ama; - state[16] = Ame; - state[17] = Ami; - state[18] = Amo; - state[19] = Amu; - state[20] = Asa; - state[21] = Ase; - state[22] = Asi; - state[23] = Aso; - state[24] = Asu; -} - -/************************************************* -* Name: keccak_absorb -* -* Description: Absorb step of Keccak; -* non-incremental, starts by zeroeing the state. -* -* Arguments: - uint64_t *s: pointer to (uninitialized) output Keccak state -* - unsigned int r: rate in bytes (e.g., 168 for SHAKE128) -* - const uint8_t *m: pointer to input to be absorbed into s -* - int32_t mlen: length of input in bytes -* - uint8_t p: domain-separation byte for different -* Keccak-derived functions -**************************************************/ -static void keccak_absorb(uint64_t *s, - uint32_t r, - const uint8_t *m, - int32_t mlen, - uint8_t p) -{ - uint32_t i; - uint8_t t[200]; - DBENCH_START(); - - /* Zero state */ - for(i = 0; i < 25; ++i) - s[i] = 0; - - while(mlen >= r) { - for(i = 0; i < r/8; ++i) - s[i] ^= load64(m + 8*i); - - KeccakF1600_StatePermute(s); - mlen -= r; - m += r; - } - - for(i = 0; i < r; ++i) - t[i] = 0; - for(i = 0; i < mlen; ++i) - t[i] = m[i]; - t[i] = p; - t[r-1] |= 128; - for(i = 0; i < r/8; ++i) - s[i] ^= load64(t + 8*i); - - DBENCH_STOP(*tshake); -} - -/************************************************* -* Name: keccak_squeezeblocks -* -* Description: Squeeze step of Keccak. Squeezes full blocks of r bytes each. -* Modifies the state. Can be called multiple times to keep -* squeezing, i.e., is incremental. -* -* Arguments: - uint8_t *h: pointer to output blocks -* - int32_t int nblocks: number of blocks to be -* squeezed (written to h) -* - uint64_t *s: pointer to input/output Keccak state -* - uint32_t r: rate in bytes (e.g., 168 for SHAKE128) -**************************************************/ -static void keccak_squeezeblocks(uint8_t *h, - int32_t nblocks, - uint64_t *s, - uint32_t r) -{ - uint32_t i; - DBENCH_START(); - - while(nblocks > 0) { - KeccakF1600_StatePermute(s); - for(i=0; i < (r >> 3); i++) { - store64(h + 8*i, s[i]); - } - h += r; - --nblocks; - } - - DBENCH_STOP(*tshake); -} - -/************************************************* -* Name: shake128_absorb -* -* Description: Absorb step of the SHAKE128 XOF. -* non-incremental, starts by zeroeing the state. -* -* Arguments: - uint64_t *s: pointer to (uninitialized) output Keccak state -* - const uint8_t *input: pointer to input to be absorbed -* into s -* - int32_t inlen: length of input in bytes -**************************************************/ -void shake128_absorb(uint64_t *s, - const uint8_t *input, - int32_t inlen) -{ - keccak_absorb(s, SHAKE128_RATE, input, inlen, 0x1F); -} - -/************************************************* -* Name: shake128_squeezeblocks -* -* Description: Squeeze step of SHAKE128 XOF. Squeezes full blocks of -* SHAKE128_RATE bytes each. Modifies the state. Can be called -* multiple times to keep squeezing, i.e., is incremental. -* -* Arguments: - uint8_t *output: pointer to output blocks -* - int32_t nblocks: number of blocks to be squeezed -* (written to output) -* - uint64_t *s: pointer to input/output Keccak state -**************************************************/ -void shake128_squeezeblocks(uint8_t *output, - int32_t nblocks, - uint64_t *s) -{ - keccak_squeezeblocks(output, nblocks, s, SHAKE128_RATE); -} - -/************************************************* -* Name: shake256_absorb -* -* Description: Absorb step of the SHAKE256 XOF. -* non-incremental, starts by zeroeing the state. -* -* Arguments: - uint64_t *s: pointer to (uninitialized) output Keccak state -* - const uint8_t *input: pointer to input to be absorbed -* into s -* - int32_t inlen: length of input in bytes -**************************************************/ -void shake256_absorb(uint64_t *s, - const uint8_t *input, - int32_t inlen) -{ - keccak_absorb(s, SHAKE256_RATE, input, inlen, 0x1F); -} - -/************************************************* -* Name: shake256_squeezeblocks -* -* Description: Squeeze step of SHAKE256 XOF. Squeezes full blocks of -* SHAKE256_RATE bytes each. Modifies the state. Can be called -* multiple times to keep squeezing, i.e., is incremental. -* -* Arguments: - uint8_t *output: pointer to output blocks -* - int32_t nblocks: number of blocks to be squeezed -* (written to output) -* - uint64_t *s: pointer to input/output Keccak state -**************************************************/ -void shake256_squeezeblocks(uint8_t *output, - int32_t nblocks, - uint64_t *s) -{ - keccak_squeezeblocks(output, nblocks, s, SHAKE256_RATE); -} - -/************************************************* -* Name: shake128 -* -* Description: SHAKE128 XOF with non-incremental API -* -* Arguments: - uint8_t *output: pointer to output -* - int32_t outlen: requested output length in bytes -* - const uint8_t *input: pointer to input -* - int32_t inlen: length of input in bytes -**************************************************/ -void shake128(uint8_t *output, - int32_t outlen, - const uint8_t *input, - int32_t inlen) -{ - uint32_t i,nblocks = outlen/SHAKE128_RATE; - uint8_t t[SHAKE128_RATE]; - uint64_t s[25]; - - shake128_absorb(s, input, inlen); - shake128_squeezeblocks(output, nblocks, s); - - output += nblocks*SHAKE128_RATE; - outlen -= nblocks*SHAKE128_RATE; - - if(outlen) { - shake128_squeezeblocks(t, 1, s); - for(i = 0; i < outlen; ++i) - output[i] = t[i]; - } -} - -/************************************************* -* Name: shake256 -* -* Description: SHAKE256 XOF with non-incremental API -* -* Arguments: - uint8_t *output: pointer to output -* - int32_t outlen: requested output length in bytes -* - const uint8_t *input: pointer to input -* - int32_t inlen: length of input in bytes -**************************************************/ -void shake256(uint8_t *output, - int32_t outlen, - const uint8_t *input, - int32_t inlen) -{ - uint32_t i,nblocks = outlen/SHAKE256_RATE; - uint8_t t[SHAKE256_RATE]; - uint64_t s[25]; - - shake256_absorb(s, input, inlen); - shake256_squeezeblocks(output, nblocks, s); - - output += nblocks*SHAKE256_RATE; - outlen -= nblocks*SHAKE256_RATE; - - if(outlen) { - shake256_squeezeblocks(t, 1, s); - for(i = 0; i < outlen; ++i) - output[i] = t[i]; - } -} -//#include "params.h" -//#include "reduce.h" -//#include "ntt.h" -//#include "poly.h" - -/* Roots of unity in order needed by forward ntt */ -static const uint32_t zetas[N] = {0, 25847, 5771523, 7861508, 237124, 7602457, 7504169, 466468, 1826347, 2353451, 8021166, 6288512, 3119733, 5495562, 3111497, 2680103, 2725464, 1024112, 7300517, 3585928, 7830929, 7260833, 2619752, 6271868, 6262231, 4520680, 6980856, 5102745, 1757237, 8360995, 4010497, 280005, 2706023, 95776, 3077325, 3530437, 6718724, 4788269, 5842901, 3915439, 4519302, 5336701, 3574422, 5512770, 3539968, 8079950, 2348700, 7841118, 6681150, 6736599, 3505694, 4558682, 3507263, 6239768, 6779997, 3699596, 811944, 531354, 954230, 3881043, 3900724, 5823537, 2071892, 5582638, 4450022, 6851714, 4702672, 5339162, 6927966, 3475950, 2176455, 6795196, 7122806, 1939314, 4296819, 7380215, 5190273, 5223087, 4747489, 126922, 3412210, 7396998, 2147896, 2715295, 5412772, 4686924, 7969390, 5903370, 7709315, 7151892, 8357436, 7072248, 7998430, 1349076, 1852771, 6949987, 5037034, 264944, 508951, 3097992, 44288, 7280319, 904516, 3958618, 4656075, 8371839, 1653064, 5130689, 2389356, 8169440, 759969, 7063561, 189548, 4827145, 3159746, 6529015, 5971092, 8202977, 1315589, 1341330, 1285669, 6795489, 7567685, 6940675, 5361315, 4499357, 4751448, 3839961, 2091667, 3407706, 2316500, 3817976, 5037939, 2244091, 5933984, 4817955, 266997, 2434439, 7144689, 3513181, 4860065, 4621053, 7183191, 5187039, 900702, 1859098, 909542, 819034, 495491, 6767243, 8337157, 7857917, 7725090, 5257975, 2031748, 3207046, 4823422, 7855319, 7611795, 4784579, 342297, 286988, 5942594, 4108315, 3437287, 5038140, 1735879, 203044, 2842341, 2691481, 5790267, 1265009, 4055324, 1247620, 2486353, 1595974, 4613401, 1250494, 2635921, 4832145, 5386378, 1869119, 1903435, 7329447, 7047359, 1237275, 5062207, 6950192, 7929317, 1312455, 3306115, 6417775, 7100756, 1917081, 5834105, 7005614, 1500165, 777191, 2235880, 3406031, 7838005, 5548557, 6709241, 6533464, 5796124, 4656147, 594136, 4603424, 6366809, 2432395, 2454455, 8215696, 1957272, 3369112, 185531, 7173032, 5196991, 162844, 1616392, 3014001, 810149, 1652634, 4686184, 6581310, 5341501, 3523897, 3866901, 269760, 2213111, 7404533, 1717735, 472078, 7953734, 1723600, 6577327, 1910376, 6712985, 7276084, 8119771, 4546524, 5441381, 6144432, 7959518, 6094090, 183443, 7403526, 1612842, 4834730, 7826001, 3919660, 8332111, 7018208, 3937738, 1400424, 7534263, 1976782}; - -/* Roots of unity in order needed by inverse ntt */ -static const uint32_t zetas_inv[N] = {6403635, 846154, 6979993, 4442679, 1362209, 48306, 4460757, 554416, 3545687, 6767575, 976891, 8196974, 2286327, 420899, 2235985, 2939036, 3833893, 260646, 1104333, 1667432, 6470041, 1803090, 6656817, 426683, 7908339, 6662682, 975884, 6167306, 8110657, 4513516, 4856520, 3038916, 1799107, 3694233, 6727783, 7570268, 5366416, 6764025, 8217573, 3183426, 1207385, 8194886, 5011305, 6423145, 164721, 5925962, 5948022, 2013608, 3776993, 7786281, 3724270, 2584293, 1846953, 1671176, 2831860, 542412, 4974386, 6144537, 7603226, 6880252, 1374803, 2546312, 6463336, 1279661, 1962642, 5074302, 7067962, 451100, 1430225, 3318210, 7143142, 1333058, 1050970, 6476982, 6511298, 2994039, 3548272, 5744496, 7129923, 3767016, 6784443, 5894064, 7132797, 4325093, 7115408, 2590150, 5688936, 5538076, 8177373, 6644538, 3342277, 4943130, 4272102, 2437823, 8093429, 8038120, 3595838, 768622, 525098, 3556995, 5173371, 6348669, 3122442, 655327, 522500, 43260, 1613174, 7884926, 7561383, 7470875, 6521319, 7479715, 3193378, 1197226, 3759364, 3520352, 4867236, 1235728, 5945978, 8113420, 3562462, 2446433, 6136326, 3342478, 4562441, 6063917, 4972711, 6288750, 4540456, 3628969, 3881060, 3019102, 1439742, 812732, 1584928, 7094748, 7039087, 7064828, 177440, 2409325, 1851402, 5220671, 3553272, 8190869, 1316856, 7620448, 210977, 5991061, 3249728, 6727353, 8578, 3724342, 4421799, 7475901, 1100098, 8336129, 5282425, 7871466, 8115473, 3343383, 1430430, 6527646, 7031341, 381987, 1308169, 22981, 1228525, 671102, 2477047, 411027, 3693493, 2967645, 5665122, 6232521, 983419, 4968207, 8253495, 3632928, 3157330, 3190144, 1000202, 4083598, 6441103, 1257611, 1585221, 6203962, 4904467, 1452451, 3041255, 3677745, 1528703, 3930395, 2797779, 6308525, 2556880, 4479693, 4499374, 7426187, 7849063, 7568473, 4680821, 1600420, 2140649, 4873154, 3821735, 4874723, 1643818, 1699267, 539299, 6031717, 300467, 4840449, 2867647, 4805995, 3043716, 3861115, 4464978, 2537516, 3592148, 1661693, 4849980, 5303092, 8284641, 5674394, 8100412, 4369920, 19422, 6623180, 3277672, 1399561, 3859737, 2118186, 2108549, 5760665, 1119584, 549488, 4794489, 1079900, 7356305, 5654953, 5700314, 5268920, 2884855, 5260684, 2091905, 359251, 6026966, 6554070, 7913949, 876248, 777960, 8143293, 518909, 2608894, 8354570}; - -/************************************************* -* Name: ntt -* -* Description: Forward NTT, in-place. No modular reduction is performed after -* additions or subtractions. Hence output coefficients can be up -* to 16*Q larger than the coefficients of the input polynomial. -* Output vector is in bitreversed order. -* -* Arguments: - uint32_t p[N]: input/output coefficient array -**************************************************/ -void ntt(uint32_t p[N]) { - uint32_t len, start, j, k; - uint32_t zeta, t; - - k = 1; - for(len = 128; len > 0; len >>= 1) { - for(start = 0; start < N; start = j + len) { - zeta = zetas[k++]; - for(j = start; j < start + len; ++j) { - t = montgomery_reduce((uint64_t)zeta * p[j + len]); - p[j + len] = p[j] + 2*Q - t; - p[j] = p[j] + t; - } - } - } -} - -/************************************************* -* Name: invntt_frominvmont -* -* Description: Inverse NTT and multiplication by Montgomery factor 2^32. -* In-place. No modular reductions after additions or -* subtractions. Input coefficient need to be smaller than 2*Q. -* Output coefficient are smaller than 2*Q. -* -* Arguments: - uint32_t p[N]: input/output coefficient array -**************************************************/ -void invntt_frominvmont(uint32_t p[N]) { - uint32_t start, len, j, k; - uint32_t t, zeta; - const uint32_t f = (((uint64_t)MONT*MONT % Q) * (Q-1) % Q) * ((Q-1) >> 8) % Q; - - k = 0; - for(len = 1; len < N; len <<= 1) { - for(start = 0; start < N; start = j + len) { - zeta = zetas_inv[k++]; - for(j = start; j < start + len; ++j) { - t = p[j]; - p[j] = t + p[j + len]; - p[j + len] = t + 256*Q - p[j + len]; - p[j + len] = montgomery_reduce((uint64_t)zeta * p[j + len]); - } - } - } - - for(j = 0; j < N; ++j) { - p[j] = montgomery_reduce((uint64_t)f * p[j]); - } -} -//#include "params.h" -//#include "poly.h" -//#include "polyvec.h" -//#include "packing.h" - -/************************************************* -* Name: pack_pk -* -* Description: Bit-pack public key pk = (rho, t1). -* -* Arguments: - uint8_t pk[]: output byte array -* - const uint8_t rho[]: byte array containing rho -* - const polyveck *t1: pointer to vector t1 -**************************************************/ -void pack_pk(uint8_t pk[CRYPTO_PUBLICKEYBYTES], - const uint8_t rho[SEEDBYTES], - const polyveck *t1) -{ - uint32_t i; - - for(i = 0; i < SEEDBYTES; ++i) - pk[i] = rho[i]; - pk += SEEDBYTES; - - for(i = 0; i < K; ++i) - polyt1_pack(pk + i*POLT1_SIZE_PACKED, t1->vec+i); -} - -/************************************************* -* Name: unpack_pk -* -* Description: Unpack public key pk = (rho, t1). -* -* Arguments: - const uint8_t rho[]: output byte array for rho -* - const polyveck *t1: pointer to output vector t1 -* - uint8_t pk[]: byte array containing bit-packed pk -**************************************************/ -void unpack_pk(uint8_t rho[SEEDBYTES], - polyveck *t1, - const uint8_t pk[CRYPTO_PUBLICKEYBYTES]) -{ - uint32_t i; - - for(i = 0; i < SEEDBYTES; ++i) - rho[i] = pk[i]; - pk += SEEDBYTES; - - for(i = 0; i < K; ++i) - polyt1_unpack(t1->vec+i, pk + i*POLT1_SIZE_PACKED); -} - -/************************************************* -* Name: pack_sk -* -* Description: Bit-pack secret key sk = (rho, key, tr, s1, s2, t0). -* -* Arguments: - uint8_t sk[]: output byte array -* - const uint8_t rho[]: byte array containing rho -* - const uint8_t key[]: byte array containing key -* - const uint8_t tr[]: byte array containing tr -* - const polyvecl *s1: pointer to vector s1 -* - const polyveck *s2: pointer to vector s2 -* - const polyveck *t0: pointer to vector t0 -**************************************************/ -void pack_sk(uint8_t sk[CRYPTO_SECRETKEYBYTES], - const uint8_t rho[SEEDBYTES], - const uint8_t key[SEEDBYTES], - const uint8_t tr[CRHBYTES], - const polyvecl *s1, - const polyveck *s2, - const polyveck *t0) -{ - uint32_t i; - - for(i = 0; i < SEEDBYTES; ++i) - sk[i] = rho[i]; - sk += SEEDBYTES; - - for(i = 0; i < SEEDBYTES; ++i) - sk[i] = key[i]; - sk += SEEDBYTES; - - for(i = 0; i < CRHBYTES; ++i) - sk[i] = tr[i]; - sk += CRHBYTES; - - for(i = 0; i < L; ++i) - polyeta_pack(sk + i*POLETA_SIZE_PACKED, s1->vec+i); - sk += L*POLETA_SIZE_PACKED; - - for(i = 0; i < K; ++i) - polyeta_pack(sk + i*POLETA_SIZE_PACKED, s2->vec+i); - sk += K*POLETA_SIZE_PACKED; - - for(i = 0; i < K; ++i) - polyt0_pack(sk + i*POLT0_SIZE_PACKED, t0->vec+i); -} - -/************************************************* -* Name: unpack_sk -* -* Description: Unpack secret key sk = (rho, key, tr, s1, s2, t0). -* -* Arguments: - const uint8_t rho[]: output byte array for rho -* - const uint8_t key[]: output byte array for key -* - const uint8_t tr[]: output byte array for tr -* - const polyvecl *s1: pointer to output vector s1 -* - const polyveck *s2: pointer to output vector s2 -* - const polyveck *r0: pointer to output vector t0 -* - uint8_t sk[]: byte array containing bit-packed sk -**************************************************/ -void unpack_sk(uint8_t rho[SEEDBYTES], - uint8_t key[SEEDBYTES], - uint8_t tr[CRHBYTES], - polyvecl *s1, - polyveck *s2, - polyveck *t0, - const uint8_t sk[CRYPTO_SECRETKEYBYTES]) -{ - uint32_t i; - - for(i = 0; i < SEEDBYTES; ++i) - rho[i] = sk[i]; - sk += SEEDBYTES; - - for(i = 0; i < SEEDBYTES; ++i) - key[i] = sk[i]; - sk += SEEDBYTES; - - for(i = 0; i < CRHBYTES; ++i) - tr[i] = sk[i]; - sk += CRHBYTES; - - for(i=0; i < L; ++i) - polyeta_unpack(s1->vec+i, sk + i*POLETA_SIZE_PACKED); - sk += L*POLETA_SIZE_PACKED; - - for(i=0; i < K; ++i) - polyeta_unpack(s2->vec+i, sk + i*POLETA_SIZE_PACKED); - sk += K*POLETA_SIZE_PACKED; - - for(i=0; i < K; ++i) - polyt0_unpack(t0->vec+i, sk + i*POLT0_SIZE_PACKED); -} - -/************************************************* -* Name: pack_sig -* -* Description: Bit-pack signature sig = (z, h, c). -* -* Arguments: - uint8_t sig[]: output byte array -* - const polyvecl *z: pointer to vector z -* - const polyveck *h: pointer to hint vector h -* - const poly *c: pointer to challenge polynomial -**************************************************/ -void pack_sig(uint8_t sig[CRYPTO_BYTES], - const polyvecl *z, - const polyveck *h, - const poly *c) -{ - uint32_t i, j, k; - uint64_t signs, mask; - - for(i = 0; i < L; ++i) - polyz_pack(sig + i*POLZ_SIZE_PACKED, z->vec+i); - sig += L*POLZ_SIZE_PACKED; - - /* Encode h */ - k = 0; - for(i = 0; i < K; ++i) { - for(j = 0; j < N; ++j) - if(h->vec[i].coeffs[j] != 0) - sig[k++] = j; - - sig[OMEGA + i] = k; - } - while(k < OMEGA) sig[k++] = 0; - sig += OMEGA + K; - - /* Encode c */ - signs = 0; - mask = 1; - for(i = 0; i < N/8; ++i) { - sig[i] = 0; - for(j = 0; j < 8; ++j) { - if(c->coeffs[8*i+j] != 0) { - sig[i] |= (1U << j); - if(c->coeffs[8*i+j] == (Q - 1)) signs |= mask; - mask <<= 1; - } - } - } - sig += N/8; - for(i = 0; i < 8; ++i) - sig[i] = signs >> 8*i; -} - -/************************************************* -* Name: unpack_sig -* -* Description: Unpack signature sig = (z, h, c). -* -* Arguments: - polyvecl *z: pointer to output vector z -* - polyveck *h: pointer to output hint vector h -* - poly *c: pointer to output challenge polynomial -* - const uint8_t sig[]: byte array containing -* bit-packed signature -* -* Returns 1 in case of malformed signature; otherwise 0. -**************************************************/ -int unpack_sig(polyvecl *z, - polyveck *h, - poly *c, - const uint8_t sig[CRYPTO_BYTES]) -{ - uint32_t i, j, k; - uint64_t signs, mask; - - for(i = 0; i < L; ++i) - polyz_unpack(z->vec+i, sig + i*POLZ_SIZE_PACKED); - sig += L*POLZ_SIZE_PACKED; - - /* Decode h */ - k = 0; - for(i = 0; i < K; ++i) { - for(j = 0; j < N; ++j) - h->vec[i].coeffs[j] = 0; - - if(sig[OMEGA + i] < k || sig[OMEGA + i] > OMEGA) - return 1; - - for(j = k; j < sig[OMEGA + i]; ++j) { - /* Coefficients are ordered for strong unforgeability */ - if(j > k && sig[j] <= sig[j-1]) return 1; - h->vec[i].coeffs[sig[j]] = 1; - } - - k = sig[OMEGA + i]; - } - - /* Extra indices are zero for strong unforgeability */ - for(j = k; j < OMEGA; ++j) - if(sig[j]) - return 1; - - sig += OMEGA + K; - - /* Decode c */ - for(i = 0; i < N; ++i) - c->coeffs[i] = 0; - - signs = 0; - for(i = 0; i < 8; ++i) - signs |= (uint64_t)sig[N/8+i] << 8*i; - - /* Extra sign bits are zero for strong unforgeability */ - if(signs >> 60) - return 1; - - mask = 1; - for(i = 0; i < N/8; ++i) { - for(j = 0; j < 8; ++j) { - if((sig[i] >> j) & 0x01) { - c->coeffs[8*i+j] = (signs & mask) ? Q - 1 : 1; - mask <<= 1; - } - } - } - - return 0; -} -//#include -//#include "test/cpucycles.h" -//#include "fips202.h" -//#include "params.h" -//#include "reduce.h" -//#include "rounding.h" -//#include "ntt.h" -//#include "poly.h" - -#ifdef DBENCH -extern const uint64_t timing_overhead; -extern uint64_t *tred, *tadd, *tmul, *tround, *tsample, *tpack; -#endif - -/************************************************* -* Name: poly_reduce -* -* Description: Reduce all coefficients of input polynomial to representative -* in [0,2*Q[. -* -* Arguments: - poly *a: pointer to input/output polynomial -**************************************************/ -void poly_reduce(poly *a) { - uint32_t i; - DBENCH_START(); - - for(i = 0; i < N; ++i) - a->coeffs[i] = reduce32(a->coeffs[i]); - - DBENCH_STOP(*tred); -} - -/************************************************* -* Name: poly_csubq -* -* Description: For all coefficients of input polynomial subtract Q if -* coefficient is bigger than Q. -* -* Arguments: - poly *a: pointer to input/output polynomial -**************************************************/ -void poly_csubq(poly *a) { - uint32_t i; - DBENCH_START(); - - for(i = 0; i < N; ++i) - a->coeffs[i] = csubq(a->coeffs[i]); - - DBENCH_STOP(*tred); -} - -/************************************************* -* Name: poly_freeze -* -* Description: Reduce all coefficients of the polynomial to standard -* representatives. -* -* Arguments: - poly *a: pointer to input/output polynomial -**************************************************/ -void poly_freeze(poly *a) { - uint32_t i; - DBENCH_START(); - - for(i = 0; i < N; ++i) - a->coeffs[i] = freeze(a->coeffs[i]); - - DBENCH_STOP(*tred); -} - -/************************************************* -* Name: poly_add -* -* Description: Add polynomials. No modular reduction is performed. -* -* Arguments: - poly *c: pointer to output polynomial -* - const poly *a: pointer to first summand -* - const poly *b: pointer to second summand -**************************************************/ -void poly_add(poly *c, const poly *a, const poly *b) { - uint32_t i; - DBENCH_START(); - - for(i = 0; i < N; ++i) - c->coeffs[i] = a->coeffs[i] + b->coeffs[i]; - - DBENCH_STOP(*tadd); -} - -/************************************************* -* Name: poly_sub -* -* Description: Subtract polynomials. Assumes coefficients of second input -* polynomial to be less than 2*Q. No modular reduction is -* performed. -* -* Arguments: - poly *c: pointer to output polynomial -* - const poly *a: pointer to first input polynomial -* - const poly *b: pointer to second input polynomial to be -* subtraced from first input polynomial -**************************************************/ -void poly_sub(poly *c, const poly *a, const poly *b) { - uint32_t i; - DBENCH_START(); - - for(i = 0; i < N; ++i) - c->coeffs[i] = a->coeffs[i] + 2*Q - b->coeffs[i]; - - DBENCH_STOP(*tadd); -} - -/************************************************* -* Name: poly_neg -* -* Description: Negate polynomial. Assumes input coefficients to be standard -* representatives. -* -* Arguments: - poly *a: pointer to input/output polynomial -**************************************************/ -void poly_neg(poly *a) { - uint32_t i; - DBENCH_START(); - - for(i = 0; i < N; ++i) - a->coeffs[i] = Q - a->coeffs[i]; - - DBENCH_STOP(*tadd); -} - -/************************************************* -* Name: poly_shiftl -* -* Description: Multiply polynomial by 2^k without modular reduction. Assumes -* input coefficients to be less than 2^{32-k}. -* -* Arguments: - poly *a: pointer to input/output polynomial -* - uint32_t k: exponent -**************************************************/ -void poly_shiftl(poly *a, uint32_t k) { - uint32_t i; - DBENCH_START(); - - for(i = 0; i < N; ++i) - a->coeffs[i] <<= k; - - DBENCH_STOP(*tmul); -} - -/************************************************* -* Name: poly_ntt -* -* Description: Forward NTT. Output coefficients can be up to 16*Q larger than -* input coefficients. -* -* Arguments: - poly *a: pointer to input/output polynomial -**************************************************/ -void poly_ntt(poly *a) { - DBENCH_START(); - - ntt(a->coeffs); - - DBENCH_STOP(*tmul); -} - -/************************************************* -* Name: poly_invntt_montgomery -* -* Description: Inverse NTT and multiplication with 2^{32}. Input coefficients -* need to be less than 2*Q. Output coefficients are less than 2*Q. -* -* Arguments: - poly *a: pointer to input/output polynomial -**************************************************/ -void poly_invntt_montgomery(poly *a) { - DBENCH_START(); - - invntt_frominvmont(a->coeffs); - - DBENCH_STOP(*tmul); -} - -/************************************************* -* Name: poly_pointwise_invmontgomery -* -* Description: Pointwise multiplication of polynomials in NTT domain -* representation and multiplication of resulting polynomial -* with 2^{-32}. Output coefficients are less than 2*Q if input -* coefficient are less than 22*Q. -* -* Arguments: - poly *c: pointer to output polynomial -* - const poly *a: pointer to first input polynomial -* - const poly *b: pointer to second input polynomial -**************************************************/ -void poly_pointwise_invmontgomery(poly *c, const poly *a, const poly *b) { - uint32_t i; - DBENCH_START(); - - for(i = 0; i < N; ++i) - c->coeffs[i] = montgomery_reduce((uint64_t)a->coeffs[i] * b->coeffs[i]); - - DBENCH_STOP(*tmul); -} - -/************************************************* -* Name: poly_power2round -* -* Description: For all coefficients c of the input polynomial, -* compute c0, c1 such that c mod Q = c1*2^D + c0 -* with -2^{D-1} < c0 <= 2^{D-1}. Assumes coefficients to be -* standard representatives. -* -* Arguments: - poly *a1: pointer to output polynomial with coefficients c1 -* - poly *a0: pointer to output polynomial with coefficients Q + a0 -* - const poly *v: pointer to input polynomial -**************************************************/ -void poly_power2round(poly *a1, poly *a0, const poly *a) { - uint32_t i; - DBENCH_START(); - - for(i = 0; i < N; ++i) - a1->coeffs[i] = power2round(a->coeffs[i], a0->coeffs+i); - - DBENCH_STOP(*tround); -} - -/************************************************* -* Name: poly_decompose -* -* Description: For all coefficients c of the input polynomial, -* compute high and low bits c0, c1 such c mod Q = c1*ALPHA + c0 -* with -ALPHA/2 < c0 <= ALPHA/2 except c1 = (Q-1)/ALPHA where we -* set c1 = 0 and -ALPHA/2 <= c0 = c mod Q - Q < 0. -* Assumes coefficients to be standard representatives. -* -* Arguments: - poly *a1: pointer to output polynomial with coefficients c1 -* - poly *a0: pointer to output polynomial with coefficients Q + a0 -* - const poly *c: pointer to input polynomial -**************************************************/ -void poly_decompose(poly *a1, poly *a0, const poly *a) { - uint32_t i; - DBENCH_START(); - - for(i = 0; i < N; ++i) - a1->coeffs[i] = decompose(a->coeffs[i], a0->coeffs+i); - - DBENCH_STOP(*tround); -} - -/************************************************* -* Name: poly_make_hint -* -* Description: Compute hint polynomial. The coefficients of which indicate -* whether the high bits of the corresponding coefficients -* of the first input polynomial and of the sum of the input -* polynomials differ. -* -* Arguments: - poly *h: pointer to output hint polynomial -* - const poly *a: pointer to first input polynomial -* - const poly *b: pointer to second input polynomial -* -* Returns number of 1 bits. -**************************************************/ -uint32_t poly_make_hint(poly *h, const poly *a, const poly *b) { - uint32_t i, s = 0; - DBENCH_START(); - - for(i = 0; i < N; ++i) { - h->coeffs[i] = make_hint(a->coeffs[i], b->coeffs[i]); - s += h->coeffs[i]; - } - - DBENCH_STOP(*tround); - return s; -} - -/************************************************* -* Name: poly_use_hint -* -* Description: Use hint polynomial to correct the high bits of a polynomial. -* -* Arguments: - poly *a: pointer to output polynomial with corrected high bits -* - const poly *b: pointer to input polynomial -* - const poly *h: pointer to input hint polynomial -**************************************************/ -void poly_use_hint(poly *a, const poly *b, const poly *h) { - uint32_t i; - DBENCH_START(); - - for(i = 0; i < N; ++i) - a->coeffs[i] = use_hint(b->coeffs[i], h->coeffs[i]); - - DBENCH_STOP(*tround); -} - -/************************************************* -* Name: poly_chknorm -* -* Description: Check infinity norm of polynomial against given bound. -* Assumes input coefficients to be standard representatives. -* -* Arguments: - const poly *a: pointer to polynomial -* - uint32_t B: norm bound -* -* Returns 0 if norm is strictly smaller than B and 1 otherwise. -**************************************************/ -int poly_chknorm(const poly *a, uint32_t B) { - uint32_t i; - int32_t t; - DBENCH_START(); - - /* It is ok to leak which coefficient violates the bound since - the probability for each coefficient is independent of secret - data but we must not leak the sign of the centralized representative. */ - for(i = 0; i < N; ++i) { - /* Absolute value of centralized representative */ - t = (Q-1)/2 - a->coeffs[i]; - t ^= (t >> 31); - t = (Q-1)/2 - t; - - if((uint32_t)t >= B) { - DBENCH_STOP(*tsample); - return 1; - } - } - - DBENCH_STOP(*tsample); - return 0; -} - -/************************************************* -* Name: poly_uniform -* -* Description: Sample uniformly random polynomial using stream of random bytes. -* Assumes that enough random bytes are given (e.g. -* 5*SHAKE128_RATE bytes). -* -* Arguments: - poly *a: pointer to output polynomial -* - const uint8_t *buf: array of random bytes -**************************************************/ -void poly_uniform(poly *a, const uint8_t *buf) { - uint32_t ctr, pos; - uint32_t t; - DBENCH_START(); - - ctr = pos = 0; - while(ctr < N) { - t = buf[pos++]; - t |= (uint32_t)buf[pos++] << 8; - t |= (uint32_t)buf[pos++] << 16; - t &= 0x7FFFFF; - - if(t < Q) - a->coeffs[ctr++] = t; - } - - DBENCH_STOP(*tsample); -} - -/************************************************* -* Name: rej_eta -* -* Description: Sample uniformly random coefficients in [-ETA, ETA] by -* performing rejection sampling using array of random bytes. -* -* Arguments: - uint32_t *a: pointer to output array (allocated) -* - uint32_t len: number of coefficients to be sampled -* - const uint8_t *buf: array of random bytes -* - uint32_t buflen: length of array of random bytes -* -* Returns number of sampled coefficients. Can be smaller than len if not enough -* random bytes were given. -**************************************************/ -static uint32_t rej_eta(uint32_t *a, - uint32_t len, - const uint8_t *buf, - uint32_t buflen) -{ -#if ETA > 7 -#error "rej_eta() assumes ETA <= 7" -#endif - uint32_t ctr, pos; - uint8_t t0, t1; - DBENCH_START(); - - ctr = pos = 0; - while(ctr < len && pos < buflen) { -#if ETA <= 3 - t0 = buf[pos] & 0x07; - t1 = buf[pos++] >> 5; -#else - t0 = buf[pos] & 0x0F; - t1 = buf[pos++] >> 4; -#endif - - if(t0 <= 2*ETA) - a[ctr++] = Q + ETA - t0; - if(t1 <= 2*ETA && ctr < len) - a[ctr++] = Q + ETA - t1; - } - - DBENCH_STOP(*tsample); - return ctr; -} - -/************************************************* -* Name: poly_uniform_eta -* -* Description: Sample polynomial with uniformly random coefficients -* in [-ETA,ETA] by performing rejection sampling using the -* output stream from SHAKE256(seed|nonce). -* -* Arguments: - poly *a: pointer to output polynomial -* - const uint8_t seed[]: byte array with seed of length -* SEEDBYTES -* - uint8_t nonce: nonce byte -**************************************************/ -void poly_uniform_eta(poly *a, - const uint8_t seed[SEEDBYTES], - uint8_t nonce) -{ - uint32_t i, ctr; - uint8_t inbuf[SEEDBYTES + 1]; - /* Probability that we need more than 2 blocks: < 2^{-84} - Probability that we need more than 3 blocks: < 2^{-352} */ - uint8_t outbuf[2*SHAKE256_RATE]; - uint64_t state[25]; - - for(i= 0; i < SEEDBYTES; ++i) - inbuf[i] = seed[i]; - inbuf[SEEDBYTES] = nonce; - - shake256_absorb(state, inbuf, SEEDBYTES + 1); - shake256_squeezeblocks(outbuf, 2, state); - - ctr = rej_eta(a->coeffs, N, outbuf, 2*SHAKE256_RATE); - if(ctr < N) { - shake256_squeezeblocks(outbuf, 1, state); - rej_eta(a->coeffs + ctr, N - ctr, outbuf, SHAKE256_RATE); - } -} - -/************************************************* -* Name: rej_gamma1m1 -* -* Description: Sample uniformly random coefficients -* in [-(GAMMA1 - 1), GAMMA1 - 1] by performing rejection sampling -* using array of random bytes. -* -* Arguments: - uint32_t *a: pointer to output array (allocated) -* - uint32_t len: number of coefficients to be sampled -* - const uint8_t *buf: array of random bytes -* - uint32_t buflen: length of array of random bytes -* -* Returns number of sampled coefficients. Can be smaller than len if not enough -* random bytes were given. -**************************************************/ -static uint32_t rej_gamma1m1(uint32_t *a, - uint32_t len, - const uint8_t *buf, - uint32_t buflen) -{ -#if GAMMA1 > (1 << 19) -#error "rej_gamma1m1() assumes GAMMA1 - 1 fits in 19 bits" -#endif - uint32_t ctr, pos; - uint32_t t0, t1; - DBENCH_START(); - - ctr = pos = 0; - while(ctr < len && pos + 5 <= buflen) { - t0 = buf[pos]; - t0 |= (uint32_t)buf[pos + 1] << 8; - t0 |= (uint32_t)buf[pos + 2] << 16; - t0 &= 0xFFFFF; - - t1 = buf[pos + 2] >> 4; - t1 |= (uint32_t)buf[pos + 3] << 4; - t1 |= (uint32_t)buf[pos + 4] << 12; - - pos += 5; - - if(t0 <= 2*GAMMA1 - 2) - a[ctr++] = Q + GAMMA1 - 1 - t0; - if(t1 <= 2*GAMMA1 - 2 && ctr < len) - a[ctr++] = Q + GAMMA1 - 1 - t1; - } - - DBENCH_STOP(*tsample); - return ctr; -} - -/************************************************* -* Name: poly_uniform_gamma1m1 -* -* Description: Sample polynomial with uniformly random coefficients -* in [-(GAMMA1 - 1), GAMMA1 - 1] by performing rejection -* sampling on output stream of SHAKE256(seed|nonce). -* -* Arguments: - poly *a: pointer to output polynomial -* - const uint8_t seed[]: byte array with seed of length -* SEEDBYTES + CRHBYTES -* - uint16_t nonce: 16-bit nonce -**************************************************/ -void poly_uniform_gamma1m1(poly *a, - const uint8_t seed[SEEDBYTES + CRHBYTES], - uint16_t nonce) -{ - uint32_t i, ctr; - uint8_t inbuf[SEEDBYTES + CRHBYTES + 2]; - /* Probability that we need more than 5 blocks: < 2^{-81} - Probability that we need more than 6 blocks: < 2^{-467} */ - uint8_t outbuf[5*SHAKE256_RATE]; - uint64_t state[25]; - - for(i = 0; i < SEEDBYTES + CRHBYTES; ++i) - inbuf[i] = seed[i]; - inbuf[SEEDBYTES + CRHBYTES] = nonce & 0xFF; - inbuf[SEEDBYTES + CRHBYTES + 1] = nonce >> 8; - - shake256_absorb(state, inbuf, SEEDBYTES + CRHBYTES + 2); - shake256_squeezeblocks(outbuf, 5, state); - - ctr = rej_gamma1m1(a->coeffs, N, outbuf, 5*SHAKE256_RATE); - if(ctr < N) { - /* There are no bytes left in outbuf - since 5*SHAKE256_RATE is divisible by 5 */ - shake256_squeezeblocks(outbuf, 1, state); - rej_gamma1m1(a->coeffs + ctr, N - ctr, outbuf, SHAKE256_RATE); - } -} - -/************************************************* -* Name: polyeta_pack -* -* Description: Bit-pack polynomial with coefficients in [-ETA,ETA]. -* Input coefficients are assumed to lie in [Q-ETA,Q+ETA]. -* -* Arguments: - uint8_t *r: pointer to output byte array with at least -* POLETA_SIZE_PACKED bytes -* - const poly *a: pointer to input polynomial -**************************************************/ -void polyeta_pack(uint8_t *r, const poly *a) { -#if ETA > 7 -#error "polyeta_pack() assumes ETA <= 7" -#endif - uint32_t i; - uint8_t t[8]; - DBENCH_START(); - -#if ETA <= 3 - for(i = 0; i < N/8; ++i) { - t[0] = Q + ETA - a->coeffs[8*i+0]; - t[1] = Q + ETA - a->coeffs[8*i+1]; - t[2] = Q + ETA - a->coeffs[8*i+2]; - t[3] = Q + ETA - a->coeffs[8*i+3]; - t[4] = Q + ETA - a->coeffs[8*i+4]; - t[5] = Q + ETA - a->coeffs[8*i+5]; - t[6] = Q + ETA - a->coeffs[8*i+6]; - t[7] = Q + ETA - a->coeffs[8*i+7]; - - r[3*i+0] = t[0]; - r[3*i+0] |= t[1] << 3; - r[3*i+0] |= t[2] << 6; - r[3*i+1] = t[2] >> 2; - r[3*i+1] |= t[3] << 1; - r[3*i+1] |= t[4] << 4; - r[3*i+1] |= t[5] << 7; - r[3*i+2] = t[5] >> 1; - r[3*i+2] |= t[6] << 2; - r[3*i+2] |= t[7] << 5; - } -#else - for(i = 0; i < N/2; ++i) { - t[0] = Q + ETA - a->coeffs[2*i+0]; - t[1] = Q + ETA - a->coeffs[2*i+1]; - r[i] = t[0] | (t[1] << 4); - } -#endif - - DBENCH_STOP(*tpack); -} - -/************************************************* -* Name: polyeta_unpack -* -* Description: Unpack polynomial with coefficients in [-ETA,ETA]. -* Output coefficients lie in [Q-ETA,Q+ETA]. -* -* Arguments: - poly *r: pointer to output polynomial -* - const uint8_t *a: byte array with bit-packed polynomial -**************************************************/ -void polyeta_unpack(poly *r, const uint8_t *a) { - uint32_t i; - DBENCH_START(); - -#if ETA <= 3 - for(i = 0; i < N/8; ++i) { - r->coeffs[8*i+0] = a[3*i+0] & 0x07; - r->coeffs[8*i+1] = (a[3*i+0] >> 3) & 0x07; - r->coeffs[8*i+2] = (a[3*i+0] >> 6) | ((a[3*i+1] & 0x01) << 2); - r->coeffs[8*i+3] = (a[3*i+1] >> 1) & 0x07; - r->coeffs[8*i+4] = (a[3*i+1] >> 4) & 0x07; - r->coeffs[8*i+5] = (a[3*i+1] >> 7) | ((a[3*i+2] & 0x03) << 1); - r->coeffs[8*i+6] = (a[3*i+2] >> 2) & 0x07; - r->coeffs[8*i+7] = (a[3*i+2] >> 5); - - r->coeffs[8*i+0] = Q + ETA - r->coeffs[8*i+0]; - r->coeffs[8*i+1] = Q + ETA - r->coeffs[8*i+1]; - r->coeffs[8*i+2] = Q + ETA - r->coeffs[8*i+2]; - r->coeffs[8*i+3] = Q + ETA - r->coeffs[8*i+3]; - r->coeffs[8*i+4] = Q + ETA - r->coeffs[8*i+4]; - r->coeffs[8*i+5] = Q + ETA - r->coeffs[8*i+5]; - r->coeffs[8*i+6] = Q + ETA - r->coeffs[8*i+6]; - r->coeffs[8*i+7] = Q + ETA - r->coeffs[8*i+7]; - } -#else - for(i = 0; i < N/2; ++i) { - r->coeffs[2*i+0] = a[i] & 0x0F; - r->coeffs[2*i+1] = a[i] >> 4; - r->coeffs[2*i+0] = Q + ETA - r->coeffs[2*i+0]; - r->coeffs[2*i+1] = Q + ETA - r->coeffs[2*i+1]; - } -#endif - - DBENCH_STOP(*tpack); -} - -/************************************************* -* Name: polyt1_pack -* -* Description: Bit-pack polynomial t1 with coefficients fitting in 9 bits. -* Input coefficients are assumed to be standard representatives. -* -* Arguments: - uint8_t *r: pointer to output byte array with at least -* POLT1_SIZE_PACKED bytes -* - const poly *a: pointer to input polynomial -**************************************************/ -void polyt1_pack(uint8_t *r, const poly *a) { -#if D != 14 -#error "polyt1_pack() assumes D == 14" -#endif - uint32_t i; - DBENCH_START(); - - for(i = 0; i < N/8; ++i) { - r[9*i+0] = a->coeffs[8*i+0] & 0xFF; - r[9*i+1] = (a->coeffs[8*i+0] >> 8) | ((a->coeffs[8*i+1] & 0x7F) << 1); - r[9*i+2] = (a->coeffs[8*i+1] >> 7) | ((a->coeffs[8*i+2] & 0x3F) << 2); - r[9*i+3] = (a->coeffs[8*i+2] >> 6) | ((a->coeffs[8*i+3] & 0x1F) << 3); - r[9*i+4] = (a->coeffs[8*i+3] >> 5) | ((a->coeffs[8*i+4] & 0x0F) << 4); - r[9*i+5] = (a->coeffs[8*i+4] >> 4) | ((a->coeffs[8*i+5] & 0x07) << 5); - r[9*i+6] = (a->coeffs[8*i+5] >> 3) | ((a->coeffs[8*i+6] & 0x03) << 6); - r[9*i+7] = (a->coeffs[8*i+6] >> 2) | ((a->coeffs[8*i+7] & 0x01) << 7); - r[9*i+8] = a->coeffs[8*i+7] >> 1; - } - - DBENCH_STOP(*tpack); -} - -/************************************************* -* Name: polyt1_unpack -* -* Description: Unpack polynomial t1 with 9-bit coefficients. -* Output coefficients are standard representatives. -* -* Arguments: - poly *r: pointer to output polynomial -* - const uint8_t *a: byte array with bit-packed polynomial -**************************************************/ -void polyt1_unpack(poly *r, const uint8_t *a) { - uint32_t i; - DBENCH_START(); - - for(i = 0; i < N/8; ++i) { - r->coeffs[8*i+0] = a[9*i+0] | ((uint32_t)(a[9*i+1] & 0x01) << 8); - r->coeffs[8*i+1] = (a[9*i+1] >> 1) | ((uint32_t)(a[9*i+2] & 0x03) << 7); - r->coeffs[8*i+2] = (a[9*i+2] >> 2) | ((uint32_t)(a[9*i+3] & 0x07) << 6); - r->coeffs[8*i+3] = (a[9*i+3] >> 3) | ((uint32_t)(a[9*i+4] & 0x0F) << 5); - r->coeffs[8*i+4] = (a[9*i+4] >> 4) | ((uint32_t)(a[9*i+5] & 0x1F) << 4); - r->coeffs[8*i+5] = (a[9*i+5] >> 5) | ((uint32_t)(a[9*i+6] & 0x3F) << 3); - r->coeffs[8*i+6] = (a[9*i+6] >> 6) | ((uint32_t)(a[9*i+7] & 0x7F) << 2); - r->coeffs[8*i+7] = (a[9*i+7] >> 7) | ((uint32_t)(a[9*i+8] & 0xFF) << 1); - } - - DBENCH_STOP(*tpack); -} - -/************************************************* -* Name: polyt0_pack -* -* Description: Bit-pack polynomial t0 with coefficients in ]-2^{D-1}, 2^{D-1}]. -* Input coefficients are assumed to lie in ]Q-2^{D-1}, Q+2^{D-1}]. -* -* Arguments: - uint8_t *r: pointer to output byte array with at least -* POLT0_SIZE_PACKED bytes -* - const poly *a: pointer to input polynomial -**************************************************/ -void polyt0_pack(uint8_t *r, const poly *a) { - uint32_t i; - uint32_t t[4]; - DBENCH_START(); - - for(i = 0; i < N/4; ++i) { - t[0] = Q + (1 << (D-1)) - a->coeffs[4*i+0]; - t[1] = Q + (1 << (D-1)) - a->coeffs[4*i+1]; - t[2] = Q + (1 << (D-1)) - a->coeffs[4*i+2]; - t[3] = Q + (1 << (D-1)) - a->coeffs[4*i+3]; - - r[7*i+0] = t[0]; - r[7*i+1] = t[0] >> 8; - r[7*i+1] |= t[1] << 6; - r[7*i+2] = t[1] >> 2; - r[7*i+3] = t[1] >> 10; - r[7*i+3] |= t[2] << 4; - r[7*i+4] = t[2] >> 4; - r[7*i+5] = t[2] >> 12; - r[7*i+5] |= t[3] << 2; - r[7*i+6] = t[3] >> 6; - } - - DBENCH_STOP(*tpack); -} - -/************************************************* -* Name: polyt0_unpack -* -* Description: Unpack polynomial t0 with coefficients in ]-2^{D-1}, 2^{D-1}]. -* Output coefficients lie in ]Q-2^{D-1},Q+2^{D-1}]. -* -* Arguments: - poly *r: pointer to output polynomial -* - const uint8_t *a: byte array with bit-packed polynomial -**************************************************/ -void polyt0_unpack(poly *r, const uint8_t *a) { - uint32_t i; - DBENCH_START(); - - for(i = 0; i < N/4; ++i) { - r->coeffs[4*i+0] = a[7*i+0]; - r->coeffs[4*i+0] |= (uint32_t)(a[7*i+1] & 0x3F) << 8; - - r->coeffs[4*i+1] = a[7*i+1] >> 6; - r->coeffs[4*i+1] |= (uint32_t)a[7*i+2] << 2; - r->coeffs[4*i+1] |= (uint32_t)(a[7*i+3] & 0x0F) << 10; - - r->coeffs[4*i+2] = a[7*i+3] >> 4; - r->coeffs[4*i+2] |= (uint32_t)a[7*i+4] << 4; - r->coeffs[4*i+2] |= (uint32_t)(a[7*i+5] & 0x03) << 12; - - r->coeffs[4*i+3] = a[7*i+5] >> 2; - r->coeffs[4*i+3] |= (uint32_t)a[7*i+6] << 6; - - r->coeffs[4*i+0] = Q + (1 << (D-1)) - r->coeffs[4*i+0]; - r->coeffs[4*i+1] = Q + (1 << (D-1)) - r->coeffs[4*i+1]; - r->coeffs[4*i+2] = Q + (1 << (D-1)) - r->coeffs[4*i+2]; - r->coeffs[4*i+3] = Q + (1 << (D-1)) - r->coeffs[4*i+3]; - } - - DBENCH_STOP(*tpack); -} - -/************************************************* -* Name: polyz_pack -* -* Description: Bit-pack polynomial z with coefficients -* in [-(GAMMA1 - 1), GAMMA1 - 1]. -* Input coefficients are assumed to be standard representatives. -* -* Arguments: - uint8_t *r: pointer to output byte array with at least -* POLZ_SIZE_PACKED bytes -* - const poly *a: pointer to input polynomial -**************************************************/ -void polyz_pack(uint8_t *r, const poly *a) { -#if GAMMA1 > (1 << 19) -#error "polyz_pack() assumes GAMMA1 <= 2^{19}" -#endif - uint32_t i; - uint32_t t[2]; - DBENCH_START(); - - for(i = 0; i < N/2; ++i) { - /* Map to {0,...,2*GAMMA1 - 2} */ - t[0] = GAMMA1 - 1 - a->coeffs[2*i+0]; - t[0] += ((int32_t)t[0] >> 31) & Q; - t[1] = GAMMA1 - 1 - a->coeffs[2*i+1]; - t[1] += ((int32_t)t[1] >> 31) & Q; - - r[5*i+0] = t[0]; - r[5*i+1] = t[0] >> 8; - r[5*i+2] = t[0] >> 16; - r[5*i+2] |= t[1] << 4; - r[5*i+3] = t[1] >> 4; - r[5*i+4] = t[1] >> 12; - } - - DBENCH_STOP(*tpack); -} - -/************************************************* -* Name: polyz_unpack -* -* Description: Unpack polynomial z with coefficients -* in [-(GAMMA1 - 1), GAMMA1 - 1]. -* Output coefficients are standard representatives. -* -* Arguments: - poly *r: pointer to output polynomial -* - const uint8_t *a: byte array with bit-packed polynomial -**************************************************/ -void polyz_unpack(poly *r, const uint8_t *a) { - uint32_t i; - DBENCH_START(); - - for(i = 0; i < N/2; ++i) { - r->coeffs[2*i+0] = a[5*i+0]; - r->coeffs[2*i+0] |= (uint32_t)a[5*i+1] << 8; - r->coeffs[2*i+0] |= (uint32_t)(a[5*i+2] & 0x0F) << 16; - - r->coeffs[2*i+1] = a[5*i+2] >> 4; - r->coeffs[2*i+1] |= (uint32_t)a[5*i+3] << 4; - r->coeffs[2*i+1] |= (uint32_t)a[5*i+4] << 12; - - r->coeffs[2*i+0] = GAMMA1 - 1 - r->coeffs[2*i+0]; - r->coeffs[2*i+0] += ((int32_t)r->coeffs[2*i+0] >> 31) & Q; - r->coeffs[2*i+1] = GAMMA1 - 1 - r->coeffs[2*i+1]; - r->coeffs[2*i+1] += ((int32_t)r->coeffs[2*i+1] >> 31) & Q; - } - - DBENCH_STOP(*tpack); -} - -/************************************************* -* Name: polyw1_pack -* -* Description: Bit-pack polynomial w1 with coefficients in [0, 15]. -* Input coefficients are assumed to be standard representatives. -* -* Arguments: - uint8_t *r: pointer to output byte array with at least -* POLW1_SIZE_PACKED bytes -* - const poly *a: pointer to input polynomial -**************************************************/ -void polyw1_pack(uint8_t *r, const poly *a) { - uint32_t i; - DBENCH_START(); - - for(i = 0; i < N/2; ++i) - r[i] = a->coeffs[2*i+0] | (a->coeffs[2*i+1] << 4); - - DBENCH_STOP(*tpack); -} -//#include -//#include "params.h" -//#include "poly.h" -//#include "polyvec.h" - -/**************************************************************/ -/************ Vectors of polynomials of length L **************/ -/**************************************************************/ - -/************************************************* -* Name: polyvecl_freeze -* -* Description: Reduce coefficients of polynomials in vector of length L -* to standard representatives. -* -* Arguments: - polyvecl *v: pointer to input/output vector -**************************************************/ -void polyvecl_freeze(polyvecl *v) { - uint32_t i; - - for(i = 0; i < L; ++i) - poly_freeze(v->vec+i); -} - -/************************************************* -* Name: polyvecl_add -* -* Description: Add vectors of polynomials of length L. -* No modular reduction is performed. -* -* Arguments: - polyvecl *w: pointer to output vector -* - const polyvecl *u: pointer to first summand -* - const polyvecl *v: pointer to second summand -**************************************************/ -void polyvecl_add(polyvecl *w, const polyvecl *u, const polyvecl *v) { - uint32_t i; - - for(i = 0; i < L; ++i) - poly_add(w->vec+i, u->vec+i, v->vec+i); -} - -/************************************************* -* Name: polyvecl_ntt -* -* Description: Forward NTT of all polynomials in vector of length L. Output -* coefficients can be up to 16*Q larger than input coefficients. -* -* Arguments: - polyvecl *v: pointer to input/output vector -**************************************************/ -void polyvecl_ntt(polyvecl *v) { - uint32_t i; - - for(i = 0; i < L; ++i) - poly_ntt(v->vec+i); -} - -/************************************************* -* Name: polyvecl_pointwise_acc_invmontgomery -* -* Description: Pointwise multiply vectors of polynomials of length L, multiply -* resulting vector by 2^{-32} and add (accumulate) polynomials -* in it. Input/output vectors are in NTT domain representation. -* Input coefficients are assumed to be less than 22*Q. Output -* coeffcient are less than 2*L*Q. -* -* Arguments: - poly *w: output polynomial -* - const polyvecl *u: pointer to first input vector -* - const polyvecl *v: pointer to second input vector -**************************************************/ -void polyvecl_pointwise_acc_invmontgomery(poly *w, - const polyvecl *u, - const polyvecl *v) -{ - uint32_t i; - poly t; - - poly_pointwise_invmontgomery(w, u->vec+0, v->vec+0); - - for(i = 1; i < L; ++i) { - poly_pointwise_invmontgomery(&t, u->vec+i, v->vec+i); - poly_add(w, w, &t); - } -} - -/************************************************* -* Name: polyvecl_chknorm -* -* Description: Check infinity norm of polynomials in vector of length L. -* Assumes input coefficients to be standard representatives. -* -* Arguments: - const polyvecl *v: pointer to vector -* - uint32_t B: norm bound -* -* Returns 0 if norm of all polynomials is strictly smaller than B and 1 -* otherwise. -**************************************************/ -int polyvecl_chknorm(const polyvecl *v, uint32_t bound) { - uint32_t i; - int ret = 0; - - for(i = 0; i < L; ++i) - ret |= poly_chknorm(v->vec+i, bound); - - return ret; -} - -/**************************************************************/ -/************ Vectors of polynomials of length K **************/ -/**************************************************************/ - - -/************************************************* -* Name: polyveck_reduce -* -* Description: Reduce coefficients of polynomials in vector of length K -* to representatives in [0,2*Q[. -* -* Arguments: - polyveck *v: pointer to input/output vector -**************************************************/ -void polyveck_reduce(polyveck *v) { - uint32_t i; - - for(i = 0; i < K; ++i) - poly_reduce(v->vec+i); -} - -/************************************************* -* Name: polyveck_csubq -* -* Description: For all coefficients of polynomials in vector of length K -* subtract Q if coefficient is bigger than Q. -* -* Arguments: - polyveck *v: pointer to input/output vector -**************************************************/ -void polyveck_csubq(polyveck *v) { - uint32_t i; - - for(i = 0; i < K; ++i) - poly_csubq(v->vec+i); -} - -/************************************************* -* Name: polyveck_freeze -* -* Description: Reduce coefficients of polynomials in vector of length K -* to standard representatives. -* -* Arguments: - polyveck *v: pointer to input/output vector -**************************************************/ -void polyveck_freeze(polyveck *v) { - uint32_t i; - - for(i = 0; i < K; ++i) - poly_freeze(v->vec+i); -} - -/************************************************* -* Name: polyveck_add -* -* Description: Add vectors of polynomials of length K. -* No modular reduction is performed. -* -* Arguments: - polyveck *w: pointer to output vector -* - const polyveck *u: pointer to first summand -* - const polyveck *v: pointer to second summand -**************************************************/ -void polyveck_add(polyveck *w, const polyveck *u, const polyveck *v) { - uint32_t i; - - for(i = 0; i < K; ++i) - poly_add(w->vec+i, u->vec+i, v->vec+i); -} - -/************************************************* -* Name: polyveck_sub -* -* Description: Subtract vectors of polynomials of length K. -* Assumes coefficients of polynomials in second input vector -* to be less than 2*Q. No modular reduction is performed. -* -* Arguments: - polyveck *w: pointer to output vector -* - const polyveck *u: pointer to first input vector -* - const polyveck *v: pointer to second input vector to be -* subtracted from first input vector -**************************************************/ -void polyveck_sub(polyveck *w, const polyveck *u, const polyveck *v) { - uint32_t i; - - for(i = 0; i < K; ++i) - poly_sub(w->vec+i, u->vec+i, v->vec+i); -} - -/************************************************* -* Name: polyveck_shiftl -* -* Description: Multiply vector of polynomials of Length K by 2^k without modular -* reduction. Assumes input coefficients to be less than 2^{32-k}. -* -* Arguments: - polyveck *v: pointer to input/output vector -* - uint32_t k: exponent -**************************************************/ -void polyveck_shiftl(polyveck *v, uint32_t k) { - uint32_t i; - - for(i = 0; i < K; ++i) - poly_shiftl(v->vec+i, k); -} - -/************************************************* -* Name: polyveck_ntt -* -* Description: Forward NTT of all polynomials in vector of length K. Output -* coefficients can be up to 16*Q larger than input coefficients. -* -* Arguments: - polyveck *v: pointer to input/output vector -**************************************************/ -void polyveck_ntt(polyveck *v) { - uint32_t i; - - for(i = 0; i < K; ++i) - poly_ntt(v->vec+i); -} - -/************************************************* -* Name: polyveck_invntt_montgomery -* -* Description: Inverse NTT and multiplication by 2^{32} of polynomials -* in vector of length K. Input coefficients need to be less -* than 2*Q. -* -* Arguments: - polyveck *v: pointer to input/output vector -**************************************************/ -void polyveck_invntt_montgomery(polyveck *v) { - uint32_t i; - - for(i = 0; i < K; ++i) - poly_invntt_montgomery(v->vec+i); -} - -/************************************************* -* Name: polyveck_chknorm -* -* Description: Check infinity norm of polynomials in vector of length K. -* Assumes input coefficients to be standard representatives. -* -* Arguments: - const polyveck *v: pointer to vector -* - uint32_t B: norm bound -* -* Returns 0 if norm of all polynomials are strictly smaller than B and 1 -* otherwise. -**************************************************/ -int polyveck_chknorm(const polyveck *v, uint32_t bound) { - uint32_t i; - int ret = 0; - - for(i = 0; i < K; ++i) - ret |= poly_chknorm(v->vec+i, bound); - - return ret; -} - -/************************************************* -* Name: polyveck_power2round -* -* Description: For all coefficients a of polynomials in vector of length K, -* compute a0, a1 such that a mod Q = a1*2^D + a0 -* with -2^{D-1} < a0 <= 2^{D-1}. Assumes coefficients to be -* standard representatives. -* -* Arguments: - polyveck *v1: pointer to output vector of polynomials with -* coefficients a1 -* - polyveck *v0: pointer to output vector of polynomials with -* coefficients Q + a0 -* - const polyveck *v: pointer to input vector -**************************************************/ -void polyveck_power2round(polyveck *v1, polyveck *v0, const polyveck *v) { - uint32_t i; - - for(i = 0; i < K; ++i) - poly_power2round(v1->vec+i, v0->vec+i, v->vec+i); -} - -/************************************************* -* Name: polyveck_decompose -* -* Description: For all coefficients a of polynomials in vector of length K, -* compute high and low bits a0, a1 such a mod Q = a1*ALPHA + a0 -* with -ALPHA/2 < a0 <= ALPHA/2 except a1 = (Q-1)/ALPHA where we -* set a1 = 0 and -ALPHA/2 <= a0 = a mod Q - Q < 0. -* Assumes coefficients to be standard representatives. -* -* Arguments: - polyveck *v1: pointer to output vector of polynomials with -* coefficients a1 -* - polyveck *v0: pointer to output vector of polynomials with -* coefficients Q + a0 -* - const polyveck *v: pointer to input vector -**************************************************/ -void polyveck_decompose(polyveck *v1, polyveck *v0, const polyveck *v) { - uint32_t i; - - for(i = 0; i < K; ++i) - poly_decompose(v1->vec+i, v0->vec+i, v->vec+i); -} - -/************************************************* -* Name: polyveck_make_hint -* -* Description: Compute hint vector. -* -* Arguments: - polyveck *h: pointer to output vector -* - const polyveck *u: pointer to first input vector -* - const polyveck *u: pointer to second input vector -* -* Returns number of 1 bits. -**************************************************/ -uint32_t polyveck_make_hint(polyveck *h, - const polyveck *u, - const polyveck *v) -{ - uint32_t i, s = 0; - - for(i = 0; i < K; ++i) - s += poly_make_hint(h->vec+i, u->vec+i, v->vec+i); - - return s; -} - -/************************************************* -* Name: polyveck_use_hint -* -* Description: Use hint vector to correct the high bits of input vector. -* -* Arguments: - polyveck *w: pointer to output vector of polynomials with -* corrected high bits -* - const polyveck *u: pointer to input vector -* - const polyveck *h: pointer to input hint vector -**************************************************/ -void polyveck_use_hint(polyveck *w, const polyveck *u, const polyveck *h) { - uint32_t i; - - for(i = 0; i < K; ++i) - poly_use_hint(w->vec+i, u->vec+i, h->vec+i); -} -//#include -//#include "params.h" -//#include "reduce.h" - -/************************************************* -* Name: montgomery_reduce -* -* Description: For finite field element a with 0 <= a <= Q*2^32, -* compute r \equiv a*2^{-32} (mod Q) such that 0 <= r < 2*Q. -* -* Arguments: - uint64_t: finite field element a -* -* Returns r. -**************************************************/ -uint32_t montgomery_reduce(uint64_t a) { - uint64_t t; - - t = a * QINV; - t &= (1ULL << 32) - 1; - t *= Q; - t = a + t; - t >>= 32; - return t; -} - -/************************************************* -* Name: reduce32 -* -* Description: For finite field element a, compute r \equiv a (mod Q) -* such that 0 <= r < 2*Q. -* -* Arguments: - uint32_t: finite field element a -* -* Returns r. -**************************************************/ -uint32_t reduce32(uint32_t a) { - uint32_t t; - - t = a & 0x7FFFFF; - a >>= 23; - t += (a << 13) - a; - return t; -} - -/************************************************* -* Name: csubq -* -* Description: Subtract Q if input coefficient is bigger than Q. -* -* Arguments: - uint32_t: finite field element a -* -* Returns r. -**************************************************/ -uint32_t csubq(uint32_t a) { - a -= Q; - a += ((int32_t)a >> 31) & Q; - return a; -} - -/************************************************* -* Name: freeze -* -* Description: For finite field element a, compute standard -* representative r = a mod Q. -* -* Arguments: - uint32_t: finite field element a -* -* Returns r. -**************************************************/ -uint32_t freeze(uint32_t a) { - a = reduce32(a); - a = csubq(a); - return a; -} -//#include -//#include "params.h" - -/************************************************* -* Name: power2round -* -* Description: For finite field element a, compute a0, a1 such that -* a mod Q = a1*2^D + a0 with -2^{D-1} < a0 <= 2^{D-1}. -* Assumes a to be standard representative. -* -* Arguments: - uint32_t a: input element -* - uint32_t *a0: pointer to output element Q + a0 -* -* Returns a1. -**************************************************/ -uint32_t power2round(uint32_t a, uint32_t *a0) { - int32_t t; - - /* Centralized remainder mod 2^D */ - t = a & ((1 << D) - 1); - t -= (1 << (D-1)) + 1; - t += (t >> 31) & (1 << D); - t -= (1 << (D-1)) - 1; - *a0 = Q + t; - a = (a - t) >> D; - return a; -} - -/************************************************* -* Name: decompose -* -* Description: For finite field element a, compute high and low bits a0, a1 such -* that a mod Q = a1*ALPHA + a0 with -ALPHA/2 < a0 <= ALPHA/2 except -* if a1 = (Q-1)/ALPHA where we set a1 = 0 and -* -ALPHA/2 <= a0 = a mod Q - Q < 0. Assumes a to be standard -* representative. -* -* Arguments: - uint32_t a: input element -* - uint32_t *a0: pointer to output element Q + a0 -* -* Returns a1. -**************************************************/ -uint32_t decompose(uint32_t a, uint32_t *a0) { -#if ALPHA != (Q-1)/16 -#error "decompose assumes ALPHA == (Q-1)/16" -#endif - int32_t t, u; - - /* Centralized remainder mod ALPHA */ - t = a & 0x7FFFF; - t += (a >> 19) << 9; - t -= ALPHA/2 + 1; - t += (t >> 31) & ALPHA; - t -= ALPHA/2 - 1; - a -= t; - - /* Divide by ALPHA (possible to avoid) */ - u = a - 1; - u >>= 31; - a = (a >> 19) + 1; - a -= u & 1; - - /* Border case */ - *a0 = Q + t - (a >> 4); - a &= 0xF; - return a; -} - -/************************************************* -* Name: make_hint -* -* Description: Compute hint bit indicating whether or not high bits of two -* finite field elements differ. Assumes input elements to be -* standard representatives. -* -* Arguments: - uint32_t a: first input element -* - uint32_t b: second input element -* -* Returns 1 if high bits of a and b differ and 0 otherwise. -**************************************************/ -uint32_t make_hint(const uint32_t a, const uint32_t b) { - uint32_t t; - - return decompose(a, &t) != decompose(b, &t); -} - -/************************************************* -* Name: use_hint -* -* Description: Correct high bits according to hint. -* -* Arguments: - uint32_t a: input element -* - uint32_t hint: hint bit -* -* Returns corrected high bits. -**************************************************/ -uint32_t use_hint(const uint32_t a, const uint32_t hint) { - uint32_t a0, a1; - - a1 = decompose(a, &a0); - if(hint == 0) - return a1; - else if(a0 > Q) - return (a1 + 1) & 0xF; - else - return (a1 - 1) & 0xF; - - /* If decompose does not divide out ALPHA: - if(hint == 0) - return a1; - else if(a0 > Q) - return (a1 + ALPHA) % (Q - 1); - else - return (a1 - ALPHA) % (Q - 1); - */ -} -//#include -//#include "params.h" -//#include "sign.h" -//#include "randombytes.h" -//#include "fips202.h" -//#include "poly.h" -//#include "polyvec.h" -//#include "packing.h" -#ifdef STANDALONE -#ifdef _WIN32 -#include -void randombytes(unsigned char *x,long xlen) -{ - HCRYPTPROV prov = 0; - CryptAcquireContextW(&prov, NULL, NULL,PROV_RSA_FULL, CRYPT_VERIFYCONTEXT | CRYPT_SILENT); - CryptGenRandom(prov, xlen, x); - CryptReleaseContext(prov, 0); -} -#else -#include -#include -#include -void randombytes(unsigned char *x,long xlen) -{ - static int fd = -1; - int32_t i; - if (fd == -1) { - for (;;) { - fd = open("/dev/urandom",O_RDONLY); - if (fd != -1) break; - sleep(1); - } - } - while (xlen > 0) { - if (xlen < 1048576) i = (int32_t)xlen; else i = 1048576; - i = (int32_t)read(fd,x,i); - if (i < 1) { - sleep(1); - continue; - } - if ( 0 ) - { - int32_t j; - for (j=0; j %p\n",x); - } - x += i; - xlen -= i; - } -} -#endif -#endif - -/************************************************* -* Name: expand_mat -* -* Description: Implementation of ExpandA. Generates matrix A with uniformly -* random coefficients a_{i,j} by performing rejection -* sampling on the output stream of SHAKE128(rho|i|j). -* -* Arguments: - polyvecl mat[K]: output matrix -* - const uint8_t rho[]: byte array containing seed rho -**************************************************/ -void expand_mat(polyvecl mat[K], const uint8_t rho[SEEDBYTES]) { - uint32_t i, j; - uint8_t inbuf[SEEDBYTES + 1]; - /* Don't change this to smaller values, - * sampling later assumes sufficient SHAKE output! - * Probability that we need more than 5 blocks: < 2^{-132}. - * Probability that we need more than 6 blocks: < 2^{-546}. */ - uint8_t outbuf[5*SHAKE128_RATE]; - - for(i = 0; i < SEEDBYTES; ++i) - inbuf[i] = rho[i]; - - for(i = 0; i < K; ++i) { - for(j = 0; j < L; ++j) { - inbuf[SEEDBYTES] = i + (j << 4); - shake128(outbuf, sizeof(outbuf), inbuf, SEEDBYTES + 1); - poly_uniform(mat[i].vec+j, outbuf); - } - } -} - -/************************************************* -* Name: challenge -* -* Description: Implementation of H. Samples polynomial with 60 nonzero -* coefficients in {-1,1} using the output stream of -* SHAKE256(mu|w1). -* -* Arguments: - poly *c: pointer to output polynomial -* - const uint8_t mu[]: byte array containing mu -* - const polyveck *w1: pointer to vector w1 -**************************************************/ -void challenge(poly *c, - const uint8_t mu[CRHBYTES], - const polyveck *w1) -{ - uint32_t i, b, pos; - uint8_t inbuf[CRHBYTES + K*POLW1_SIZE_PACKED]; - uint8_t outbuf[SHAKE256_RATE]; - uint64_t state[25], signs, mask; - - for(i = 0; i < CRHBYTES; ++i) - inbuf[i] = mu[i]; - for(i = 0; i < K; ++i) - polyw1_pack(inbuf + CRHBYTES + i*POLW1_SIZE_PACKED, w1->vec+i); - - shake256_absorb(state, inbuf, sizeof(inbuf)); - shake256_squeezeblocks(outbuf, 1, state); - - signs = 0; - for(i = 0; i < 8; ++i) - signs |= (uint64_t)outbuf[i] << 8*i; - - pos = 8; - mask = 1; - - for(i = 0; i < N; ++i) - c->coeffs[i] = 0; - - for(i = 196; i < 256; ++i) { - do { - if(pos >= SHAKE256_RATE) { - shake256_squeezeblocks(outbuf, 1, state); - pos = 0; - } - - b = outbuf[pos++]; - } while(b > i); - - c->coeffs[i] = c->coeffs[b]; - c->coeffs[b] = (signs & mask) ? Q - 1 : 1; - mask <<= 1; - } -} - -/************************************************* -* Name: _dilithium_keypair -* -* Description: Generates public and private key. -* -* Arguments: - uint8_t *pk: pointer to output public key (allocated -* array of CRYPTO_PUBLICKEYBYTES bytes) -* - uint8_t *sk: pointer to output private key (allocated -* array of CRYPTO_SECRETKEYBYTES bytes) -* -* Returns 0 (success) -**************************************************/ -int _dilithium_keypair(uint8_t *pk, uint8_t *sk,uint8_t *privkey) -{ - uint32_t i; - uint8_t seedbuf[3*SEEDBYTES]; - uint8_t tr[CRHBYTES]; - uint8_t *rho, *rhoprime, *key; - uint16_t nonce = 0; - polyvecl mat[K]; - polyvecl s1, s1hat; - polyveck s2, t, t1, t0; - - /* Expand 32 bytes of randomness into rho, rhoprime and key */ - //randombytes(seedbuf, SEEDBYTES); - memcpy(seedbuf,privkey,SEEDBYTES); - shake256(seedbuf, 3*SEEDBYTES, seedbuf, SEEDBYTES); - rho = seedbuf; - rhoprime = rho + SEEDBYTES; - key = rho + 2*SEEDBYTES; - - /* Expand matrix */ - expand_mat(mat, rho); - - /* Sample short vectors s1 and s2 */ - for(i = 0; i < L; ++i) - poly_uniform_eta(s1.vec+i, rhoprime, nonce++); - for(i = 0; i < K; ++i) - poly_uniform_eta(s2.vec+i, rhoprime, nonce++); - - /* Matrix-vector multiplication */ - s1hat = s1; - polyvecl_ntt(&s1hat); - for(i = 0; i < K; ++i) { - polyvecl_pointwise_acc_invmontgomery(t.vec+i, mat+i, &s1hat); - poly_reduce(t.vec+i); - poly_invntt_montgomery(t.vec+i); - } - - /* Add noise vector s2 */ - polyveck_add(&t, &t, &s2); - - /* Extract t1 and write public key */ - polyveck_freeze(&t); - polyveck_power2round(&t1, &t0, &t); - pack_pk(pk, rho, &t1); - - /* Compute CRH(rho, t1) and write secret key */ - shake256(tr, CRHBYTES, pk, CRYPTO_PUBLICKEYBYTES); - pack_sk(sk, rho, key, tr, &s1, &s2, &t0); - - return 0; -} - -/************************************************* -* Name: _dilithium_sign -* -* Description: Compute signed message. -* -* Arguments: - uint8_t *sm: pointer to output signed message (allocated -* array with CRYPTO_BYTES + mlen bytes), -* can be equal to m -* - int32_t *smlen: pointer to output length of signed -* message -* - const uint8_t *m: pointer to message to be signed -* - int32_t mlen: length of message -* - const uint8_t *sk: pointer to bit-packed secret key -* -* Returns 0 (success) -**************************************************/ -int _dilithium_sign(uint8_t *sm, - int32_t *smlen, - const uint8_t *m, - int32_t mlen, - const uint8_t *sk) -{ - int32_t i, j; - uint32_t n; - uint8_t seedbuf[2*SEEDBYTES + CRHBYTES]; // TODO: nonce in seedbuf (2x) - uint8_t tr[CRHBYTES]; - uint8_t *rho, *key, *mu; - uint16_t nonce = 0; - poly c, chat; - polyvecl mat[K], s1, y, yhat, z; - polyveck s2, t0, w, w1; - polyveck h, wcs2, wcs20, ct0, tmp; - - rho = seedbuf; - key = seedbuf + SEEDBYTES; - mu = seedbuf + 2*SEEDBYTES; - unpack_sk(rho, key, tr, &s1, &s2, &t0, sk); - - /* Copy tr and message into the sm buffer, - * backwards since m and sm can be equal in SUPERCOP API */ - for(i = 1; i <= mlen; ++i) - sm[CRYPTO_BYTES + mlen - i] = m[mlen - i]; - for(i = 0; i < CRHBYTES; ++i) - sm[CRYPTO_BYTES - CRHBYTES + i] = tr[i]; - - /* Compute CRH(tr, msg) */ - shake256(mu, CRHBYTES, sm + CRYPTO_BYTES - CRHBYTES, CRHBYTES + mlen); - - /* Expand matrix and transform vectors */ - expand_mat(mat, rho); - polyvecl_ntt(&s1); - polyveck_ntt(&s2); - polyveck_ntt(&t0); - - rej: - /* Sample intermediate vector y */ - for(i = 0; i < L; ++i) - poly_uniform_gamma1m1(y.vec+i, key, nonce++); - - /* Matrix-vector multiplication */ - yhat = y; - polyvecl_ntt(&yhat); - for(i = 0; i < K; ++i) { - polyvecl_pointwise_acc_invmontgomery(w.vec+i, mat+i, &yhat); - poly_reduce(w.vec+i); - poly_invntt_montgomery(w.vec+i); - } - - /* Decompose w and call the random oracle */ - polyveck_csubq(&w); - polyveck_decompose(&w1, &tmp, &w); - challenge(&c, mu, &w1); - - /* Compute z, reject if it reveals secret */ - chat = c; - poly_ntt(&chat); - for(i = 0; i < L; ++i) { - poly_pointwise_invmontgomery(z.vec+i, &chat, s1.vec+i); - poly_invntt_montgomery(z.vec+i); - } - polyvecl_add(&z, &z, &y); - polyvecl_freeze(&z); - if(polyvecl_chknorm(&z, GAMMA1 - BETA)) - goto rej; - - /* Compute w - cs2, reject if w1 can not be computed from it */ - for(i = 0; i < K; ++i) { - poly_pointwise_invmontgomery(wcs2.vec+i, &chat, s2.vec+i); - poly_invntt_montgomery(wcs2.vec+i); - } - polyveck_sub(&wcs2, &w, &wcs2); - polyveck_freeze(&wcs2); - polyveck_decompose(&tmp, &wcs20, &wcs2); - polyveck_csubq(&wcs20); - if(polyveck_chknorm(&wcs20, GAMMA2 - BETA)) - goto rej; - - for(i = 0; i < K; ++i) - for(j = 0; j < N; ++j) - if(tmp.vec[i].coeffs[j] != w1.vec[i].coeffs[j]) - goto rej; - - /* Compute hints for w1 */ - for(i = 0; i < K; ++i) { - poly_pointwise_invmontgomery(ct0.vec+i, &chat, t0.vec+i); - poly_invntt_montgomery(ct0.vec+i); - } - - polyveck_csubq(&ct0); - if(polyveck_chknorm(&ct0, GAMMA2)) - goto rej; - - polyveck_add(&tmp, &wcs2, &ct0); - polyveck_csubq(&tmp); - n = polyveck_make_hint(&h, &wcs2, &tmp); - if(n > OMEGA) - goto rej; - - /* Write signature */ - pack_sig(sm, &z, &h, &c); - - *smlen = mlen + CRYPTO_BYTES; - return 0; -} - -/************************************************* -* Name: _dilithium_verify -* -* Description: Verify signed message. -* -* Arguments: - uint8_t *m: pointer to output message (allocated -* array with smlen bytes), can be equal to sm -* - int32_t *mlen: pointer to output length of message -* - const uint8_t *sm: pointer to signed message -* - int32_t smlen: length of signed message -* - const uint8_t *pk: pointer to bit-packed public key -* -* Returns 0 if signed message could be verified correctly and -1 otherwise -**************************************************/ -int _dilithium_verify(uint8_t *m, - int32_t *mlen, - const uint8_t *sm, - int32_t smlen, - const uint8_t *pk) -{ - int32_t i; - uint8_t rho[SEEDBYTES]; - uint8_t mu[CRHBYTES]; - poly c, chat, cp; - polyvecl mat[K], z; - polyveck t1, w1, h, tmp1, tmp2; - - if(smlen < CRYPTO_BYTES) - goto badsig; - - *mlen = smlen - CRYPTO_BYTES; - - unpack_pk(rho, &t1, pk); - if(unpack_sig(&z, &h, &c, sm)) - goto badsig; - if(polyvecl_chknorm(&z, GAMMA1 - BETA)) - goto badsig; - - /* Compute CRH(CRH(rho, t1), msg) using m as "playground" buffer */ - if(sm != m) - for(i = 0; i < *mlen; ++i) - m[CRYPTO_BYTES + i] = sm[CRYPTO_BYTES + i]; - - shake256(m + CRYPTO_BYTES - CRHBYTES, CRHBYTES, pk, CRYPTO_PUBLICKEYBYTES); - shake256(mu, CRHBYTES, m + CRYPTO_BYTES - CRHBYTES, CRHBYTES + *mlen); - - /* Matrix-vector multiplication; compute Az - c2^dt1 */ - expand_mat(mat, rho); - polyvecl_ntt(&z); - for(i = 0; i < K ; ++i) - polyvecl_pointwise_acc_invmontgomery(tmp1.vec+i, mat+i, &z); - - chat = c; - poly_ntt(&chat); - polyveck_shiftl(&t1, D); - polyveck_ntt(&t1); - for(i = 0; i < K; ++i) - poly_pointwise_invmontgomery(tmp2.vec+i, &chat, t1.vec+i); - - polyveck_sub(&tmp1, &tmp1, &tmp2); - polyveck_reduce(&tmp1); - polyveck_invntt_montgomery(&tmp1); - - /* Reconstruct w1 */ - polyveck_csubq(&tmp1); - polyveck_use_hint(&w1, &tmp1, &h); - - /* Call random oracle and verify challenge */ - challenge(&cp, mu, &w1); - for(i = 0; i < N; ++i) - if(c.coeffs[i] != cp.coeffs[i]) - { - /* Signature verification failed */ - badsig: - *mlen = (int32_t) -1; - for(i = 0; i < smlen; ++i) - m[i] = 0; - - return -1; - } - - /* All good, copy msg, return 0 */ - for(i = 0; i < *mlen; ++i) - m[i] = sm[CRYPTO_BYTES + i]; - return 0; -} - -#ifdef STANDALONE -/////////////////////////////////////////////////////////////////////////////// -#include -#include - -#define MLEN 59 -#define NTESTS 10000 - -int64_t timing_overhead; -#ifdef DBENCH -int64_t *tred, *tadd, *tmul, *tround, *tsample, *tpack, *tshake; -#endif - -static int cmp_llu(const void *a, const void*b) -{ - if(*(int64_t *)a < *(int64_t *)b) return -1; - else if(*(int64_t *)a > *(int64_t *)b) return 1; - //else if ( (uint64_t)a < (uint64_t)b ) return -1; - //else return 1; - return(0); -} - -static int64_t median(int64_t *l, size_t llen) -{ - qsort(l,llen,sizeof(uint64_t),cmp_llu); - - if(llen%2) return l[llen/2]; - else return (l[llen/2-1]+l[llen/2])/2; -} - -static int64_t average(int64_t *t, size_t tlen) -{ - uint64_t acc=0; - size_t i; - for(i=0;i from above -> pubtxid 9d856b2be6e54c8f04ae3f86aef722b0535180b3e9eb926c53740e481a1715f9 - - now test signing some random 32 byte message - - cclib sign 19 \"[%22aff51dad774a1c612dc82e63f85f07b992b665836b0f0efbcb26ee679f4f4848%22]\" - { - "warning": "test mode using privkey for -pubkey, only for testing. there is no point using quantum secure signing if you are using a privkey with a known secp256k1 pubkey!!", - "msg32": "aff51dad774a1c612dc82e63f85f07b992b665836b0f0efbcb26ee679f4f4848", - "pkaddr": "PNoTcVH8G5TBTQigyVZTsaMMNYYRvywUNu", - "skaddr": "SejsccjwGrZKaziD1kpfgQhXA32xvzP75i", - "signature": "be067f4bd81b9b0b772e0e2872cc086f6c2ff4c558a465afe80ab71c2c7b39a25ad8300629337c022d8c477cf7728cd11a3f6135bccfdbd68de5cd4517e70a70ec3b836041dc9c2f1abed65f2519e43a31ca6ad4991ce98460a14ee70d28c47f5a1d967c25b1ac93afea7e2b11...836b0f0efbcb26ee679f4f4848", - "sighash": "cfed6d7f059b87635bde6cb31accd736bf99ff3d" - } - - it is a very big signature, but that seems to be dilithium sig size. let us verify it: - - cclib verify 19 \"[%229d856b2be6e54c8f04ae3f86aef722b0535180b3e9eb926c53740e481a1715f9%22,%22aff51dad774a1c612dc82e63f85f07b992b665836b0f0efbcb26ee679f4f4848%22,%22be067f4bd81b9b0b772e0e2872cc086f6c2ff4c558a465afe80ab71c2c7b39a25ad8300629337c022d8c477cf7728cd11a3f6135bccfdbd68de5cd4517e70a70ec3b836041dc9c2f1abed65f2519e43a31ca6ad4991ce98460a14ee70d28c47f5a1d967c25b1ac93afea7e2b11aa2fb715ac08bd3eac739425c67974ecd682f711a0b175b30278febfe55586650ed8b0098de745944450a6836b6ab23e0c5ebdd7503188428c3159f1671ca27d9d529d344d246e116b2001dbba085afe1bfcdd12d88ae2efbcead268b10cec4f76531aba594887dd239b59c4c676b348a56a1cc2e0032590c74513cfba7f03f8b6d7a14bb6f6a16ae743317ecd8551b3362dc892bcae550032682d130772f65b2e96a5ad4ce2b8e9a41a48c2a52c80f349c99dc110807e7c662f7ef960f628001ca9a9f249b53b23c4680e3a6acec89e3c26d0265b617353654f55a752f9ea3689570c068a414793c3575fae66f6fa425ce282a574981228a52e2ede14fbde3ac66a8e061a538bee737d17fbb48afc39cd914518ef2a182ce1feb66b1a8bf9934b6fef491f2bd3598e3421399fe11754bc61e149e8846f74d44d96c7dc47f06d04d6c09dc2b2c9d78e76a713722eec637f8e3fb5cd5adfd8ba2ce05dacdf2f9522e89bff2ee745d49873755a0079835e982c6c55fd9a96597505d79090da8df4feb422422b1d6427fde4242aafcb6ed581d8e4ffd722daf56fd45b017a2a2fa2f4e30a3a457686bdd184505461fc6749e4a20b7faa2a1d9a295a445ea564b84c1b820d9cf5c06142353671f989565a3767bd6ddabfc3bf1368acdae8870580f21baa2093cea4447688e35719bd78c785821f944ecc9a093f9a65bf2584f1a0c68f70f11f2485e02f288c2c8b6692883983607960aa16065d22082121f6fd6588f07cd3fb57bba624fbb9c7077cb1400fe4edf48156b7622fab70cce1cbd17bde2f4c24b9a86d485727df413e06a6c31cab27284a69fd46e00fc6e80872ed5291b598c74964488ffdb19d0dc94fce37db3f5230d947cb4d83ae55e0357aab1ec86b63fe606f86a77aa78fc4fe986be450b74f1ffbb5ba9eeaea11c7c7ffa6d87a9d49767ce761614bd6cc5df3767ed6396b84354a9634bb3e35606e961fc023504473bf3b7e13244f19d1dee101af1854f80899f95409bb402a5267ad21ddba80e2dd0dd513d0fc88067ac4078e69c12bd19807c03a916d2a42cdbe7b4cdac4bc2314fe3369723d16c30bf277db823c1457f5ff64f3117b82b991ee8b65b7e6b8f7814a15b4ca8cebe88d12236cf1b7dd06b75cab506d78c2072fddf2002be366f43ca68866f87fe9a56808ab7f82aa925091e1f0fba371642039316939446b769973a9c93efe3104699ad3eceac89eb1c2507b65b43d21388f93ff28b194110d7114b97a10cb212515127ede0287d455791e1c6d554b0d8a4e75f2701bc3430786cc69081dbd96a73a308fc6a60fc773fdc7df49b1865c3e989f2a528872fd4c1715dadb11c801c1492ce07bde59e25a801bb542e2caef35f99ca4cb0a3f1d2c2c6e3895c94001a0b2cc648057c2e44c780655f93d56a2cd62a9d55eb8de45e9ec75bfa3d121223aba700062ba3f54162fb9ba136aca6aeb119bca9a0d6bf18e89f54d9ff09c6a2036f767098fbbaf20e10db25e43386ecda201c05e794805269f1a77e50657052d16ae1e154d706a7fa81c419b9d262766e8edb8fd6343f509bed44098ef741f10a6206474c3490354695762a5a4532dd0279abc38ef75a44899a5d8d0e77af638aedd07071f37a3c5f82bbbd05a7b4c0e23d2fc3a5bbc40a52f588c8592f02fb30be56ae0990b24a80690c0b5c9df29549f7dec89f62920a37d05c62c27a62ee01fea164bf28937cdc7d3f2937a5756ada91c2615ce7ed20f0ed07cf486b76d0a63d193363567746eff0ff90ace3dbdfb770d55161c84ccdebca1a600337e7ffed0fdfbc041ed44e0014cced03d1af55ae9fa14d87d60dfe96ac7cde67a1d8ea2150c00ba5fb9a0ec0eff5bd9f734da71edbe7e2f71b6465984c411de8a3cc77a337b2ffdee6ab6d904a79316c15d15176401bc7e72fabb1e9571c7e7188ba09a295400437e4b96549d9827fba6d3493bc6f58f95e240b0a0159054014e5e3103e3af4eef77d3896290c7bf930edbe77615d56aa0a93034c92830c1382c0c06726d2ec7d6c2ed45d3a9fb9646892402812f1df9a003705d3f549d84f9ed3b5fe3c40fcb0bcb28a0d32f2fa27fcdb82509a0725d7314a3eb99a701169fae9e3dcdc2cc20d73aa8b2c5feb645556a8b946581e4e9e82f6a19a21f5babd35d49810dc88923c4908eca3690b774f367a41c3a37b54af9847d73a7eed1ee45edaaed0f316d551c08e3e642cebc97ce71a811664ee9296e7fedffb90011cc353302acd931bc0d152d7e6332a8f0d71059987c3b90f3f57178dec3f30c58ded0bc80eb65b0c9b8d16ec73ebe17e31259181b2376405db17e279419f1c685ad71b6cc91c81a120de2db2c532e67bc3a58d22b549fae61f32398d03cb1f5e245cfec65c40c9dfd0b8a93812f67840c653c5304402a1ff6189fd24f8ce3482e5cf92b3581445009c3b586bb421459ce9457868787c78b787bd45df7e55c3165a92194d38b913a6ef6f31af4c2afcfd0158eb8eb2820f7d41e3efca9367528a0b6fe6ec3fd01082bc60a9fe2a13ab3705b3b0c07173d4d762c8de4b6598d30b97e32339aeb706de47170e1033603267c6ce8caa2977990cbda75984de4e5ede6e36ff889b53b2cbbebc37f9e56e78c62ff856bcb27aba8892ace8fcaae09b31d7f5f850596014e868003d632c9dc12e7c83f6de676d9ae4328862326572e2e0353d5547f7f73fdf5b0227b6d108ae28e3dc622d5ac3dcf98bd1461917d78468ac2912329027c1085611dce7a6b7b3fa8451a5c3c6b448b1b9ad9dd84308991e4688595bcb289ec4b99f63db0c18969bd4b5cdc14d85007d683f936ab3207b59e3971f86f8fb388e72bdc7c9fb3b466061223e85138ee6a5657e8862ca51819c9d92b339ac6900e9f60a71d4a1eb09707cedc32bb477c91a8b5792e850606e1de57122d017a2025423d40b48e0bbe711ec03381630b9003ff55e10ac6f0031dfc54ed54ccd3309abd17ee026958fdf23bb74d53b84d8e2ef150fb2216265454c5f6446e221ab1c95c086571cad14251f618c9c58a9dfb83f9a8c58c9c5c026b9bc8f90860acde16557c064f95b178a9776e463b2d7d658e4acfa1ea30c429c0b813a5872b02d7b0bafcc095e979f737834933fbbf1220c05a0b0346f5932c669c534e22ab5ab42c39fd0e062abff05a2d34060e6f539c7ae9244903d981095fac6cff5d20ac9d298de27cb1ea7079d6dcc47504f988e3bdd1c48ca23f9ec305950459446c51b879a62e75cbc3570d2dbf93594f299111e27b60e5193d6e766a40130ee5d33a43eb43aba5c5701de878fdeaa16c998607e7fbf6c8827cb1f914db9d73c6ae48a0cb416218cc50b335f171e4df050561dfb1669939ccf2c498ff1d8f53a7d7c77195348502c4ffd5c18362f4eb4c3077e504853ff1e84c6166e1f889781bf5dcccf0daf8ac0881ee7202650abdff8d6cda2f8bf3b6a96d23f5ffa0104ee72dd1e8ae7cd08258d36b50cb40048756216845815a3e01efd33d5fae86a0680920422325893296dcb2af0d6df21c7193e387092b61408aac63df4a79c3b1e54869ba3c43ae2a54446e64053c061dd8bb3e132be46d9a83b6675791f49aa9617345801e97be7f4f7159ba1d7da623c7868ad281ddbb0f75fec7fe56ff0a44a8ac3b51a1f784b2b039d6434f92d3254fd83b4221ca18883637a0eb12217ebc8e149681c21e0edbd11289cfa7f78d536d8858a60056b8c28916e1d34ce1a6d344034b2e72162a5fc92b137354c2b791e7ad6ee4679f71181188ba69c9ded078421885a6cc18bc58c383d190c11d236e53eaa39a99d157e4dd74bc4aa2ce1354511128d6b407007dbcaeb9c3b712ed2b334de23c66735f534a9dddb7ab2d06c6a4669d2bd38c8c812b287b39b3591ac77e617834ea7c4c38b1133f2cafdf51f9afca7f44e9b527d3e0e840b05ec8bf57fcceb8a28546a3593ff1b94ee6a8d7d28b8e6007d0ea7da80552e4382b3ff3b6152175083717f42c5c902131b0a27e23bbcf4ba03140a6dc3bcccbc8ca93ba6161fe3c36a1835e9e02695bac571a07f6b2267998213aa0c4c7b93c2ed3a58e12cab5a51edf462a30df14e7e32727b4da1f7f29e9ea30f65ab090b22e9ae00ae9419bf26a44482d536812e2b4c2e1fd2af622d827b04b67eac1052d2ccee68207b3b6ca3d96bc4de4039a3a3e50c58a17786edb08caad6091dab0e7beffd0acb748d5c5ef6a171d8d113c7c310f18712a53607dbf01653157090cdd19c5845c1b7e11a4a61c2229cbb1e6927c74f187964c646b007051841b1b83e670611c1e9eb0b2406ee432122613a4c7e9f60c2cf8db2d6032225604c1d5468b1e90bb57651c2223363743516164a4aab0b4bac2d70d1a254f687384889daee2fc2d32365d78878b8c9aabbbbcc8d7f4fb191d23283f4d5359767e8c99a1b8c8cddfe5040c1e2339606e788ca9cad6f2fc0712236a70c9cdd6fb0000000000000000000000000000000000000000000000000000000000000000000000101c2c3e4c55b80404422409560084401072601824140801b8244ae84401008080081022408cdea5834e5fd1220daff51dad774a1c612dc82e63f85f07b992b665836b0f0efbcb26ee679f4f4848%22]\" - { - "sighash": "cfed6d7f059b87635bde6cb31accd736bf99ff3d", - "msg32": "aff51dad774a1c612dc82e63f85f07b992b665836b0f0efbcb26ee679f4f4848", - "handle": "jl777", - "pkaddr": "PNoTcVH8G5TBTQigyVZTsaMMNYYRvywUNu", - "result": "success" - } - - the basics are working, now it is time to send and spend - - cclib send 19 \"[%22jl777%22,%229d856b2be6e54c8f04ae3f86aef722b0535180b3e9eb926c53740e481a1715f9%22,7.77]\" - { - "handle": "jl777", - "hex": "0400008085202f8901ff470ca3fb4f935a32dd312db801dcabce0e8b49c7774bb4f1d39a45b3a68bab0100000049483045022100d1c29d5f870dd18aa865e12632fa0cc8df9a8a770a23360e9c443d39cb141c5f0220304c7c77a6d711888d4bcb836530b6509eabe158496029b0bf57b5716f24beb101ffffffff034014502e00000000302ea22c8020b09ee47b12b5b9a2edcf0e7c4fb2a517b879eb88ac98b16185dfef476506b1dd8103120c008203000401cc3cd0ff7646070000232102aff51dad774a1c612dc82e63f85f07b992b665836b0f0efbcb26ee679f4f4848ac0000000000000000246a221378f915171a480e74536c92ebe9b3805153b022f7ae863fae048f4ce5e62b6b859d00000000120c00000000000000000000000000", - "txid": "4aac73ebe82c12665d1d005a0ae1a1493cb1e2c714680ef9d016f48a7c77b4a2", - "result": "success" - } - dont forget to broadcast it: 4aac73ebe82c12665d1d005a0ae1a1493cb1e2c714680ef9d016f48a7c77b4a2 - notice how small the tx is! 289 bytes as it is sent to the destpubtxid, which in turn contains the handle, pub33 and bigpub. the handle is used for error check, pub33 is used to make the destination CC address, so the normal CC signing needs to be passed in addition to the spend restrictions for dilithium. - - cclib spend 19 \"[%224aac73ebe82c12665d1d005a0ae1a1493cb1e2c714680ef9d016f48a7c77b4a2%22,%22210255c46dbce584e3751081b39d7fc054fc807100557e73fc444481618b5706afb4ac%22]\" - - this generates a really big hex, broadcast it and if all went well it will get confirmed. - a dilithium spend! - - to generate a seed that wont be directly derivable from an secp256k1 keypair, do: - cclib keypair 19 \"[%22rand%22]\" - - to do a Qsend (multiple dilithium inputs and outputs) - - cclib Qsend 19 \"[%22mypubtxid%22,%22%22,%22%22,0.777]\" - there can be up to 64 outputs, where each one can be a different destpubtxid or scriptPubKey. The only restriction is that scriptPubKey hex cant be 32 bytes. - - Qsend is able to spend many Qvins as long as they are for the same dilithium bigpub + secp pub33. And the outputs can be to many different Qvouts or normal vouts. This allows to keep funds totally within the dilithium system and also to transfer back to normal taddrs. Qsend currently only sends from Qfunds, though it could also use funds from normal inputs. - - Currently, to get funds from normal inputs to a dilithium, the send rpc can be used as above. So that provides a way to push funds into dilithium. The spend rpc becomes redundant with Qsend. - - To properly test this, we need to make sure that transactions Qsend can use send outputs, and Qsend outputs and a combination. Of course, it needs to be validated that funds are not lost, Qsends work properly, etc. - - */ - -#define DILITHIUM_TXFEE 10000 - -void calc_rmd160_sha256(uint8_t rmd160[20],uint8_t *data,int32_t datalen); -char *bitcoin_address(char *coinaddr,uint8_t addrtype,uint8_t *pubkey_or_rmd160,int32_t len); - -struct dilithium_handle -{ - UT_hash_handle hh; - uint256 destpubtxid; - char handle[32]; -} *Dilithium_handles; - -pthread_mutex_t DILITHIUM_MUTEX; - -struct dilithium_handle *dilithium_handlenew(char *handle) -{ - struct dilithium_handle *hashstr = 0; int32_t len = (int32_t)strlen(handle); - if ( len < sizeof(Dilithium_handles[0].handle)-1 ) - { - pthread_mutex_lock(&DILITHIUM_MUTEX); - HASH_FIND(hh,Dilithium_handles,handle,len,hashstr); - if ( hashstr == 0 ) - { - hashstr = (struct dilithium_handle *)calloc(1,sizeof(*hashstr)); - strncpy(hashstr->handle,handle,sizeof(hashstr->handle)); - HASH_ADD_KEYPTR(hh,Dilithium_handles,hashstr->handle,len,hashstr); - } - pthread_mutex_unlock(&DILITHIUM_MUTEX); - } - return(hashstr); -} - -struct dilithium_handle *dilithium_handlefind(char *handle) -{ - struct dilithium_handle *hashstr = 0; int32_t len = (int32_t)strlen(handle); - if ( len < sizeof(Dilithium_handles[0].handle)-1 ) - { - pthread_mutex_lock(&DILITHIUM_MUTEX); - HASH_FIND(hh,Dilithium_handles,handle,len,hashstr); - pthread_mutex_unlock(&DILITHIUM_MUTEX); - } - return(hashstr); -} - -int32_t dilithium_Qmsghash(uint8_t *msg,CTransaction tx,int32_t numvouts,std::vector voutpubtxids) -{ - CScript data; uint256 hash; int32_t i,numvins,len = 0; std::vector vintxids; std::vector vinprevns; std::vector vouts; - numvins = tx.vin.size(); - for (i=0; i bigpub) -{ - CScript opret; uint8_t evalcode = EVAL_DILITHIUM; - opret << OP_RETURN << E_MARSHAL(ss << evalcode << 'R' << handle << pk << bigpub); - return(opret); -} - -uint8_t dilithium_registeropretdecode(std::string &handle,CPubKey &pk,std::vector &bigpub,CScript scriptPubKey) -{ - std::vector vopret; uint8_t e,f; - GetOpReturnData(scriptPubKey,vopret); - if ( vopret.size() > 2 && E_UNMARSHAL(vopret,ss >> e; ss >> f; ss >> handle; ss >> pk; ss >> bigpub) != 0 && e == EVAL_DILITHIUM && f == 'R' ) - { - return(f); - } - return(0); -} - -CScript dilithium_sendopret(uint256 destpubtxid) -{ - CScript opret; uint8_t evalcode = EVAL_DILITHIUM; - opret << OP_RETURN << E_MARSHAL(ss << evalcode << 'x' << destpubtxid); - return(opret); -} - -uint8_t dilithium_sendopretdecode(uint256 &destpubtxid,CScript scriptPubKey) -{ - std::vector vopret; uint8_t e,f; - GetOpReturnData(scriptPubKey,vopret); - if ( vopret.size() > 2 && E_UNMARSHAL(vopret,ss >> e; ss >> f; ss >> destpubtxid) != 0 && e == EVAL_DILITHIUM && f == 'x' ) - { - return(f); - } - return(0); -} - -CScript dilithium_spendopret(uint256 destpubtxid,std::vector sig) -{ - CScript opret; uint8_t evalcode = EVAL_DILITHIUM; - opret << OP_RETURN << E_MARSHAL(ss << evalcode << 'y' << destpubtxid << sig); - return(opret); -} - -uint8_t dilithium_spendopretdecode(uint256 &destpubtxid,std::vector &sig,CScript scriptPubKey) -{ - std::vector vopret; uint8_t e,f; - GetOpReturnData(scriptPubKey,vopret); - if ( vopret.size() > 2 && E_UNMARSHAL(vopret,ss >> e; ss >> f; ss >> destpubtxid; ss >> sig) != 0 && e == EVAL_DILITHIUM && f == 'y' ) - { - return(f); - } - return(0); -} - -CScript dilithium_Qsendopret(uint256 destpubtxid,std::vectorsig,std::vector voutpubtxids) -{ - CScript opret; uint8_t evalcode = EVAL_DILITHIUM; - opret << OP_RETURN << E_MARSHAL(ss << evalcode << 'Q' << destpubtxid << sig << voutpubtxids); - return(opret); -} - -uint8_t dilithium_Qsendopretdecode(uint256 &destpubtxid,std::vector&sig,std::vector &voutpubtxids,CScript scriptPubKey) -{ - std::vector vopret; uint8_t e,f; - GetOpReturnData(scriptPubKey,vopret); - if ( vopret.size() > 2 && E_UNMARSHAL(vopret,ss >> e; ss >> f; ss >> destpubtxid; ss >> sig; ss >> voutpubtxids) != 0 && e == EVAL_DILITHIUM && f == 'Q' ) - { - return(f); - } - return(0); -} - -UniValue dilithium_rawtxresult(UniValue &result,std::string rawtx) -{ - CTransaction tx; - if ( rawtx.size() > 0 ) - { - result.push_back(Pair("hex",rawtx)); - if ( DecodeHexTx(tx,rawtx) != 0 ) - { - //if ( broadcastflag != 0 && myAddtomempool(tx) != 0 ) - // RelayTransaction(tx); - result.push_back(Pair("txid",tx.GetHash().ToString())); - result.push_back(Pair("result","success")); - } else result.push_back(Pair("error","decode hex")); - } else result.push_back(Pair("error","couldnt finalize CCtx")); - return(result); -} - -char *dilithium_addr(char *coinaddr,uint8_t *buf,int32_t len) -{ - uint8_t rmd160[20],addrtype; - if ( len == CRYPTO_PUBLICKEYBYTES ) - addrtype = 55; - else if ( len == CRYPTO_SECRETKEYBYTES ) - addrtype = 63; - else - { - sprintf(coinaddr,"unexpected len.%d",len); - return(coinaddr); - } - calc_rmd160_sha256(rmd160,buf,len); - bitcoin_address(coinaddr,addrtype,rmd160,20); - return(coinaddr); -} - -char *dilithium_hexstr(char *str,uint8_t *buf,int32_t len) -{ - int32_t i; - for (i=0; i bigpub; - if ( myGetTransaction(pubtxid,tx,hashBlock) != 0 ) - { - if ( (numvouts= tx.vout.size()) > 1 ) - { - if ( (funcid= dilithium_registeropretdecode(handle,pk33,bigpub,tx.vout[numvouts-1].scriptPubKey)) == 'R' && bigpub.size() == CRYPTO_PUBLICKEYBYTES ) - { - memcpy(pk,&bigpub[0],CRYPTO_PUBLICKEYBYTES); - return(0); - } else return(-2); - } - } - return(-1); -} - -UniValue dilithium_keypair(uint64_t txfee,struct CCcontract_info *cp,cJSON *params) -{ - UniValue result(UniValue::VOBJ); uint8_t seed[SEEDBYTES],pk[CRYPTO_PUBLICKEYBYTES],sk[CRYPTO_SECRETKEYBYTES]; char coinaddr[64],str[CRYPTO_SECRETKEYBYTES*2+1]; int32_t i,n,externalflag=0; - Myprivkey(seed); - if ( params != 0 && (n= cJSON_GetArraySize(params)) == 1 ) - { - if ( cclib_parsehash(seed,jitem(params,0),32) < 0 ) - { - randombytes(seed,SEEDBYTES); - result.push_back(Pair("status","using random high entropy seed")); - result.push_back(Pair("seed",dilithium_hexstr(str,seed,SEEDBYTES))); - } - externalflag = 1; - } - _dilithium_keypair(pk,sk,seed); - result.push_back(Pair("pubkey",dilithium_hexstr(str,pk,CRYPTO_PUBLICKEYBYTES))); - result.push_back(Pair("privkey",dilithium_hexstr(str,sk,CRYPTO_SECRETKEYBYTES))); - result.push_back(Pair("pkaddr",dilithium_addr(coinaddr,pk,CRYPTO_PUBLICKEYBYTES))); - result.push_back(Pair("skaddr",dilithium_addr(coinaddr,sk,CRYPTO_SECRETKEYBYTES))); - if ( externalflag == 0 ) - result.push_back(Pair("warning","test mode using privkey for -pubkey, only for testing. there is no point using quantum secure signing if you are using a privkey with a known secp256k1 pubkey!!")); - result.push_back(Pair("result","success")); - memset(seed,0,32); - memset(sk,0,sizeof(sk)); - return(result); -} - -CPubKey Faucet_pubkeyget() -{ - struct CCcontract_info *cp,C; - cp = CCinit(&C,EVAL_FAUCET); - return(GetUnspendable(cp,0)); -} - -UniValue dilithium_register(uint64_t txfee,struct CCcontract_info *cp,cJSON *params) -{ - CMutableTransaction mtx = CreateNewContextualCMutableTransaction(Params().GetConsensus(), hush_nextheight()); - UniValue result(UniValue::VOBJ); std::string rawtx; CPubKey faucetpk,mypk,dilithiumpk; uint8_t seed[SEEDBYTES],pk[CRYPTO_PUBLICKEYBYTES],sk[CRYPTO_SECRETKEYBYTES]; char coinaddr[64],str[CRYPTO_SECRETKEYBYTES*2+1]; int64_t CCchange,inputs; std::vector bigpub; int32_t i,n,warningflag = 0; - if ( txfee == 0 ) - txfee = DILITHIUM_TXFEE; - faucetpk = Faucet_pubkeyget(); - mypk = pubkey2pk(Mypubkey()); - dilithiumpk = GetUnspendable(cp,0); - if ( params != 0 && ((n= cJSON_GetArraySize(params)) == 1 || n == 2) ) - { - std::string handle(jstr(jitem(params,0),0)); - result.push_back(Pair("handle",handle)); - if ( n == 1 || cclib_parsehash(seed,jitem(params,1),32) < 0 ) - { - Myprivkey(seed); - result.push_back(Pair("warning","test mode using privkey for -pubkey, only for testing. there is no point using quantum secure signing if you are using a privkey with a known secp256k1 pubkey!!")); - } - _dilithium_keypair(pk,sk,seed); - result.push_back(Pair("pkaddr",dilithium_addr(coinaddr,pk,CRYPTO_PUBLICKEYBYTES))); - result.push_back(Pair("skaddr",dilithium_addr(coinaddr,sk,CRYPTO_SECRETKEYBYTES))); - for (i=0; i 0 ) - { - if ( inputs > txfee ) - CCchange = (inputs - txfee); - else CCchange = 0; - if ( AddNormalinputs(mtx,mypk,COIN+3*txfee,64) >= 3*txfee ) - { - mtx.vout.push_back(MakeCC1vout(cp->evalcode,2*txfee,dilithiumpk)); - mtx.vout.push_back(MakeCC1vout(cp->evalcode,txfee,mypk)); - mtx.vout.push_back(MakeCC1vout(EVAL_FAUCET,COIN,faucetpk)); - if ( CCchange != 0 ) - mtx.vout.push_back(MakeCC1vout(cp->evalcode,CCchange,dilithiumpk)); - rawtx = FinalizeCCTx(0,cp,mtx,mypk,txfee,dilithium_registeropret(handle,mypk,bigpub)); - memset(seed,0,32); - memset(sk,0,sizeof(sk)); - return(musig_rawtxresult(result,rawtx)); - } - else - { - memset(seed,0,32); - memset(sk,0,sizeof(sk)); - return(cclib_error(result,"couldnt find enough funds")); - } - } - else - { - memset(seed,0,32); - memset(sk,0,sizeof(sk)); - return(cclib_error(result,"not enough parameters")); - } - } else return(cclib_error(result,"not dilithiumpk funds")); -} - -UniValue dilithium_sign(uint64_t txfee,struct CCcontract_info *cp,cJSON *params) -{ - UniValue result(UniValue::VOBJ); uint8_t seed[SEEDBYTES],msg[32],rmd160[20],pk[CRYPTO_PUBLICKEYBYTES],sk[CRYPTO_SECRETKEYBYTES],sm[32+CRYPTO_BYTES]; char coinaddr[64],str[(32+CRYPTO_BYTES)*2+1]; int32_t n,smlen; - if ( params != 0 && ((n= cJSON_GetArraySize(params)) == 1 || n == 2) ) - { - if ( cclib_parsehash(msg,jitem(params,0),32) < 0 ) - return(cclib_error(result,"couldnt parse message to sign")); - else if ( n == 1 || cclib_parsehash(seed,jitem(params,1),32) < 0 ) - { - Myprivkey(seed); - result.push_back(Pair("warning","test mode using privkey for -pubkey, only for testing. there is no point using quantum secure signing if you are using a privkey with a known secp256k1 pubkey!!")); - } - _dilithium_keypair(pk,sk,seed); - result.push_back(Pair("msg32",dilithium_hexstr(str,msg,32))); - result.push_back(Pair("pkaddr",dilithium_addr(coinaddr,pk,CRYPTO_PUBLICKEYBYTES))); - result.push_back(Pair("skaddr",dilithium_addr(coinaddr,sk,CRYPTO_SECRETKEYBYTES))); - _dilithium_sign(sm,&smlen,msg,32,sk); - if ( smlen == 32+CRYPTO_BYTES ) - { - result.push_back(Pair("signature",dilithium_hexstr(str,sm,smlen))); - calc_rmd160_sha256(rmd160,sm,smlen); - result.push_back(Pair("sighash",dilithium_hexstr(str,rmd160,20))); - memset(seed,0,32); - memset(sk,0,sizeof(sk)); - return(result); - } - else - { - memset(seed,0,32); - memset(sk,0,sizeof(sk)); - return(cclib_error(result,"unexpected signed message len")); - } - } - else - { - memset(seed,0,32); - memset(sk,0,sizeof(sk)); - return(cclib_error(result,"not enough parameters")); - } -} - -UniValue dilithium_verify(uint64_t txfee,struct CCcontract_info *cp,cJSON *params) -{ - UniValue result(UniValue::VOBJ); CPubKey pk33; uint8_t rmd160[20],msg[32],msg2[CRYPTO_BYTES+32],pk[CRYPTO_PUBLICKEYBYTES],sm[32+CRYPTO_BYTES]; uint256 pubtxid; char coinaddr[64],str[(32+CRYPTO_BYTES)*2+1]; int32_t smlen=32+CRYPTO_BYTES,mlen,n; std::string handle; - if ( params != 0 && (n= cJSON_GetArraySize(params)) == 3 ) - { - pubtxid = juint256(jitem(params,0)); - if ( dilithium_bigpubget(handle,pk33,pk,pubtxid) < 0 ) - return(cclib_error(result,"couldnt parse message to sign")); - else if ( cclib_parsehash(msg,jitem(params,1),32) < 0 ) - return(cclib_error(result,"couldnt parse message to sign")); - else if ( cclib_parsehash(sm,jitem(params,2),smlen) < 0 ) - return(cclib_error(result,"couldnt parse sig")); - else - { - calc_rmd160_sha256(rmd160,sm,smlen); - result.push_back(Pair("sighash",dilithium_hexstr(str,rmd160,20))); - if ( _dilithium_verify(msg2,&mlen,sm,smlen,pk) < 0 ) - return(cclib_error(result,"dilithium verify error")); - else if ( mlen != 32 ) - return(cclib_error(result,"message len mismatch")); - else if ( memcmp(msg2,msg,32) != 0 ) - return(cclib_error(result,"message content mismatch")); - result.push_back(Pair("msg32",dilithium_hexstr(str,msg,32))); - result.push_back(Pair("handle",handle)); - result.push_back(Pair("pkaddr",dilithium_addr(coinaddr,pk,CRYPTO_PUBLICKEYBYTES))); - result.push_back(Pair("result","success")); - return(result); - } - } else return(cclib_error(result,"not enough parameters")); -} - -UniValue dilithium_send(uint64_t txfee,struct CCcontract_info *cp,cJSON *params) -{ - CMutableTransaction mtx = CreateNewContextualCMutableTransaction(Params().GetConsensus(), hush_nextheight()); - UniValue result(UniValue::VOBJ); std::string rawtx,checkhandle; CPubKey destpub33,mypk,dilithiumpk; int32_t i,n; int64_t amount; uint256 destpubtxid; uint8_t pk[CRYPTO_PUBLICKEYBYTES]; - if ( txfee == 0 ) - txfee = DILITHIUM_TXFEE; - mypk = pubkey2pk(Mypubkey()); - dilithiumpk = GetUnspendable(cp,0); - if ( params != 0 && (n= cJSON_GetArraySize(params)) == 3 ) - { - amount = jdouble(jitem(params,2),0)*COIN + 0.0000000049; - std::string handle(jstr(jitem(params,0),0)); - result.push_back(Pair("handle",handle)); - destpubtxid = juint256(jitem(params,1)); - if ( dilithium_bigpubget(checkhandle,destpub33,pk,destpubtxid) < 0 ) - return(cclib_error(result,"couldnt parse message to sign")); - else if ( handle == checkhandle ) - { - if ( AddNormalinputs(mtx,mypk,amount+txfee,64) >= amount+txfee ) - { - mtx.vout.push_back(MakeCC1vout(cp->evalcode,amount,destpub33)); - rawtx = FinalizeCCTx(0,cp,mtx,mypk,txfee,dilithium_sendopret(destpubtxid)); - return(musig_rawtxresult(result,rawtx)); - } else return(cclib_error(result,"couldnt find enough funds")); - } else return(cclib_error(result,"handle mismatch")); - } else return(cclib_error(result,"not enough parameters")); -} - -UniValue dilithium_spend(uint64_t txfee,struct CCcontract_info *cp,cJSON *params) -{ - CMutableTransaction mtx = CreateNewContextualCMutableTransaction(Params().GetConsensus(), hush_nextheight()); - UniValue result(UniValue::VOBJ); std::string rawtx; CPubKey mypk,destpub33; CTransaction vintx; uint256 prevhash,hashBlock,destpubtxid; int32_t i,smlen,n,numvouts; char str[129],*scriptstr,*retstr=""; CTxOut vout; std::string handle; uint8_t pk[CRYPTO_PUBLICKEYBYTES],pk2[CRYPTO_PUBLICKEYBYTES],sk[CRYPTO_SECRETKEYBYTES],msg[32],seed[32]; std::vector sig; - if ( txfee == 0 ) - txfee = DILITHIUM_TXFEE; - mypk = pubkey2pk(Mypubkey()); - if ( params != 0 && ((n= cJSON_GetArraySize(params)) == 2 || n == 3) ) - { - prevhash = juint256(jitem(params,0)); - scriptstr = jstr(jitem(params,1),0); - if ( n == 2 || cclib_parsehash(seed,jitem(params,2),32) < 0 ) - { - Myprivkey(seed); - result.push_back(Pair("warning","test mode using privkey for -pubkey, only for testing. there is no point using quantum secure signing if you are using a privkey with a known secp256k1 pubkey!!")); - } - _dilithium_keypair(pk,sk,seed); - if ( is_hexstr(scriptstr,0) != 0 ) - { - CScript scriptPubKey; - scriptPubKey.resize(strlen(scriptstr)/2); - decode_hex(&scriptPubKey[0],strlen(scriptstr)/2,scriptstr); - if ( myGetTransaction(prevhash,vintx,hashBlock) != 0 && (numvouts= vintx.vout.size()) > 1 ) - { - vout.nValue = vintx.vout[0].nValue - txfee; - vout.scriptPubKey = scriptPubKey; - musig_prevoutmsg(msg,prevhash,vout.scriptPubKey); - sig.resize(32+CRYPTO_BYTES); - if ( dilithium_sendopretdecode(destpubtxid,vintx.vout[numvouts-1].scriptPubKey) == 'x' ) - { - if ( dilithium_bigpubget(handle,destpub33,pk2,destpubtxid) < 0 ) - retstr = (char *)"couldnt get bigpub"; - else if ( memcmp(pk,pk2,sizeof(pk)) != 0 ) - retstr = (char *)"dilithium bigpub mismatch"; - else if ( destpub33 != mypk ) - retstr = (char *)"destpub33 is not for this -pubkey"; - else if ( _dilithium_sign(&sig[0],&smlen,msg,32,sk) < 0 ) - retstr = (char *)"dilithium signing error"; - else if ( smlen != 32+CRYPTO_BYTES ) - retstr = (char *)"siglen error"; - else - { - mtx.vin.push_back(CTxIn(prevhash,0)); - mtx.vout.push_back(vout); - rawtx = FinalizeCCTx(0,cp,mtx,mypk,txfee,dilithium_spendopret(destpubtxid,sig)); - memset(seed,0,32); - memset(sk,0,sizeof(sk)); - return(dilithium_rawtxresult(result,rawtx)); - } - } else retstr = (char *)"couldnt decode send opret"; - } else retstr = (char *)"couldnt find vin0"; - } else retstr = (char *)"script or bad destpubtxid is not hex"; - } else retstr = (char *)"need to have exactly 2 params sendtxid, scriptPubKey"; - memset(seed,0,32); - memset(sk,0,sizeof(sk)); - return(cclib_error(result,retstr)); -} - -int64_t dilithium_inputs(struct CCcontract_info *cp,CMutableTransaction &mtx,CPubKey pk,uint256 destpubtxid,int64_t total,int32_t maxinputs,char *cmpaddr) -{ - char coinaddr[64]; int64_t threshold,nValue,price,totalinputs = 0; uint256 checktxid,txid,hashBlock; std::vector origpubkey,tmpsig; CTransaction vintx; int32_t vout,numvouts,n = 0; std::vector voutpubtxids; - std::vector > unspentOutputs; - GetCCaddress(cp,coinaddr,pk); - SetCCunspents(unspentOutputs,coinaddr,true); - if ( maxinputs > CC_MAXVINS ) - maxinputs = CC_MAXVINS; - if ( maxinputs > 0 ) - threshold = total/maxinputs; - else threshold = total; - for (std::vector >::const_iterator it=unspentOutputs.begin(); it!=unspentOutputs.end(); it++) - { - txid = it->first.txhash; - vout = (int32_t)it->first.index; - //char str[65]; fprintf(stderr,"%s check %s/v%d %.8f vs %.8f\n",coinaddr,uint256_str(str,txid),vout,(double)it->second.satoshis/COIN,(double)threshold/COIN); - if ( it->second.satoshis < threshold || it->second.satoshis == DILITHIUM_TXFEE ) - continue; - if ( myGetTransaction(txid,vintx,hashBlock) != 0 && (numvouts= vintx.vout.size()) > 1 ) - { - if ( (nValue= IsCClibvout(cp,vintx,vout,cmpaddr)) > DILITHIUM_TXFEE && myIsutxo_spentinmempool(ignoretxid,ignorevin,txid,vout) == 0 ) - { - if ( (dilithium_Qsendopretdecode(checktxid,tmpsig,voutpubtxids,vintx.vout[numvouts-1].scriptPubKey) == 'Q' && vout < voutpubtxids.size() && destpubtxid == voutpubtxids[vout]) || (dilithium_sendopretdecode(checktxid,vintx.vout[numvouts-1].scriptPubKey) == 'x' && destpubtxid == checktxid) ) - { - if ( total != 0 && maxinputs != 0 ) - mtx.vin.push_back(CTxIn(txid,vout,CScript())); - nValue = it->second.satoshis; - totalinputs += nValue; - n++; - if ( (total > 0 && totalinputs >= total) || (maxinputs > 0 && n >= maxinputs) ) - break; - } - } //else fprintf(stderr,"nValue %.8f too small or already spent in mempool\n",(double)nValue/COIN); - } else fprintf(stderr,"couldnt get tx\n"); - } - return(totalinputs); -} - -UniValue dilithium_Qsend(uint64_t txfee,struct CCcontract_info *cp,cJSON *params) -{ - CMutableTransaction mtx = CreateNewContextualCMutableTransaction(Params().GetConsensus(), hush_nextheight()); - UniValue result(UniValue::VOBJ); std::string rawtx; CPubKey mypk,destpub33; CTransaction tx,vintx; uint256 prevhash,mypubtxid,hashBlock,destpubtxid; int64_t amount,inputsum,outputsum,change; int32_t i,smlen,n,numvouts; char str[129],myCCaddr[64],*scriptstr,*retstr=""; CTxOut vout; std::string handle; uint8_t pk[CRYPTO_PUBLICKEYBYTES],pk2[CRYPTO_PUBLICKEYBYTES],sk[CRYPTO_SECRETKEYBYTES],msg[32],seed[32]; std::vector sig; std::vector voutpubtxids; - if ( txfee == 0 ) - txfee = DILITHIUM_TXFEE; - mypk = pubkey2pk(Mypubkey()); - GetCCaddress(cp,myCCaddr,mypk); - if ( params != 0 && (n= cJSON_GetArraySize(params)) >= 4 && (n & 1) == 0 ) - { - mypubtxid = juint256(jitem(params,0)); - if ( cclib_parsehash(seed,jitem(params,1),32) < 0 ) - { - Myprivkey(seed); - result.push_back(Pair("warning","test mode using privkey for -pubkey, only for testing. there is no point using quantum secure signing if you are using a privkey with a known secp256k1 pubkey!!")); - } - _dilithium_keypair(pk,sk,seed); - outputsum = 0; - for (i=2; ievalcode,amount,destpub33)); - voutpubtxids.push_back(prevhash); // binds destpub22 CC addr with dilithium bigpub - } - } - else - { - CScript scriptPubKey; - scriptPubKey.resize(strlen(scriptstr)/2); - decode_hex(&scriptPubKey[0],strlen(scriptstr)/2,scriptstr); - vout.nValue = amount; - vout.scriptPubKey = scriptPubKey; - mtx.vout.push_back(vout); - voutpubtxids.push_back(zeroid); - } - outputsum += amount; - } - if ( (inputsum= dilithium_inputs(cp,mtx,mypk,mypubtxid,outputsum+txfee,64,myCCaddr)) >= outputsum+txfee ) - { - change = (inputsum - outputsum - txfee); - if ( change >= txfee ) - { - mtx.vout.push_back(MakeCC1vout(cp->evalcode,change,mypk)); - voutpubtxids.push_back(mypubtxid); - } - tx = mtx; - dilithium_Qmsghash(msg,tx,(int32_t)voutpubtxids.size(),voutpubtxids); - //for (i=0; i<32; i++) - // fprintf(stderr,"%02x",msg[i]); - //fprintf(stderr," msg\n"); - sig.resize(32+CRYPTO_BYTES); - if ( dilithium_bigpubget(handle,destpub33,pk2,mypubtxid) < 0 ) - retstr = (char *)"couldnt get bigpub"; - else if ( memcmp(pk,pk2,sizeof(pk)) != 0 ) - retstr = (char *)"dilithium bigpub mismatch"; - else if ( destpub33 != mypk ) - retstr = (char *)"destpub33 is not for this -pubkey"; - else if ( _dilithium_sign(&sig[0],&smlen,msg,32,sk) < 0 ) - retstr = (char *)"dilithium signing error"; - else if ( smlen != 32+CRYPTO_BYTES ) - retstr = (char *)"siglen error"; - else - { - rawtx = FinalizeCCTx(0,cp,mtx,mypk,txfee,dilithium_Qsendopret(mypubtxid,sig,voutpubtxids)); - memset(seed,0,32); - memset(sk,0,sizeof(sk)); - return(dilithium_rawtxresult(result,rawtx)); - } - } else retstr = (char *)"Q couldnt find enough Q or x inputs"; - } else retstr = (char *)"need to have exactly 2 params sendtxid, scriptPubKey"; - memset(seed,0,32); - memset(sk,0,sizeof(sk)); - return(cclib_error(result,retstr)); -} - -bool dilithium_Qvalidate(struct CCcontract_info *cp,int32_t height,Eval *eval,const CTransaction tx) -{ - int32_t i,numvins,numvouts,mlen,smlen=CRYPTO_BYTES+32; CPubKey destpub33; std::string handle; uint256 tmptxid,hashBlock,destpubtxid,signerpubtxid; CTransaction vintx; std::vector tmpsig,sig,vopret; uint8_t msg[32],msg2[CRYPTO_BYTES+32],pk[CRYPTO_PUBLICKEYBYTES],*script; std::vector voutpubtxids; - numvins = tx.vin.size(); - signerpubtxid = zeroid; - for (i=0; i 1 ) - { - GetOpReturnData(vintx.vout[numvouts-1].scriptPubKey,vopret); - script = (uint8_t *)vopret.data(); - if ( script[1] == 'Q' ) - { - if ( dilithium_Qsendopretdecode(tmptxid,tmpsig,voutpubtxids,vintx.vout[numvouts-1].scriptPubKey) != 'Q' ) - return eval->Invalid("couldnt decode destpubtxid from Qsend"); - else if ( tx.vin[i].prevout.n > voutpubtxids.size() ) - return eval->Invalid("no destpubtxid for prevout.n"); - destpubtxid = voutpubtxids[tx.vin[i].prevout.n]; - } - else - { - if ( dilithium_sendopretdecode(destpubtxid,vintx.vout[numvouts-1].scriptPubKey) != 'x' ) - return eval->Invalid("couldnt decode destpubtxid from send"); - } - if ( signerpubtxid == zeroid ) - signerpubtxid = destpubtxid; - else if ( destpubtxid != signerpubtxid ) - return eval->Invalid("destpubtxid of vini doesnt match first one"); - } - } - } - if ( signerpubtxid != zeroid ) - { - numvouts = tx.vout.size(); - if ( dilithium_Qsendopretdecode(destpubtxid,sig,voutpubtxids,tx.vout[numvouts-1].scriptPubKey) == 'Q' && destpubtxid == signerpubtxid && sig.size() == smlen ) - { - if ( dilithium_Qmsghash(msg,tx,numvouts-1,voutpubtxids) < 0 ) - return eval->Invalid("couldnt get Qmsghash"); - else if ( dilithium_bigpubget(handle,destpub33,pk,signerpubtxid) < 0 ) - return eval->Invalid("couldnt get bigpub"); - else - { - if ( _dilithium_verify(msg2,&mlen,&sig[0],smlen,pk) < 0 ) - return eval->Invalid("failed dilithium verify"); - else if ( mlen != 32 || memcmp(msg,msg2,32) != 0 ) - { - for (i=0; i<32; i++) - fprintf(stderr,"%02x",msg[i]); - fprintf(stderr," vs "); - for (i=0; iInvalid("failed dilithium msg verify"); - } - else return true; - } - } else return eval->Invalid("failed decode Qsend"); - } else return eval->Invalid("unexpected zero signerpubtxid"); -} - -int32_t dilithium_registrationpub33(char *pkaddr,CPubKey &pub33,uint256 txid) -{ - std::string handle; std::vector bigpub; CTransaction tx; uint256 hashBlock; int32_t numvouts; - pkaddr[0] = 0; - if ( myGetTransaction(txid,tx,hashBlock) != 0 && (numvouts= tx.vout.size()) > 1 ) - { - if ( dilithium_registeropretdecode(handle,pub33,bigpub,tx.vout[numvouts-1].scriptPubKey) == 'R' ) - { - dilithium_addr(pkaddr,&bigpub[0],CRYPTO_PUBLICKEYBYTES); - return(0); - } - } - return(-1); -} - -void dilithium_handleinit(struct CCcontract_info *cp) -{ - static int32_t didinit; - std::vector txids; struct dilithium_handle *hashstr; CPubKey dilithiumpk,pub33; uint256 txid,hashBlock; CTransaction txi; int32_t numvouts; std::vector bigpub; std::string handle; char CCaddr[64]; - if ( didinit != 0 ) - return; - pthread_mutex_init(&DILITHIUM_MUTEX,NULL); - dilithiumpk = GetUnspendable(cp,0); - GetCCaddress(cp,CCaddr,dilithiumpk); - SetCCtxids(txids,CCaddr,true,cp->evalcode,zeroid,'R'); - for (std::vector::const_iterator it=txids.begin(); it!=txids.end(); it++) - { - txid = *it; - if ( myGetTransaction(txid,txi,hashBlock) != 0 && (numvouts= txi.vout.size()) > 1 ) - { - if ( dilithium_registeropretdecode(handle,pub33,bigpub,txi.vout[numvouts-1].scriptPubKey) == 'R' ) - { - if ( (hashstr= dilithium_handlenew((char *)handle.c_str())) != 0 ) - { - if ( hashstr->destpubtxid != txid ) - { - if ( hashstr->destpubtxid != zeroid ) - fprintf(stderr,"overwriting %s %s with %s\n",handle.c_str(),hashstr->destpubtxid.GetHex().c_str(),txid.GetHex().c_str()); - fprintf(stderr,"%s <- %s\n",handle.c_str(),txid.GetHex().c_str()); - hashstr->destpubtxid = txid; - } - } - } - } - } - didinit = 1; -} - -UniValue dilithium_handleinfo(uint64_t txfee,struct CCcontract_info *cp,cJSON *params) -{ - UniValue result(UniValue::VOBJ); CPubKey pub33; int32_t i,n; char *handlestr,pkaddr[64],str[67]; struct dilithium_handle *hashstr; - if ( params != 0 && (n= cJSON_GetArraySize(params)) == 1 ) - { - dilithium_handleinit(cp); - if ( (handlestr= jstr(jitem(params,0),0)) != 0 ) - { - result.push_back(Pair("result","success")); - result.push_back(Pair("handle",handlestr)); - if ( (hashstr= dilithium_handlefind(handlestr)) != 0 ) - { - result.push_back(Pair("destpubtxid",hashstr->destpubtxid.GetHex().c_str())); - if ( dilithium_registrationpub33(pkaddr,pub33,hashstr->destpubtxid) == 0 ) - { - for (i=0; i<33; i++) - sprintf(&str[i<<1],"%02x",((uint8_t *)pub33.begin())[i]); - str[i<<1] = 0; - result.push_back(Pair("pkaddr",pkaddr)); - } - result.push_back(Pair("pubkey",str)); - } else result.push_back(Pair("status","available")); - return(result); - } - } - result.push_back(Pair("result","error")); - return(result); -} - -bool dilithium_Rvalidate(struct CCcontract_info *cp,int32_t height,Eval *eval,const CTransaction tx) -{ - static int32_t didinit; - uint256 txid; int32_t numvouts; struct dilithium_handle *hashstr; std::string handle; std::vector bigpub; CPubKey oldpub33,pub33,dilithiumpk; CTxOut vout,vout0; char pkaddr[64]; - if ( height < 14500 ) - return(true); - dilithium_handleinit(cp); - dilithiumpk = GetUnspendable(cp,0); - if ( (numvouts= tx.vout.size()) <= 1 ) - return eval->Invalid("not enough vouts for registration tx"); - else if ( dilithium_registeropretdecode(handle,pub33,bigpub,tx.vout[numvouts-1].scriptPubKey) == 'R' ) - { - // relies on all current block tx to be put into mempool - txid = tx.GetHash(); - vout0 = MakeCC1vout(cp->evalcode,2*DILITHIUM_TXFEE,dilithiumpk); - vout = MakeCC1vout(EVAL_FAUCET,COIN,Faucet_pubkeyget()); - if ( tx.vout[0] != vout0 ) - return eval->Invalid("mismatched vout0 for register"); - else if ( tx.vout[1].nValue != DILITHIUM_TXFEE ) - return eval->Invalid("vout1 for register not txfee"); - else if ( tx.vout[2] != vout ) - return eval->Invalid("register not sending to faucet"); - else if ( (hashstr= dilithium_handlenew((char *)handle.c_str())) == 0 ) - return eval->Invalid("error creating dilithium handle"); - else if ( hashstr->destpubtxid == zeroid ) - { - hashstr->destpubtxid = txid; - return(true); - } - else - { - if ( hashstr->destpubtxid == txid ) - return(true); - else if ( dilithium_registrationpub33(pkaddr,oldpub33,hashstr->destpubtxid) == 0 ) - { - if ( oldpub33 == pub33 ) - { - hashstr->destpubtxid = txid; - fprintf(stderr,"ht.%d %s <- %s\n",height,handle.c_str(),txid.GetHex().c_str()); - return(true); - } - } - return eval->Invalid("duplicate dilithium handle rejected"); - } - } else return eval->Invalid("couldnt decode register opret"); -} - -bool dilithium_validate(struct CCcontract_info *cp,int32_t height,Eval *eval,const CTransaction tx) -{ - CPubKey destpub33; std::string handle; uint256 hashBlock,destpubtxid,checktxid; CTransaction vintx; int32_t numvouts,mlen,smlen=CRYPTO_BYTES+32; std::vector sig,vopret; uint8_t msg[32],msg2[CRYPTO_BYTES+32],pk[CRYPTO_PUBLICKEYBYTES],*script; - // if all dilithium tx -> do multispend/send, else: - numvouts = tx.vout.size(); - GetOpReturnData(tx.vout[numvouts-1].scriptPubKey,vopret); - script = (uint8_t *)vopret.data(); - if ( script[1] == 'R' ) - return(dilithium_Rvalidate(cp,height,eval,tx)); - else if ( script[1] == 'Q' ) - return(dilithium_Qvalidate(cp,height,eval,tx)); - else if ( tx.vout.size() != 2 ) - return eval->Invalid("numvouts != 2"); - else if ( tx.vin.size() != 1 ) - return eval->Invalid("numvins != 1"); - else if ( IsCCInput(tx.vin[0].scriptSig) == 0 ) - return eval->Invalid("illegal normal vin0"); - else if ( myGetTransaction(tx.vin[0].prevout.hash,vintx,hashBlock) != 0 && (numvouts= vintx.vout.size()) > 1 ) - { - if ( dilithium_sendopretdecode(destpubtxid,vintx.vout[numvouts-1].scriptPubKey) == 'x' ) - { - if ( dilithium_spendopretdecode(checktxid,sig,tx.vout[tx.vout.size()-1].scriptPubKey) == 'y' ) - { - if ( destpubtxid == checktxid && sig.size() == smlen ) - { - musig_prevoutmsg(msg,tx.vin[0].prevout.hash,tx.vout[0].scriptPubKey); - if ( dilithium_bigpubget(handle,destpub33,pk,destpubtxid) < 0 ) - return eval->Invalid("couldnt get bigpub"); - else - { - if ( _dilithium_verify(msg2,&mlen,&sig[0],smlen,pk) < 0 ) - return eval->Invalid("failed dilithium verify"); - else if ( mlen != 32 || memcmp(msg,msg2,32) != 0 ) - return eval->Invalid("failed dilithium msg verify"); - else return(true); - } - } else return eval->Invalid("destpubtxid or sig size didnt match send opret"); - } else return eval->Invalid("failed decode dilithium spendopret"); - } else return eval->Invalid("couldnt decode send opret"); - } else return eval->Invalid("couldnt find vin0 tx"); -} - From ff1d30cbad7f2580080d7e38b2e39c5e2363414f Mon Sep 17 00:00:00 2001 From: Duke Date: Sat, 10 Feb 2024 12:16:47 -0500 Subject: [PATCH 047/108] Delete more CCs #381 --- src/cc/cclib.cpp | 419 +---------------------------------------------- src/cc/musig.cpp | 341 -------------------------------------- 2 files changed, 8 insertions(+), 752 deletions(-) delete mode 100644 src/cc/musig.cpp diff --git a/src/cc/cclib.cpp b/src/cc/cclib.cpp index 48b69c7e5..0fa2ae68a 100644 --- a/src/cc/cclib.cpp +++ b/src/cc/cclib.cpp @@ -61,93 +61,13 @@ CClib_methods[] = { { (char *)"faucet2", (char *)"fund", (char *)"amount", 1, 1, 'F', EVAL_FAUCET2 }, { (char *)"faucet2", (char *)"get", (char *)"", 0, 0, 'G', EVAL_FAUCET2 }, -#ifdef BUILD_ROGUE - { (char *)"rogue", (char *)"newgame", (char *)"maxplayers buyin", 0, 2, 'G', EVAL_ROGUE }, - { (char *)"rogue", (char *)"gameinfo", (char *)"gametxid", 1, 1, 'T', EVAL_ROGUE }, - { (char *)"rogue", (char *)"pending", (char *)"", 0, 0, 'P', EVAL_ROGUE }, - { (char *)"rogue", (char *)"register", (char *)"gametxid [playertxid]", 1, 2, 'R', EVAL_ROGUE }, - { (char *)"rogue", (char *)"keystrokes", (char *)"gametxid keystrokes", 2, 2, 'K', EVAL_ROGUE }, - { (char *)"rogue", (char *)"bailout", (char *)"gametxid", 1, 1, 'Q', EVAL_ROGUE }, - { (char *)"rogue", (char *)"highlander", (char *)"gametxid", 1, 1, 'H', EVAL_ROGUE }, - { (char *)"rogue", (char *)"playerinfo", (char *)"playertxid", 1, 1, 'I', EVAL_ROGUE }, - { (char *)"rogue", (char *)"players", (char *)"", 0, 0, 'D', EVAL_ROGUE }, - { (char *)"rogue", (char *)"games", (char *)"", 0, 0, 'F', EVAL_ROGUE }, - { (char *)"rogue", (char *)"setname", (char *)"pname", 1, 1, 'N', EVAL_ROGUE }, - { (char *)"rogue", (char *)"extract", (char *)"gametxid [pubkey]", 1, 2, 'X', EVAL_ROGUE }, -#elif BUILD_CUSTOMCC +#ifdef BUILD_CUSTOMCC RPC_FUNCS -#elif BUILD_GAMESCC - RPC_FUNCS -#else - { (char *)"musig", (char *)"calcmsg", (char *)"sendtxid scriptPubKey", 2, 2, 'C', EVAL_MUSIG }, - { (char *)"musig", (char *)"combine", (char *)"pubkeys ...", 2, 999999999, 'P', EVAL_MUSIG }, - { (char *)"musig", (char *)"session", (char *)"myindex,numsigners,combined_pk,pkhash,msg32", 5, 5, 'R', EVAL_MUSIG }, - { (char *)"musig", (char *)"commit", (char *)"pkhash,ind,commitment", 3, 3, 'H', EVAL_MUSIG }, - { (char *)"musig", (char *)"nonce", (char *)"pkhash,ind,nonce", 3, 3, 'N', EVAL_MUSIG }, - { (char *)"musig", (char *)"partialsig", (char *)"pkhash,ind,partialsig", 3, 3, 'S', EVAL_MUSIG }, - { (char *)"musig", (char *)"verify", (char *)"msg sig pubkey", 3, 3, 'V', EVAL_MUSIG }, - { (char *)"musig", (char *)"send", (char *)"combined_pk amount", 2, 2, 'x', EVAL_MUSIG }, - { (char *)"musig", (char *)"spend", (char *)"sendtxid sig scriptPubKey", 3, 3, 'y', EVAL_MUSIG }, - { (char *)"dilithium", (char *)"keypair", (char *)"[hexseed]", 0, 1, 'K', EVAL_DILITHIUM }, - { (char *)"dilithium", (char *)"register", (char *)"handle, [hexseed]", 1, 2, 'R', EVAL_DILITHIUM }, - { (char *)"dilithium", (char *)"handleinfo", (char *)"handle", 1, 1, 'I', EVAL_DILITHIUM }, - { (char *)"dilithium", (char *)"sign", (char *)"msg [hexseed]", 1, 2, 'S', EVAL_DILITHIUM }, - { (char *)"dilithium", (char *)"verify", (char *)"pubtxid msg sig", 3, 3, 'V', EVAL_DILITHIUM }, - { (char *)"dilithium", (char *)"send", (char *)"handle pubtxid amount", 3, 3, 'x', EVAL_DILITHIUM }, - { (char *)"dilithium", (char *)"spend", (char *)"sendtxid scriptPubKey [hexseed]", 2, 3, 'y', EVAL_DILITHIUM }, - { (char *)"dilithium", (char *)"Qsend", (char *)"mypubtxid hexseed/'mypriv' destpubtxid,amount, ...", 4, 66, 'Q', EVAL_DILITHIUM }, #endif }; std::string CClib_rawtxgen(struct CCcontract_info *cp,uint8_t funcid,cJSON *params); -#ifdef BUILD_ROGUE -int32_t rogue_replay(uint64_t seed,int32_t sleepmillis); -bool rogue_validate(struct CCcontract_info *cp,int32_t height,Eval *eval,const CTransaction tx); - -UniValue rogue_newgame(uint64_t txfee,struct CCcontract_info *cp,cJSON *params); -UniValue rogue_pending(uint64_t txfee,struct CCcontract_info *cp,cJSON *params); -UniValue rogue_gameinfo(uint64_t txfee,struct CCcontract_info *cp,cJSON *params); -UniValue rogue_register(uint64_t txfee,struct CCcontract_info *cp,cJSON *params); -UniValue rogue_keystrokes(uint64_t txfee,struct CCcontract_info *cp,cJSON *params); -UniValue rogue_bailout(uint64_t txfee,struct CCcontract_info *cp,cJSON *params); -UniValue rogue_highlander(uint64_t txfee,struct CCcontract_info *cp,cJSON *params); -UniValue rogue_playerinfo(uint64_t txfee,struct CCcontract_info *cp,cJSON *params); -UniValue rogue_players(uint64_t txfee,struct CCcontract_info *cp,cJSON *params); -UniValue rogue_games(uint64_t txfee,struct CCcontract_info *cp,cJSON *params); -UniValue rogue_setname(uint64_t txfee,struct CCcontract_info *cp,cJSON *params); -UniValue rogue_extract(uint64_t txfee,struct CCcontract_info *cp,cJSON *params); - -#else -bool sudoku_validate(struct CCcontract_info *cp,int32_t height,Eval *eval,const CTransaction tx); -UniValue sudoku_txidinfo(uint64_t txfee,struct CCcontract_info *cp,cJSON *params); -UniValue sudoku_generate(uint64_t txfee,struct CCcontract_info *cp,cJSON *params); -UniValue sudoku_solution(uint64_t txfee,struct CCcontract_info *cp,cJSON *params); -UniValue sudoku_pending(uint64_t txfee,struct CCcontract_info *cp,cJSON *params); - -bool musig_validate(struct CCcontract_info *cp,int32_t height,Eval *eval,const CTransaction tx); -UniValue musig_calcmsg(uint64_t txfee,struct CCcontract_info *cp,cJSON *params); -UniValue musig_combine(uint64_t txfee,struct CCcontract_info *cp,cJSON *params); -UniValue musig_session(uint64_t txfee,struct CCcontract_info *cp,cJSON *params); -UniValue musig_commit(uint64_t txfee,struct CCcontract_info *cp,cJSON *params); -UniValue musig_nonce(uint64_t txfee,struct CCcontract_info *cp,cJSON *params); -UniValue musig_partialsig(uint64_t txfee,struct CCcontract_info *cp,cJSON *params); -UniValue musig_verify(uint64_t txfee,struct CCcontract_info *cp,cJSON *params); -UniValue musig_send(uint64_t txfee,struct CCcontract_info *cp,cJSON *params); -UniValue musig_spend(uint64_t txfee,struct CCcontract_info *cp,cJSON *params); - -bool dilithium_validate(struct CCcontract_info *cp,int32_t height,Eval *eval,const CTransaction tx); -UniValue dilithium_register(uint64_t txfee,struct CCcontract_info *cp,cJSON *params); -UniValue dilithium_handleinfo(uint64_t txfee,struct CCcontract_info *cp,cJSON *params); -UniValue dilithium_send(uint64_t txfee,struct CCcontract_info *cp,cJSON *params); -UniValue dilithium_spend(uint64_t txfee,struct CCcontract_info *cp,cJSON *params); -UniValue dilithium_keypair(uint64_t txfee,struct CCcontract_info *cp,cJSON *params); -UniValue dilithium_sign(uint64_t txfee,struct CCcontract_info *cp,cJSON *params); -UniValue dilithium_verify(uint64_t txfee,struct CCcontract_info *cp,cJSON *params); -UniValue dilithium_Qsend(uint64_t txfee,struct CCcontract_info *cp,cJSON *params); - -#endif - cJSON *cclib_reparse(int32_t *nump,char *jsonstr) // assumes origparams will be freed by caller { cJSON *params; char *newstr; int32_t i,j; @@ -184,367 +104,44 @@ cJSON *cclib_reparse(int32_t *nump,char *jsonstr) // assumes origparams will be UniValue CClib_method(struct CCcontract_info *cp,char *method,char *jsonstr) { - UniValue result(UniValue::VOBJ); uint64_t txfee = 10000; int32_t m; cJSON *params = cclib_reparse(&m,jsonstr); - fprintf(stderr,"method.(%s) -> (%s)\n",jsonstr!=0?jsonstr:"",params!=0?jprint(params,0):""); -#ifdef BUILD_ROGUE - if ( cp->evalcode == EVAL_ROGUE ) - { - if ( strcmp(method,"newgame") == 0 ) - return(rogue_newgame(txfee,cp,params)); - else if ( strcmp(method,"pending") == 0 ) - return(rogue_pending(txfee,cp,params)); - else if ( strcmp(method,"gameinfo") == 0 ) - return(rogue_gameinfo(txfee,cp,params)); - else if ( strcmp(method,"register") == 0 ) - return(rogue_register(txfee,cp,params)); - else if ( strcmp(method,"keystrokes") == 0 ) - return(rogue_keystrokes(txfee,cp,params)); - else if ( strcmp(method,"bailout") == 0 ) - return(rogue_bailout(txfee,cp,params)); - else if ( strcmp(method,"highlander") == 0 ) - return(rogue_highlander(txfee,cp,params)); - else if ( strcmp(method,"extract") == 0 ) - return(rogue_extract(txfee,cp,params)); - else if ( strcmp(method,"playerinfo") == 0 ) - return(rogue_playerinfo(txfee,cp,params)); - else if ( strcmp(method,"players") == 0 ) - return(rogue_players(txfee,cp,params)); - else if ( strcmp(method,"games") == 0 ) - return(rogue_games(txfee,cp,params)); - else if ( strcmp(method,"setname") == 0 ) - return(rogue_setname(txfee,cp,params)); - else - { - result.push_back(Pair("result","error")); - result.push_back(Pair("error","invalid rogue method")); - result.push_back(Pair("method",method)); - return(result); - } - } -#elif BUILD_CUSTOMCC - CUSTOM_DISPATCH -#elif BUILD_GAMESCC - CUSTOM_DISPATCH -#else - if ( cp->evalcode == EVAL_SUDOKU ) - { - //printf("CClib_method params.%p\n",params); - if ( strcmp(method,"txidinfo") == 0 ) - return(sudoku_txidinfo(txfee,cp,params)); - else if ( strcmp(method,"gen") == 0 ) - return(sudoku_generate(txfee,cp,params)); - else if ( strcmp(method,"solution") == 0 ) - return(sudoku_solution(txfee,cp,params)); - else if ( strcmp(method,"pending") == 0 ) - return(sudoku_pending(txfee,cp,params)); - else - { - result.push_back(Pair("result","error")); - result.push_back(Pair("error","invalid sudoku method")); - result.push_back(Pair("method",method)); - return(result); - } - } - else if ( cp->evalcode == EVAL_MUSIG ) - { - //printf("CClib_method params.%p\n",params); - if ( strcmp(method,"combine") == 0 ) - return(musig_combine(txfee,cp,params)); - else if ( strcmp(method,"calcmsg") == 0 ) - return(musig_calcmsg(txfee,cp,params)); - else if ( strcmp(method,"session") == 0 ) - return(musig_session(txfee,cp,params)); - else if ( strcmp(method,"commit") == 0 ) - return(musig_commit(txfee,cp,params)); - else if ( strcmp(method,"nonce") == 0 ) // returns combined nonce if ready - return(musig_nonce(txfee,cp,params)); - else if ( strcmp(method,"partialsig") == 0 ) - return(musig_partialsig(txfee,cp,params)); - else if ( strcmp(method,"verify") == 0 ) - return(musig_verify(txfee,cp,params)); - else if ( strcmp(method,"send") == 0 ) - return(musig_send(txfee,cp,params)); - else if ( strcmp(method,"spend") == 0 ) - return(musig_spend(txfee,cp,params)); - else - { - result.push_back(Pair("result","error")); - result.push_back(Pair("error","invalid musig method")); - result.push_back(Pair("method",method)); - return(result); - } - } - else if ( cp->evalcode == EVAL_DILITHIUM ) - { - if ( strcmp(method,"Qsend") == 0 ) - return(dilithium_Qsend(txfee,cp,params)); - else if ( strcmp(method,"send") == 0 ) - return(dilithium_send(txfee,cp,params)); - else if ( strcmp(method,"spend") == 0 ) - return(dilithium_spend(txfee,cp,params)); - else if ( strcmp(method,"keypair") == 0 ) - return(dilithium_keypair(txfee,cp,params)); - else if ( strcmp(method,"register") == 0 ) - return(dilithium_register(txfee,cp,params)); - else if ( strcmp(method,"handleinfo") == 0 ) - return(dilithium_handleinfo(txfee,cp,params)); - else if ( strcmp(method,"sign") == 0 ) - return(dilithium_sign(txfee,cp,params)); - else if ( strcmp(method,"verify") == 0 ) - return(dilithium_verify(txfee,cp,params)); - else - { - result.push_back(Pair("result","error")); - result.push_back(Pair("error","invalid dilithium method")); - result.push_back(Pair("method",method)); - return(result); - } - } -#endif - else - { - result.push_back(Pair("result","error")); - result.push_back(Pair("error","only sudoku supported for now")); - result.push_back(Pair("evalcode",(int)cp->evalcode)); - return(result); - } + UniValue result(UniValue::VOBJ); + return(result); } UniValue CClib_info(struct CCcontract_info *cp) { - UniValue result(UniValue::VOBJ),a(UniValue::VARR); int32_t i; char str[2]; - result.push_back(Pair("result","success")); - result.push_back(Pair("CClib",CClib_name())); - for (i=0; i= 128 ) - obj.push_back(Pair("funcid",CClib_methods[i].funcid)); - else - { - str[0] = CClib_methods[i].funcid; - str[1] = 0; - obj.push_back(Pair("funcid",str)); - } - obj.push_back(Pair("name",CClib_methods[i].CCname)); - obj.push_back(Pair("method",CClib_methods[i].method)); - obj.push_back(Pair("help",CClib_methods[i].help)); - obj.push_back(Pair("params_required",CClib_methods[i].numrequiredargs)); - obj.push_back(Pair("params_max",CClib_methods[i].maxargs)); - a.push_back(obj); - } - result.push_back(Pair("methods",a)); + UniValue result(UniValue::VOBJ); return(result); } UniValue CClib(struct CCcontract_info *cp,char *method,char *jsonstr) { - UniValue result(UniValue::VOBJ); int32_t i; std::string rawtx; cJSON *params; -//printf("CClib params.(%s)\n",jsonstr!=0?jsonstr:""); - for (i=0; ievalcode == CClib_methods[i].evalcode && strcmp(method,CClib_methods[i].method) == 0 ) - { - if ( cp->evalcode == EVAL_FAUCET2 ) - { - result.push_back(Pair("result","success")); - result.push_back(Pair("method",CClib_methods[i].method)); - params = cJSON_Parse(jsonstr); - rawtx = CClib_rawtxgen(cp,CClib_methods[i].funcid,params); - free_json(params); - result.push_back(Pair("rawtx",rawtx)); - return(result); - } else return(CClib_method(cp,method,jsonstr)); - } - } - result.push_back(Pair("result","error")); - result.push_back(Pair("method",method)); - result.push_back(Pair("error","method not found")); + UniValue result(UniValue::VOBJ); return(result); } int64_t IsCClibvout(struct CCcontract_info *cp,const CTransaction& tx,int32_t v,char *cmpaddr) { - char destaddr[64]; - if ( tx.vout[v].scriptPubKey.IsPayToCryptoCondition() != 0 ) - { - if ( Getscriptaddress(destaddr,tx.vout[v].scriptPubKey) > 0 && strcmp(destaddr,cmpaddr) == 0 ) - return(tx.vout[v].nValue); - } return(0); } bool CClibExactAmounts(struct CCcontract_info *cp,Eval* eval,const CTransaction &tx,int32_t minage,uint64_t txfee) { - static uint256 zerohash; - CTransaction vinTx; uint256 hashBlock,activehash; int32_t i,numvins,numvouts; int64_t inputs=0,outputs=0,assetoshis; - numvins = tx.vin.size(); - numvouts = tx.vout.size(); - for (i=0; iismyvin)(tx.vin[i].scriptSig) != 0 ) - { - //fprintf(stderr,"vini.%d check mempool\n",i); - if ( eval->GetTxUnconfirmed(tx.vin[i].prevout.hash,vinTx,hashBlock) == 0 ) - return eval->Invalid("cant find vinTx"); - else - { - //fprintf(stderr,"vini.%d check hash and vout\n",i); - if ( hashBlock == zerohash ) - return eval->Invalid("cant faucet2 from mempool"); - if ( (assetoshis= IsCClibvout(cp,vinTx,tx.vin[i].prevout.n,cp->unspendableCCaddr)) != 0 ) - inputs += assetoshis; - } - } - } - for (i=0; iunspendableCCaddr)) != 0 ) - outputs += assetoshis; - } - if ( inputs != outputs+FAUCET2SIZE+txfee ) - { - fprintf(stderr,"inputs %llu vs outputs %llu\n",(long long)inputs,(long long)outputs); - return eval->Invalid("mismatched inputs != outputs + FAUCET2SIZE + txfee"); - } - else return(true); + return false; } bool CClib_validate(struct CCcontract_info *cp,int32_t height,Eval *eval,const CTransaction tx,unsigned int nIn) { - int32_t numvins,numvouts,preventCCvins,preventCCvouts,i,numblocks; bool retval; uint256 txid; uint8_t hash[32]; char str[65],destaddr[64]; - std::vector > txids; - if ( cp->evalcode != EVAL_FAUCET2 ) - { -#ifdef BUILD_ROGUE - return(rogue_validate(cp,height,eval,tx)); -#elif BUILD_CUSTOMCC - return(custom_validate(cp,height,eval,tx)); -#elif BUILD_GAMESCC - return(games_validate(cp,height,eval,tx)); -#else - if ( cp->evalcode == EVAL_SUDOKU ) - return(sudoku_validate(cp,height,eval,tx)); - else if ( cp->evalcode == EVAL_MUSIG ) - return(musig_validate(cp,height,eval,tx)); - else if ( cp->evalcode == EVAL_DILITHIUM ) - return(dilithium_validate(cp,height,eval,tx)); - else return eval->Invalid("invalid evalcode"); -#endif - } - numvins = tx.vin.size(); - numvouts = tx.vout.size(); - preventCCvins = preventCCvouts = -1; - if ( numvouts < 1 ) { - return eval->Invalid("no vouts"); - } else { - for (i=0; iInvalid("illegal normal vini"); - } - } - //fprintf(stderr,"check amounts\n"); - if ( CClibExactAmounts(cp,eval,tx,1,10000) == false ) { - fprintf(stderr,"faucetget invalid amount\n"); - return false; - } else { - preventCCvouts = 1; - if ( IsCClibvout(cp,tx,0,cp->unspendableCCaddr) != 0 ) - { - preventCCvouts++; - i = 1; - } else i = 0; - txid = tx.GetHash(); - memcpy(hash,&txid,sizeof(hash)); - fprintf(stderr,"check faucetget txid %s %02x/%02x\n",uint256_str(str,txid),hash[0],hash[31]); - if ( tx.vout[i].nValue != FAUCET2SIZE ) - return eval->Invalid("invalid faucet output"); - else if ( (hash[0] & 0xff) != 0 || (hash[31] & 0xff) != 0 ) - return eval->Invalid("invalid faucetget txid"); - Getscriptaddress(destaddr,tx.vout[i].scriptPubKey); - SetCCtxids(txids,destaddr,tx.vout[i].scriptPubKey.IsPayToCryptoCondition()); - for (std::vector >::const_iterator it=txids.begin(); it!=txids.end(); it++) - { - //int height = it->first.blockHeight; - if ( CCduration(numblocks,it->first.txhash) > 0 && numblocks > 3 ) - { - //fprintf(stderr,"would return error %s numblocks.%d ago\n",uint256_str(str,it->first.txhash),numblocks); - return eval->Invalid("faucet2 is only for brand new addresses"); - } - } - retval = PreventCC(eval,tx,preventCCvins,numvins,preventCCvouts,numvouts); - if ( retval != 0 ) - fprintf(stderr,"faucet2get validated\n"); - else fprintf(stderr,"faucet2get invalid\n"); - return(retval); - } - } + return false; } int64_t AddCClibInputs(struct CCcontract_info *cp,CMutableTransaction &mtx,CPubKey pk,int64_t total,int32_t maxinputs,char *cmpaddr,int32_t CCflag) { - char coinaddr[64]; int64_t threshold,nValue,price,totalinputs = 0,txfee = 10000; uint256 txid,hashBlock; std::vector origpubkey; CTransaction vintx; int32_t vout,n = 0; - std::vector > unspentOutputs; - GetCCaddress(cp,coinaddr,pk); - SetCCunspents(unspentOutputs,coinaddr,CCflag!=0?true:false); - if ( maxinputs > CC_MAXVINS ) - maxinputs = CC_MAXVINS; - if ( maxinputs != 0 ) - threshold = total/maxinputs; - else threshold = total; - for (std::vector >::const_iterator it=unspentOutputs.begin(); it!=unspentOutputs.end(); it++) - { - txid = it->first.txhash; - vout = (int32_t)it->first.index; - //char str[65]; fprintf(stderr,"%s check %s/v%d %.8f vs %.8f\n",coinaddr,uint256_str(str,txid),vout,(double)it->second.satoshis/COIN,(double)threshold/COIN); - if ( it->second.satoshis < threshold || it->second.satoshis == txfee ) - continue; - // no need to prevent dup - if ( myGetTransaction(txid,vintx,hashBlock) != 0 ) - { - if ( (nValue= IsCClibvout(cp,vintx,vout,cmpaddr)) >= 1000000 && myIsutxo_spentinmempool(ignoretxid,ignorevin,txid,vout) == 0 ) - { - if ( total != 0 && maxinputs != 0 ) - mtx.vin.push_back(CTxIn(txid,vout,CScript())); - nValue = it->second.satoshis; - totalinputs += nValue; - n++; - if ( (total > 0 && totalinputs >= total) || (maxinputs > 0 && n >= maxinputs) ) - break; - } //else fprintf(stderr,"nValue %.8f too small or already spent in mempool\n",(double)nValue/COIN); - } else fprintf(stderr,"couldnt get tx\n"); - } - return(totalinputs); + return 0; } int64_t AddCClibtxfee(struct CCcontract_info *cp,CMutableTransaction &mtx,CPubKey pk) { - char coinaddr[64]; int64_t nValue,txfee = 10000; uint256 txid,hashBlock; CTransaction vintx; int32_t vout; - std::vector > unspentOutputs; - GetCCaddress(cp,coinaddr,pk); - SetCCunspents(unspentOutputs,coinaddr,true); - for (std::vector >::const_iterator it=unspentOutputs.begin(); it!=unspentOutputs.end(); it++) - { - txid = it->first.txhash; - vout = (int32_t)it->first.index; - //char str[65]; fprintf(stderr,"%s check %s/v%d %.8f vs %.8f\n",coinaddr,uint256_str(str,txid),vout,(double)it->second.satoshis/COIN,(double)threshold/COIN); - if ( it->second.satoshis < txfee ) - continue; - if ( myGetTransaction(txid,vintx,hashBlock) != 0 ) - { - if ( (nValue= IsCClibvout(cp,vintx,vout,coinaddr)) != 0 && myIsutxo_spentinmempool(ignoretxid,ignorevin,txid,vout) == 0 ) - { - mtx.vin.push_back(CTxIn(txid,vout,CScript())); - return(it->second.satoshis); - } //else fprintf(stderr,"nValue %.8f too small or already spent in mempool\n",(double)nValue/COIN); - } else fprintf(stderr,"couldnt get tx\n"); - } return(0); } diff --git a/src/cc/musig.cpp b/src/cc/musig.cpp deleted file mode 100644 index 6aafe5fd5..000000000 --- a/src/cc/musig.cpp +++ /dev/null @@ -1,341 +0,0 @@ -// Copyright (c) 2016-2023 The Hush developers -// Distributed under the GPLv3 software license, see the accompanying -// file COPYING or https://www.gnu.org/licenses/gpl-3.0.en.html -/****************************************************************************** - * Copyright © 2014-2019 The SuperNET Developers. * - * * - * See the AUTHORS, DEVELOPER-AGREEMENT and LICENSE files at * - * the top-level directory of this distribution for the individual copyright * - * holder information and the developer policies on copyright and licensing. * - * * - * Unless otherwise agreed in a custom licensing agreement, no part of the * - * SuperNET software, including this file may be copied, modified, propagated * - * or distributed except according to the terms contained in the LICENSE file * - * * - * Removal or modification of this copyright notice is prohibited. * - * * - ******************************************************************************/ - -/* first make a combined pk: - -./hush-cli -ac_name=MUSIG cclib combine 18 '["02fb6aa0b96cad24d46b5da93eba3864c45ce07a73bba12da530ae841e140fcf28","0255c46dbce584e3751081b39d7fc054fc807100557e73fc444481618b5706afb4"]' -{ - "pkhash": "5cb5a225064ca6ffc1438cb2a6ac2ac65fe2d5055dc7f6c7ebffb9a231f8912b", - "combined_pk": "03f016c348437c7422eed92d865aa9789614f75327cada463eefc566126b54785b", - "result": "success" -} - - the combined_pk and pkhash will be needed for various other rpc calls - - second, send 1 coin to the combined_pk - ./hush-cli -ac_name=MUSIG cclib send 18 '["03f016c348437c7422eed92d865aa9789614f75327cada463eefc566126b54785b",1]' - { - "hex": "0400008085202f8901a980664dffc810725a79ffb89ac48be4c7b6bade9b789732fcf871acf8e81a2e010000006a47304402207e52763661ecd2c34a65d6623950be11794825db71576dc11894c606ddc317800220028fef46dc20630d0fdf22647b5d4ff0f1c47cf75f48702d0a91d5589eff99d001210255c46dbce584e3751081b39d7fc054fc807100557e73fc444481618b5706afb4ffffffff031008f60500000000302ea22c8020c71ddb3aac7f9b9e4bdacf032aaa8b8e4433c4ff9f8a43cebb9c1f5da96928a48103120c008203000401cce09aa4350000000023210255c46dbce584e3751081b39d7fc054fc807100557e73fc444481618b5706afb4ac0000000000000000266a2412782103f016c348437c7422eed92d865aa9789614f75327cada463eefc566126b54785b00000000920500000000000000000000000000", - "txid": "5ce74037a153ee210413b48d4e88638b99825a2de1a1f1aa0d36ebf93019824c", - "result": "success" - } - - sendrawtransaction of the above hex. - ./hush-cli -ac_name=MUSIG getrawtransaction 5ce74037a153ee210413b48d4e88638b99825a2de1a1f1aa0d36ebf93019824c 1 - "vout": [ - { - "value": 1.00010000, - "valueSat": 100010000, - "n": 0, - "scriptPubKey": { - "asm": "a22c8020c71ddb3aac7f9b9e4bdacf032aaa8b8e4433c4ff9f8a43cebb9c1f5da96928a48103120c008203000401 OP_CHECKCRYPTOCONDITION", - "hex": "2ea22c8020c71ddb3aac7f9b9e4bdacf032aaa8b8e4433c4ff9f8a43cebb9c1f5da96928a48103120c008203000401cc", - "reqSigs": 1, - "type": "cryptocondition", - "addresses": [ - "RKWS7jxyjPX9iaJttk8iMKf1AumanKypez" - ] - } - }, - { - "value": 8.99980000, - "valueSat": 899980000, - "n": 1, - "scriptPubKey": { - "asm": "0255c46dbce584e3751081b39d7fc054fc807100557e73fc444481618b5706afb4 OP_CHECKSIG", - "hex": "210255c46dbce584e3751081b39d7fc054fc807100557e73fc444481618b5706afb4ac", - "reqSigs": 1, - "type": "pubkey", - "addresses": [ - "RVQjvGdRbYLJ49bfH4SAFseipvwE3UdoDw" - ] - } - - script: 210255c46dbce584e3751081b39d7fc054fc807100557e73fc444481618b5706afb4ac - - sendtxid: 5ce74037a153ee210413b48d4e88638b99825a2de1a1f1aa0d36ebf93019824c - - get the msg we need to sign: - - ./hush-cli -ac_name=MUSIG cclib calcmsg 18 '["5ce74037a153ee210413b48d4e88638b99825a2de1a1f1aa0d36ebf93019824c","210255c46dbce584e3751081b39d7fc054fc807100557e73fc444481618b5706afb4ac"]' - - { - "msg": "f7fb85d1412814e3c2f98b990802af6ee33dad368c6ba05c2050e9e5506fcd75", - "result": "success" - } - -the "msg" is what needs to be signed to create a valid spend - - now on each signing node, a session needs to be created: - 5 args: ind, numsigners, combined_pk, pkhash, message to be signed - - on node with pubkey: 02fb6aa0b96cad24d46b5da93eba3864c45ce07a73bba12da530ae841e140fcf28 - ./hush-cli -ac_name=MUSIG cclib session 18 '[0,2,"03f016c348437c7422eed92d865aa9789614f75327cada463eefc566126b54785b","5cb5a225064ca6ffc1438cb2a6ac2ac65fe2d5055dc7f6c7ebffb9a231f8912b","f7fb85d1412814e3c2f98b990802af6ee33dad368c6ba05c2050e9e5506fcd75"]' - { - "myind": 0, - "numsigners": 2, - "commitment": "bbea1f2562eca01b9a1393c5dc188bdd44551aebf684f4459930f59dde01f7ae", - "result": "success" - } - - on node with pubkey: 0255c46dbce584e3751081b39d7fc054fc807100557e73fc444481618b5706afb4 - ./hush-cli -ac_name=MUSIG cclib session 18 '[1,2,"03f016c348437c7422eed92d865aa9789614f75327cada463eefc566126b54785b","5cb5a225064ca6ffc1438cb2a6ac2ac65fe2d5055dc7f6c7ebffb9a231f8912b","f7fb85d1412814e3c2f98b990802af6ee33dad368c6ba05c2050e9e5506fcd75"]' - { - "myind": 1, - "numsigners": 2, - "commitment": "c2291acb747a75b1a40014d8eb0cc90a1360f74d413f65f78e20a7de45eda851", - "result": "success" - } - - now we need to get the commitment from each node to the other one. the session already put the commitment for each node into the global struct. Keep in mind there is a single global struct with session unique to each cclib session call. that means no restarting any deamon in the middle of the process on any of the nodes and only call cclib session a single time. this is an artificial restriction just to simplify the initial implementation of musig - ./hush-cli -ac_name=MUSIG cclib commit 18 '["5cb5a225064ca6ffc1438cb2a6ac2ac65fe2d5055dc7f6c7ebffb9a231f8912b","1","c2291acb747a75b1a40014d8eb0cc90a1360f74d413f65f78e20a7de45eda851"]' - { - "added_index": 1, - "myind": 0, - "nonce": "02fec7a9310c959a0a97b86bc3f8c30d392d1fb51793915898c568f73f1f70476b", - "result": "success" - } - - ./hush-cli -ac_name=MUSIG cclib commit 18 '["5cb5a225064ca6ffc1438cb2a6ac2ac65fe2d5055dc7f6c7ebffb9a231f8912b",0,"d242cff13fa8c9b83248e4219fda459ada146b885f2171481f1b0f66c66d94ad"]' - { - "added_index": 0, - "myind": 1, - "nonce": "039365deaaaea089d509ba4c9f846de2baf4aa04cf6b26fa2c1cd818553e47f80c", - "result": "success" - } - - Now exchange the revealed nonces to each node: - ./hush-cli -ac_name=MUSIG cclib nonce 18 '["5cb5a225064ca6ffc1438cb2a6ac2ac65fe2d5055dc7f6c7ebffb9a231f8912b","1","039365deaaaea089d509ba4c9f846de2baf4aa04cf6b26fa2c1cd818553e47f80c"]' -{ - "added_index": 1, - "myind": 0, - "partialsig": "1d65c09cd9bffe4f0604227e66cd7cd221480bbb08262fe885563a9df7cf8f5b", - "result": "success" -} - -./hush-cli -ac_name=MUSIG cclib nonce 18 '["5cb5a225064ca6ffc1438cb2a6ac2ac65fe2d5055dc7f6c7ebffb9a231f8912b",0,"02fec7a9310c959a0a97b86bc3f8c30d392d1fb51793915898c568f73f1f70476b"]' -{ - "added_index": 0, - "myind": 1, - "partialsig": "4a3795e6801b355102c617390cf5a462061e082e35dc2ed8f8b1fab54cc0769e", - "result": "success" -} - - Almost there! final step is to exchange the partial sigs between signers - ./hush-cli -ac_name=MUSIG cclib partialsig 18 '["5cb5a225064ca6ffc1438cb2a6ac2ac65fe2d5055dc7f6c7ebffb9a231f8912b","1","4a3795e6801b355102c617390cf5a462061e082e35dc2ed8f8b1fab54cc0769e"]' - { - "added_index": 1, - "result": "success", - "combinedsig": "a76f2790747ed2436a281f2660bdbee21bad9ee130b9cab6e542fa618fba1512679d568359db33a008ca39b773c32134276613e93e025ec17e083553449005f9" - } - - ./hush-cli -ac_name=MUSIG cclib partialsig 18 '["5cb5a225064ca6ffc1438cb2a6ac2ac65fe2d5055dc7f6c7ebffb9a231f8912b",0,"1d65c09cd9bffe4f0604227e66cd7cd221480bbb08262fe885563a9df7cf8f5b"]' - { - "added_index": 0, - "result": "success", - "combinedsig": "a76f2790747ed2436a281f2660bdbee21bad9ee130b9cab6e542fa618fba1512679d568359db33a008ca39b773c32134276613e93e025ec17e083553449005f9" - } - - Notice both nodes generated the same combined signature! - - Now for a sanity test, we can use the verify call to make sure this sig will work with the msg needed for the spend: - - ./hush-cli -ac_name=MUSIG cclib verify 18 '["f7fb85d1412814e3c2f98b990802af6ee33dad368c6ba05c2050e9e5506fcd75","03f016c348437c7422eed92d865aa9789614f75327cada463eefc566126b54785b","a76f2790747ed2436a281f2660bdbee21bad9ee130b9cab6e542fa618fba1512679d568359db33a008ca39b773c32134276613e93e025ec17e083553449005f9"]' - { - "msg": "f7fb85d1412814e3c2f98b990802af6ee33dad368c6ba05c2050e9e5506fcd75", - "combined_pk": "03f016c348437c7422eed92d865aa9789614f75327cada463eefc566126b54785b", - "combinedsig": "a76f2790747ed2436a281f2660bdbee21bad9ee130b9cab6e542fa618fba1512679d568359db33a008ca39b773c32134276613e93e025ec17e083553449005f9", - "result": "success" - } - - and finally the spend: sendtxid, scriptPubKey, musig - - ./hush-cli -ac_name=MUSIG cclib spend 18 '["5ce74037a153ee210413b48d4e88638b99825a2de1a1f1aa0d36ebf93019824c","210255c46dbce584e3751081b39d7fc054fc807100557e73fc444481618b5706afb4ac","a76f2790747ed2436a281f2660bdbee21bad9ee130b9cab6e542fa618fba1512679d568359db33a008ca39b773c32134276613e93e025ec17e083553449005f9"]' -{ - "scriptpubkey": "210255c46dbce584e3751081b39d7fc054fc807100557e73fc444481618b5706afb4ac", - "msg": "f7fb85d1412814e3c2f98b990802af6ee33dad368c6ba05c2050e9e5506fcd75", - "combined_pk": "03f016c348437c7422eed92d865aa9789614f75327cada463eefc566126b54785b", - "combinedsig": "a76f2790747ed2436a281f2660bdbee21bad9ee130b9cab6e542fa618fba1512679d568359db33a008ca39b773c32134276613e93e025ec17e083553449005f9", - "hex": "0400008085202f89014c821930f9eb360daaf1a1e12d5a82998b63884e8db4130421ee53a13740e75c000000007b4c79a276a072a26ba067a5658021032d29d6545a2aafad795d9cf50912ecade549137 -163934dfb2895ebc0e211ce8a81409671a60db89b3bc58966f3acc80194479b1a43d868e95a11ebc5609646d18710341a8ff92a7817571980307f5d660cc00a2735ac6333e0a7191243f1263f1959a100af03800112 -a10001ffffffff0200e1f5050000000023210255c46dbce584e3751081b39d7fc054fc807100557e73fc444481618b5706afb4ac0000000000000000686a4c6512792103f016c348437c7422eed92d865aa9789614f -75327cada463eefc566126b54785b40a76f2790747ed2436a281f2660bdbee21bad9ee130b9cab6e542fa618fba1512679d568359db33a008ca39b773c32134276613e93e025ec17e083553449005f900000000a805 -00000000000000000000000000", - "txid": "910635bf69a047fc90567a83ff12e47b753f470658b6d0855ec96e07e7349a8a", - "result": "success" -} -*/ - - -#define USE_BASIC_CONFIG -#define ENABLE_MODULE_MUSIG -#include "../secp256k1/src/basic-config.h" -#include "../secp256k1/include/secp256k1.h" -#include "../secp256k1/src/ecmult.h" -#include "../secp256k1/src/ecmult_gen.h" - -typedef struct { unsigned char data[64]; } secp256k1_schnorrsig; -struct secp256k1_context_struct { - secp256k1_ecmult_context ecmult_ctx; - secp256k1_ecmult_gen_context ecmult_gen_ctx; - secp256k1_callback illegal_callback; - secp256k1_callback error_callback; -}; - - -//#include "../secp256k1/include/secp256k1.h" -//#include "../secp256k1/include/secp256k1_schnorrsig.h" -#include "../secp256k1/include/secp256k1_musig.h" - -#define MUSIG_PREVN 0 // for now, just use vout0 for the musig output -#define MUSIG_TXFEE 10000 - -struct musig_info -{ - secp256k1_musig_session session; - secp256k1_pubkey combined_pk; - uint8_t *nonce_commitments,**commitment_ptrs; // 32*N_SIGNERS - secp256k1_musig_session_signer_data *signer_data; //[N_SIGNERS]; - secp256k1_pubkey *nonces; //[N_SIGNERS]; - secp256k1_musig_partial_signature *partial_sig; //[N_SIGNERS]; - int32_t myind,num,numcommits,numnonces,numpartials; - uint8_t msg[32],pkhash[32],combpk[33]; -}; - -std::vector MUSIG; - -struct musig_info *musig_infocreate(int32_t myind,int32_t num) -{ - int32_t i; struct musig_info *mp = (struct musig_info *)calloc(1,sizeof(*mp)); - mp->myind = myind, mp->num = num; - mp->nonce_commitments = (uint8_t *)calloc(num,32); - mp->commitment_ptrs = (uint8_t **)calloc(num,sizeof(*mp->commitment_ptrs)); - for (i=0; icommitment_ptrs[i] = &mp->nonce_commitments[i*32]; - mp->signer_data = (secp256k1_musig_session_signer_data *)calloc(num,sizeof(*mp->signer_data)); - mp->nonces = (secp256k1_pubkey *)calloc(num,sizeof(*mp->nonces)); - mp->partial_sig = (secp256k1_musig_partial_signature *)calloc(num,sizeof(*mp->partial_sig)); - return(mp); -} - -void musig_infofree(struct musig_info *mp) -{ -} - -CScript musig_sendopret(uint8_t funcid,CPubKey pk) -{ - CScript opret; - return(opret); -} - -uint8_t musig_sendopretdecode(CPubKey &pk,CScript scriptPubKey) -{ - return(0); -} - -CScript musig_spendopret(uint8_t funcid,CPubKey pk,std::vector musig64) -{ - CScript opret; - return(opret); -} - -uint8_t musig_spendopretdecode(CPubKey &pk,std::vector &musig64,CScript scriptPubKey) -{ - return(0); -} - -int32_t musig_parsepubkey(secp256k1_context *ctx,secp256k1_pubkey &spk,cJSON *item) -{ - return -1; -} - -int32_t musig_msghash(uint8_t *msg,uint256 prevhash,int32_t prevn,CTxOut vout,CPubKey pk) -{ - return(0); -} - -int32_t musig_prevoutmsg(uint8_t *msg,uint256 sendtxid,CScript scriptPubKey) -{ - return(-1); -} - -UniValue musig_calcmsg(uint64_t txfee,struct CCcontract_info *cp,cJSON *params) -{ - UniValue result(UniValue::VOBJ); - return result; -} - -UniValue musig_combine(uint64_t txfee,struct CCcontract_info *cp,cJSON *params) -{ - UniValue result(UniValue::VOBJ); - return result; -} - -UniValue musig_session(uint64_t txfee,struct CCcontract_info *cp,cJSON *params) -{ - UniValue result(UniValue::VOBJ); - return result; -} - -UniValue musig_commit(uint64_t txfee,struct CCcontract_info *cp,cJSON *params) -{ - UniValue result(UniValue::VOBJ); - return result; -} - -UniValue musig_nonce(uint64_t txfee,struct CCcontract_info *cp,cJSON *params) -{ - UniValue result(UniValue::VOBJ); - return result; -} - -UniValue musig_partialsig(uint64_t txfee,struct CCcontract_info *cp,cJSON *params) -{ - UniValue result(UniValue::VOBJ); - return result; -} - -//int testmain(void); -UniValue musig_verify(uint64_t txfee,struct CCcontract_info *cp,cJSON *params) -{ - UniValue result(UniValue::VOBJ); - return result; -} - -UniValue musig_rawtxresult(UniValue &result,std::string rawtx) -{ - UniValue result(UniValue::VOBJ); - return result; -} - -UniValue musig_send(uint64_t txfee,struct CCcontract_info *cp,cJSON *params) -{ - UniValue result(UniValue::VOBJ); - return result; -} - -UniValue musig_spend(uint64_t txfee,struct CCcontract_info *cp,cJSON *params) -{ - UniValue result(UniValue::VOBJ); - return result; -} - -bool musig_validate(struct CCcontract_info *cp,int32_t height,Eval *eval,const CTransaction tx) -{ - return false; -} From cb0a9800832f25aae8a9921a7ecc4619b178b651 Mon Sep 17 00:00:00 2001 From: Duke Date: Sat, 10 Feb 2024 12:36:28 -0500 Subject: [PATCH 048/108] Delete more CCs #381 --- src/cc/cclib.cpp | 76 +---- src/cc/heir_validate.h | 679 ----------------------------------------- 2 files changed, 2 insertions(+), 753 deletions(-) delete mode 100644 src/cc/heir_validate.h diff --git a/src/cc/cclib.cpp b/src/cc/cclib.cpp index 0fa2ae68a..35dae0adb 100644 --- a/src/cc/cclib.cpp +++ b/src/cc/cclib.cpp @@ -28,18 +28,9 @@ #include "core_io.h" #define FAUCET2SIZE COIN #define EVAL_FAUCET2 EVAL_FIRSTUSER -#ifdef BUILD_ROGUE -#define EVAL_ROGUE 17 -std::string MYCCLIBNAME = (char *)"rogue"; -#elif BUILD_CUSTOMCC +#ifdef BUILD_CUSTOMCC #include "customcc.h" - -#else -#define EVAL_SUDOKU 17 -#define EVAL_MUSIG 18 -#define EVAL_DILITHIUM 19 -std::string MYCCLIBNAME = (char *)"sudoku"; #endif #ifndef BUILD_GAMESCC @@ -147,74 +138,16 @@ int64_t AddCClibtxfee(struct CCcontract_info *cp,CMutableTransaction &mtx,CPubKe std::string Faucet2Fund(struct CCcontract_info *cp,uint64_t txfee,int64_t funds) { - CMutableTransaction mtx = CreateNewContextualCMutableTransaction(Params().GetConsensus(), hush_nextheight()); - CPubKey mypk,cclibpk; CScript opret; - if ( txfee == 0 ) - txfee = 10000; - mypk = pubkey2pk(Mypubkey()); - cclibpk = GetUnspendable(cp,0); - if ( AddNormalinputs2(mtx,funds+txfee,64) > 0 ) - { - mtx.vout.push_back(MakeCC1vout(cp->evalcode,funds,cclibpk)); - return(FinalizeCCTx(0,cp,mtx,mypk,txfee,opret)); - } return(""); } std::string CClib_rawtxgen(struct CCcontract_info *cp,uint8_t funcid,cJSON *params) { - CMutableTransaction tmpmtx,mtx = CreateNewContextualCMutableTransaction(Params().GetConsensus(), hush_nextheight()); - CPubKey mypk,cclibpk; int64_t funds,txfee=0,inputs,CCchange=0,nValue=FAUCET2SIZE; std::string rawhex; uint32_t j; int32_t i,len; uint8_t buf[32768]; bits256 hash; - if ( txfee == 0 ) - txfee = 10000; - if ( funcid == 'F' ) - { - if ( cJSON_GetArraySize(params) > 0 ) - { - funds = (int64_t)jdouble(jitem(params,0),0)*COIN + 0.0000000049; - return(Faucet2Fund(cp,0,funds)); - } else return(""); - } - else if ( funcid != 'G' ) - return(""); - cclibpk = GetUnspendable(cp,0); - mypk = pubkey2pk(Mypubkey()); - if ( (inputs= AddCClibInputs(cp,mtx,cclibpk,nValue+txfee,60,cp->unspendableCCaddr,1)) > 0 ) - { - if ( inputs > nValue ) - CCchange = (inputs - nValue - txfee); - if ( CCchange != 0 ) - mtx.vout.push_back(MakeCC1vout(EVAL_FAUCET2,CCchange,cclibpk)); - mtx.vout.push_back(CTxOut(nValue,CScript() << ParseHex(HexStr(mypk)) << OP_CHECKSIG)); - fprintf(stderr,"start at %u\n",(uint32_t)time(NULL)); - j = rand() & 0xfffffff; - for (i=0; i<1000000; i++,j++) - { - tmpmtx = mtx; - rawhex = FinalizeCCTx(-1LL,cp,tmpmtx,mypk,txfee,CScript() << OP_RETURN << E_MARSHAL(ss << (uint8_t)EVAL_FAUCET2 << (uint8_t)'G' << j)); - if ( (len= (int32_t)rawhex.size()) > 0 && len < 65536 ) - { - len >>= 1; - decode_hex(buf,len,(char *)rawhex.c_str()); - hash = bits256_doublesha256(0,buf,len); - if ( (hash.bytes[0] & 0xff) == 0 && (hash.bytes[31] & 0xff) == 0 ) - { - fprintf(stderr,"found valid txid after %d iterations %u\n",i,(uint32_t)time(NULL)); - return(rawhex); - } - //fprintf(stderr,"%02x%02x ",hash.bytes[0],hash.bytes[31]); - } - } - fprintf(stderr,"couldnt generate valid txid %u\n",(uint32_t)time(NULL)); - return(""); - } else fprintf(stderr,"cant find faucet inputs\n"); return(""); } UniValue cclib_error(UniValue &result,const char *errorstr) { - result.push_back(Pair("status","error")); - result.push_back(Pair("error",errorstr)); return(result); } @@ -227,12 +160,7 @@ uint256 juint256(cJSON *obj) int32_t cclib_parsehash(uint8_t *hash32,cJSON *item,int32_t len) { - char *hexstr; - if ( (hexstr= jstr(item,0)) != 0 && is_hexstr(hexstr,0) == len*2 ) - { - decode_hex(hash32,len,hexstr); - return(0); - } else return(-1); + return(0); } diff --git a/src/cc/heir_validate.h b/src/cc/heir_validate.h deleted file mode 100644 index 4e0a24668..000000000 --- a/src/cc/heir_validate.h +++ /dev/null @@ -1,679 +0,0 @@ -// Copyright (c) 2016-2023 The Hush developers -// Distributed under the GPLv3 software license, see the accompanying -// file COPYING or https://www.gnu.org/licenses/gpl-3.0.en.html -#ifndef HEIR_VALIDATE_H -#define HEIR_VALIDATE_H - -#include "CCinclude.h" -#include "CCHeir.h" - -#define IS_CHARINSTR(c, str) (std::string(str).find((char)(c)) != std::string::npos) - -// makes coin initial tx opret -vscript_t EncodeHeirCreateOpRet(uint8_t funcid, CPubKey ownerPubkey, CPubKey heirPubkey, int64_t inactivityTimeSec, std::string heirName, std::string memo); -vscript_t EncodeHeirOpRet(uint8_t funcid, uint256 fundingtxid, uint8_t isHeirSpendingBegan); - -uint256 FindLatestFundingTx(uint256 fundingtxid, uint256 &tokenid, CScript& opRetScript, uint8_t &isHeirSpendingBegan); -//uint8_t DecodeHeirOpRet(CScript scriptPubKey, uint256& fundingtxid, uint8_t &isHeirSpendingBegan, bool noLogging = false); -//uint8_t DecodeHeirOpRet(CScript scriptPubKey, CPubKey& ownerPubkey, CPubKey& heirPubkey, int64_t& inactivityTime, std::string& heirName, bool noLogging = false); -uint8_t DecodeHeirEitherOpRet(CScript scriptPubKey, uint256 &tokenid, CPubKey& ownerPubkey, CPubKey& heirPubkey, int64_t& inactivityTime, std::string& heirName, std::string& memo, bool noLogging = false); -uint8_t DecodeHeirEitherOpRet(CScript scriptPubKey, uint256 &tokenid, uint256 &fundingTxidInOpret, uint8_t &hasHeirSpendingBegun, bool noLogging = false); - -inline static bool isMyFuncId(uint8_t funcid) { return IS_CHARINSTR(funcid, "FAC"); } -inline static bool isSpendingTx(uint8_t funcid) { return (funcid == 'C'); } - -// helper class to allow polymorphic behaviour for HeirXXX() functions in case of coins -class CoinHelper { -public: - - static uint8_t getMyEval() { return EVAL_HEIR; } - static int64_t addOwnerInputs(uint256 dummyid, CMutableTransaction& mtx, CPubKey ownerPubkey, int64_t total, int32_t maxinputs) { - return AddNormalinputs(mtx, ownerPubkey, total, maxinputs); - } - - static CScript makeCreateOpRet(uint256 dummyid, std::vector dummyPubkeys, CPubKey ownerPubkey, CPubKey heirPubkey, int64_t inactivityTimeSec, std::string heirName, std::string memo) { - return CScript() << OP_RETURN << EncodeHeirCreateOpRet((uint8_t)'F', ownerPubkey, heirPubkey, inactivityTimeSec, heirName, memo); - } - static CScript makeAddOpRet(uint256 dummyid, std::vector dummyPubkeys, uint256 fundingtxid, uint8_t isHeirSpendingBegan) { - return CScript() << OP_RETURN << EncodeHeirOpRet((uint8_t)'A', fundingtxid, isHeirSpendingBegan); - } - static CScript makeClaimOpRet(uint256 dummyid, std::vector dummyPubkeys, uint256 fundingtxid, uint8_t isHeirSpendingBegan) { - return CScript() << OP_RETURN << EncodeHeirOpRet((uint8_t)'C', fundingtxid, isHeirSpendingBegan); - } - static CTxOut make1of2Vout(int64_t amount, CPubKey ownerPubkey, CPubKey heirPubkey) { - return MakeCC1of2vout(EVAL_HEIR, amount, ownerPubkey, heirPubkey); - } - static CTxOut makeUserVout(int64_t amount, CPubKey myPubkey) { - return CTxOut(amount, CScript() << ParseHex(HexStr(myPubkey)) << OP_CHECKSIG); - } - /* static CTxOut makeClaimerVout(int64_t amount, CPubKey myPubkey) { - return CTxOut(amount, CScript() << ParseHex(HexStr(myPubkey)) << OP_CHECKSIG); - } */ - static bool GetCoinsOrTokensCCaddress1of2(char *coinaddr, CPubKey ownerPubkey, CPubKey heirPubkey) { - struct CCcontract_info *cpHeir, heirC; - cpHeir = CCinit(&heirC, EVAL_HEIR); - return GetCCaddress1of2(cpHeir, coinaddr, ownerPubkey, heirPubkey); - } - static void CCaddrCoinsOrTokens1of2set(struct CCcontract_info *cp, CPubKey ownerPubkey, CPubKey heirPubkey, char *coinaddr) - { - uint8_t mypriv[32]; - Myprivkey(mypriv); - CCaddr1of2set(cp, ownerPubkey, heirPubkey,mypriv, coinaddr); - memset(mypriv,0,sizeof(mypriv)); - } -}; - -// helper class to allow polymorphic behaviour for HeirXXX() functions in case of tokens -class TokenHelper { -public: - static uint8_t getMyEval() { return EVAL_TOKENS; } - static int64_t addOwnerInputs(uint256 tokenid, CMutableTransaction& mtx, CPubKey ownerPubkey, int64_t total, int32_t maxinputs) { - /* - struct CCcontract_info *cpHeir, heirC; - cpHeir = CCinit(&heirC, EVAL_TOKENS); - return AddTokenCCInputs(cpHeir, mtx, ownerPubkey, tokenid, total, maxinputs); - */ - return 0; - } - - static CScript makeCreateOpRet(uint256 tokenid, std::vector voutTokenPubkeys, CPubKey ownerPubkey, CPubKey heirPubkey, int64_t inactivityTimeSec, std::string heirName, std::string memo) { - return EncodeTokenOpRet(tokenid, voutTokenPubkeys, - std::make_pair(OPRETID_HEIRDATA, EncodeHeirCreateOpRet((uint8_t)'F', ownerPubkey, heirPubkey, inactivityTimeSec, heirName, memo))); - } - static CScript makeAddOpRet(uint256 tokenid, std::vector voutTokenPubkeys, uint256 fundingtxid, uint8_t isHeirSpendingBegan) { - return EncodeTokenOpRet(tokenid, voutTokenPubkeys, - std::make_pair(OPRETID_HEIRDATA, EncodeHeirOpRet((uint8_t)'A', fundingtxid, isHeirSpendingBegan))); - } - static CScript makeClaimOpRet(uint256 tokenid, std::vector voutTokenPubkeys, uint256 fundingtxid, uint8_t isHeirSpendingBegan) { - return EncodeTokenOpRet(tokenid, voutTokenPubkeys, - std::make_pair(OPRETID_HEIRDATA, EncodeHeirOpRet((uint8_t)'C', fundingtxid, isHeirSpendingBegan))); - } - - static CTxOut make1of2Vout(int64_t amount, CPubKey ownerPubkey, CPubKey heirPubkey) { - return MakeTokensCC1of2vout(EVAL_HEIR, amount, ownerPubkey, heirPubkey); - } - static CTxOut makeUserVout(int64_t amount, CPubKey myPubkey) { - return MakeCC1vout(EVAL_TOKENS, amount, myPubkey); // yes EVAL_TOKENS - } - /* static CTxOut makeClaimerVout(int64_t amount, CPubKey myPubkey) { - return MakeCC1vout(EVAL_TOKENS, amount, myPubkey); // yes EVAL_TOKENS - } */ - static bool GetCoinsOrTokensCCaddress1of2(char *coinaddr, CPubKey ownerPubkey, CPubKey heirPubkey) { - struct CCcontract_info *cpHeir, heirC; - cpHeir = CCinit(&heirC, EVAL_HEIR); - return GetTokensCCaddress1of2(cpHeir, coinaddr, ownerPubkey, heirPubkey); - } - - static void CCaddrCoinsOrTokens1of2set(struct CCcontract_info *cp, CPubKey ownerPubkey, CPubKey heirPubkey, char *coinaddr) { - uint8_t mypriv[32]; - Myprivkey(mypriv); - CCaddrTokens1of2set(cp, ownerPubkey, heirPubkey, mypriv, coinaddr); - memset(mypriv,0,sizeof(mypriv)); - } -}; - - -/** - * Small framework for vins and vouts validation implementing a variation of 'chain of responsibility' pattern: - * It consists of two classes CInputValidationPlan and COutputValidationPlan which both are configured with an array of vectors of validators - * (These validators are derived from the class CValidatorBase). - * - * A example of a validator may verify for a vout if its public key corresponds to the public key which is stored in opreturn. - * Or, vin validator may check if this vin depicts correctly to the CC contract's address. - * - * For validating vins CInputValidator additionally is provided with an instance of a class derived from the CInputIdentifierBase class. - * this identifier class allows to select identical vins (for example, normal vins or cc input vins) and apply validators from the corresponding vector to it. - * Note: CInputValidator treats that at least one identified vin should be present, otherwise it returns eval->invalid() and false. - * - * For validating vouts COutputValidator is configured for each vector of validators with the vout index to which these validators are applied - * (see constructors of both CInputValidator and COutputValidator) - */ - -/** - * base class for all validators - */ -class CValidatorBase -{ -public: - CValidatorBase(CCcontract_info* cp) : m_cp(cp) {} - virtual bool isVinValidator() const = 0; - virtual bool validateVin(CTxIn vin, std::vector prevVout, int32_t prevN, std::string& message) const = 0; - virtual bool validateVout(CTxOut vout, int32_t vout_n, std::string& message) const = 0; - -protected: - CCcontract_info * m_cp; -}; - -/** - * Base class for classes which identify vins as normal or cc inputs - */ -class CInputIdentifierBase -{ -public: - CInputIdentifierBase(CCcontract_info* cp) : m_cp(cp) {} - virtual std::string inputName() const = 0; - virtual bool identifyInput(CTxIn vin) const = 0; -protected: - CCcontract_info * m_cp; -}; - -/** - * Encapsulates an array containing rows of validators - * Each row is a vector of validators (zero is possible) for validating vins or prev tx's vouts - * this validation plan is used for validating tx inputs - */ -template -class CInputValidationPlan -{ - using ValidatorsRow = std::vector; - -public: - - // Pushes a row of validators for validating a vin or vout - // @param CInputIdentifierBase* pointer to class-identifier which determines several identical adjacent vins (like in schema "vin.0+: normal inputs") - // @param pargs parameter pack of zero or more pointer to validator objects - // Why pointers? because we store the base class in validators' row and then call its virtual functions - template - void pushValidators(CInputIdentifierBase *identifier, ARGS*... pargs) // validators row passed as variadic arguments CValidatorX *val1, CValidatorY *val2 ... - { - ValidatorsRow vValidators({ (TValidatorBase*)pargs... }); - m_arrayValidators.push_back(std::make_pair(identifier, vValidators)); - } - - // validate tx inputs and corresponding prev tx vouts - bool validate(const CTransaction& tx, Eval* eval) - { - std::string message = ""; - //std::cerr << "CInputValidationPlan::validate() starting vins validation..." << std::endl; - - int32_t ival = 0; - int32_t iv = 0; - int32_t numv = tx.vin.size(); - int32_t numValidators = m_arrayValidators.size(); - - // run over vins: - while (iv < numv && ival < numValidators) { - - int32_t identifiedCount = 0; - CInputIdentifierBase *identifier = m_arrayValidators[ival].first; - // check if this is 'our' input: - while (iv < numv && identifier->identifyInput(tx.vin[iv])) { - - // get prev tx: - CTransaction prevTx, *pPrevTxOrNull = NULL; - uint256 hashBlock; - - if (!eval->GetTxUnconfirmed(tx.vin[iv].prevout.hash, prevTx, hashBlock)) { - std::ostringstream stream; - stream << "can't find vinTx for vin=" << iv << "."; - return eval->Invalid(stream.str().c_str()); - } - pPrevTxOrNull = &prevTx; // TODO: get prev tx only if it required (i.e. if vout validators are present) - - // exec 'validators' from validator row of ival index, for tx.vin[iv] - if (!execValidatorsInRow(&tx, pPrevTxOrNull, iv, ival, message)) { - std::ostringstream stream; - stream << "invalid tx vin[" << iv << "]:" << message; - return eval->Invalid(stream.str().c_str()); // ... if not, return 'invalid' - } - - identifiedCount++; // how many vins we identified - iv++; // advance to the next vin - } - - // CInputValidationPlan treats that there must be at least one identified vin for configured validators' row - // like in 'vin.0: normal input' - if (identifiedCount == 0) { - std::ostringstream stream; - stream << "can't find required vins for " << identifier->inputName() << "."; - return eval->Invalid(stream.str().c_str()); - } - - ival++; // advance to the next validator row - // and it will try the same vin with the new CInputIdentifierBase and validators row - } - - // validation is successful if all validators have been used (i.e. ival = numValidators) - if (ival < numValidators) { - std::cerr << "CInputValidationPlan::validate() incorrect tx" << " ival=" << ival << " numValidators=" << numValidators << std::endl; - return eval->Invalid("incorrect tx structure: not all required vins are present."); - } - - //std::cerr << "CInputValidationPlan::validate() returns with true" << std::endl; - return true; - } - -private: - // Executes validators from the requested row of validators (selected by iValidators) for selected vin or vout (selected by iv) - bool execValidatorsInRow(const CTransaction* pTx, const CTransaction* pPrevTx, int32_t iv, int32_t ival, std::string& refMessage) const - { - // check boundaries: - if (ival < 0 || ival >= m_arrayValidators.size()) { - std::cerr << "CInputValidationPlan::execValidatorsInRow() internal error: incorrect param ival=" << ival << " size=" << m_arrayValidators.size(); - refMessage = "internal error: incorrect param ival index"; - return false; - } - - if (iv < 0 || iv >= pTx->vin.size()) { - std::cerr << "CInputValidationPlan::execValidatorsInRow() internal error: incorrect param iv=" << iv << " size=" << m_arrayValidators.size(); - refMessage = "internal error: incorrect param iv index"; - return false; - } - - // get requested row of validators: - ValidatorsRow vValidators = m_arrayValidators[ival].second; - - //std::cerr << "CInputValidationPlan::execValidatorsInRow() calling validators" << " for vin iv=" << iv << " ival=" << ival << std::endl; - - for (auto v : vValidators) { - bool result; - - if (v->isVinValidator()) - // validate this vin and previous vout: - result = v->validateVin(pTx->vin[iv], pPrevTx->vout, pTx->vin[iv].prevout.n, refMessage); - else - // if it is vout validator pass the previous tx vout: - result = v->validateVout( pPrevTx->vout[pTx->vin[iv].prevout.n], pTx->vin[iv].prevout.n, refMessage); - if (!result) { - return result; - } - } - return true; // validation OK - } - - -private: - //std::map m_arrayValidators; - std::vector< std::pair > m_arrayValidators; - -}; - - -/** - * Encapsulates an array containing rows of validators - * Each row is a vector of validators (zero is possible) for validating vouts - * this validation plan is used for validating tx outputs - */ -template -class COutputValidationPlan -{ - using ValidatorsRow = std::vector; - -public: - // Pushes a row of validators for validating a vout - // @param ivout index to vout to validate - // @param pargs parameter pack of zero or more pointer to validator objects - // Why pointers? because we store base class and call its virtual functions - - template - void pushValidators(int32_t ivout, ARGS*... pargs) // validators row passed as variadic arguments CValidatorX *val1, CValidatorY *val2 ... - { - ValidatorsRow vValidators({ (TValidatorBase*)pargs... }); - m_arrayValidators.push_back(std::make_pair(ivout, vValidators)); - } - - // validate tx outputs - bool validate(const CTransaction& tx, Eval* eval) - { - std::string message = ""; - //std::cerr << "COutputValidationPlan::validateOutputs() starting vouts validation..." << std::endl; - - int32_t ival = 0; - int32_t numVouts = tx.vout.size(); - int32_t numValidators = m_arrayValidators.size(); - - // run over vouts: - while (ival < numValidators) { - - int32_t ivout = m_arrayValidators[ival].first; - if (ivout >= numVouts) { - std::cerr << "COutputValidationPlan::validate() incorrect tx" << "for ival=" << ival << " in tx.vout no such ivout=" << ivout << std::endl; - return eval->Invalid("incorrect tx structure: not all required vouts are present."); - } - else - { - // exec 'validators' from validator row of ival index, for tx.vout[ivout] - if (!execValidatorsInRow(&tx, ivout, ival, message)) { - std::ostringstream stream; - stream << "invalid tx vout[" << ivout << "]:" << message; - return eval->Invalid(stream.str().c_str()); // ... if not, return 'invalid' - } - } - ival++; // advance to the next vout - } - //std::cerr << "COutputValidationPlan::validate() returns with true" << std::endl; - return true; - } - -private: - // Executes validators from the requested row of validators (selected by iValidators) for selected vin or vout (selected by iv) - bool execValidatorsInRow(const CTransaction* pTx, int32_t iv, int32_t ival, std::string& refMessage) const - { - // check boundaries: - if (ival < 0 || ival >= m_arrayValidators.size()) { - std::cerr << "COutputValidationPlan::execValidatorsInRow() internal error: incorrect param ival=" << ival << " size=" << m_arrayValidators.size(); - refMessage = "internal error: incorrect param ival index"; - return false; - } - - if (iv < 0 || iv >= pTx->vout.size()) { - std::cerr << "COutputValidationPlan::execValidatorsInRow() internal error: incorrect param iv=" << iv << " size=" << m_arrayValidators.size(); - refMessage = "internal error: incorrect param iv index"; - return false; - } - - // get requested row of validators: - ValidatorsRow vValidators = m_arrayValidators[ival].second; - - //std::cerr << "COutputValidationPlan::execRow() calling validators" << " for vout iv=" << iv << " ival=" << ival << std::endl; - - for (auto v : vValidators) { - - if (!v->isVinValidator()) { - // if this is a 'in' validation plan then pass the previous tx vout: - bool result = v->validateVout(pTx->vout[iv], iv, refMessage); - if (!result) - return result; - } - } - return true; // validation OK - } - -private: - //std::map m_mapValidators; - std::vector< std::pair > m_arrayValidators; - -}; - -class CNormalInputIdentifier : CInputIdentifierBase { -public: - CNormalInputIdentifier(CCcontract_info* cp) : CInputIdentifierBase(cp) {} - virtual std::string inputName() const { return std::string("normal input"); } - virtual bool identifyInput(CTxIn vin) const { - return !IsCCInput(vin.scriptSig); - } -}; - -class CCCInputIdentifier : CInputIdentifierBase { -public: - CCCInputIdentifier(CCcontract_info* cp) : CInputIdentifierBase(cp) {} - virtual std::string inputName() const { return std::string("CC input"); } - virtual bool identifyInput(CTxIn vin) const { - return IsCCInput(vin.scriptSig); - } -}; - - -/** - * Validates 1of2address for vout (may be used for either this or prev tx) - */ -template class CCC1of2AddressValidator : CValidatorBase -{ -public: - CCC1of2AddressValidator(CCcontract_info* cp, CScript opRetScript, std::string customMessage = "") : - m_fundingOpretScript(opRetScript), m_customMessage(customMessage), CValidatorBase(cp) {} - - virtual bool isVinValidator() const { return false; } - virtual bool validateVout(CTxOut vout, int32_t vout_n, std::string& message) const - { - //std::cerr << "CCC1of2AddressValidator::validateVout() entered" << std::endl; - CPubKey ownerPubkey, heirPubkey; - int64_t inactivityTime; - std::string heirName, memo; - uint256 tokenid; - - uint8_t funcId = DecodeHeirEitherOpRet(m_fundingOpretScript, tokenid, ownerPubkey, heirPubkey, inactivityTime, heirName, memo, true); - if (funcId == 0) { - message = m_customMessage + std::string(" invalid opreturn format"); - std::cerr << "CCC1of2AddressValidator::validateVout() exits with false: " << message << std::endl; - return false; - } - - char shouldBeAddr[65], ccAddr[65]; - - //GetCCaddress1of2(m_cp, shouldBeAddr, ownerPubkey, heirPubkey); - Helper::GetCoinsOrTokensCCaddress1of2(shouldBeAddr, ownerPubkey, heirPubkey); - - if (vout.scriptPubKey.IsPayToCryptoCondition()) { - if (Getscriptaddress(ccAddr, vout.scriptPubKey) && strcmp(shouldBeAddr, ccAddr) == 0) { - //std::cerr << "CCC1of2AddressValidator::validateVout() exits with true" << std::endl; - return true; - } - else { - message = m_customMessage + std::string(" incorrect heir funding address: incorrect pubkey(s)"); - } - } - else { - message = m_customMessage + std::string(" incorrect heir funding address: not a 1of2addr"); - } - - std::cerr << "CCC1of2AddressValidator::validateVout() exits with false: " << message << std::endl; - return false; - } - virtual bool validateVin(CTxIn vin, std::vector prevVout, int32_t prevN, std::string& message) const { return false; } - -private: - CScript m_fundingOpretScript; - std::string m_customMessage; -}; - - -/** - * Validates if this is vout to owner or heir from opret (funding or change) - */ -template class CMyPubkeyVoutValidator : CValidatorBase -{ -public: - CMyPubkeyVoutValidator(CCcontract_info* cp, CScript opRetScript, bool checkNormals) - : m_fundingOpretScript(opRetScript), m_checkNormals(checkNormals), CValidatorBase(cp) { } - - virtual bool isVinValidator() const { return false; } - virtual bool validateVout(CTxOut vout, int32_t vout_n, std::string& message) const - { - //std::cerr << "CMyPubkeyVoutValidator::validateVout() entered" << std::endl; - - CPubKey ownerPubkey, heirPubkey; - int64_t inactivityTime; - std::string heirName, memo; - uint256 tokenid; - - ///std::cerr << "CMyPubkeyVoutValidator::validateVout() m_opRetScript=" << m_opRetScript.ToString() << std::endl; - - // get both pubkeys: - uint8_t funcId = DecodeHeirEitherOpRet(m_fundingOpretScript, tokenid, ownerPubkey, heirPubkey, inactivityTime, heirName, memo, true); - if (funcId == 0) { - message = std::string("invalid opreturn format"); - return false; - } - - CScript ownerScript; - CScript heirScript; - if (m_checkNormals) { //not used, incorrect check, too strict - ownerScript = CoinHelper::makeUserVout(vout.nValue, ownerPubkey).scriptPubKey; - heirScript = CoinHelper::makeUserVout(vout.nValue, heirPubkey).scriptPubKey; - std::cerr << "CMyPubkeyVoutValidator::validateVout() vout.scriptPubKey=" << vout.scriptPubKey.ToString() << " makeUserVout(coin,owner)=" << CoinHelper::makeUserVout(vout.nValue, ownerPubkey).scriptPubKey.ToString() << " makeUserVout(coin,heir)=" << CoinHelper::makeUserVout(vout.nValue, heirPubkey).scriptPubKey.ToString() << std::endl; - } - else { - ownerScript = Helper::makeUserVout(vout.nValue, ownerPubkey).scriptPubKey; - heirScript = Helper::makeUserVout(vout.nValue, heirPubkey).scriptPubKey; - std::cerr << "CMyPubkeyVoutValidator::validateVout() vout.scriptPubKey=" << vout.scriptPubKey.ToString() << " makeUserVout(owner)=" << Helper::makeUserVout(vout.nValue, ownerPubkey).scriptPubKey.ToString() << " makeUserVout(heir)=" << Helper::makeUserVout(vout.nValue, heirPubkey).scriptPubKey.ToString() << std::endl; - } - - // recreate scriptPubKey for owner and heir and compare it with that of the vout to check: - if (vout.scriptPubKey == ownerScript || vout.scriptPubKey == heirScript) { - // this is vout to owner or heir addr: - //std::cerr << "CMyPubkeyVoutValidator::validateVout() exits with true" << std::endl; - return true; - } - - std::cerr << "CMyPubkeyVoutValidator::validateVout() exits with false (not the owner's or heir's addresses)" << std::endl; - message = std::string("invalid pubkey"); - return false; - } - virtual bool validateVin(CTxIn vin, std::vector prevVout, int32_t prevN, std::string& message) const { return true; } - -private: - CScript m_fundingOpretScript; - //uint256 m_lasttxid; - bool m_checkNormals; -}; - -/** - * Check if the user is the heir and the heir is allowed to spend (duration > inactivityTime) - */ -template class CHeirSpendValidator : CValidatorBase -{ -public: - CHeirSpendValidator(CCcontract_info* cp, CScript opRetScript, uint256 latesttxid, uint8_t isHeirSpendingBegan) - : m_fundingOpretScript(opRetScript), m_latesttxid(latesttxid), m_isHeirSpendingBegan(isHeirSpendingBegan), CValidatorBase(cp) {} - - virtual bool isVinValidator() const { return false; } - virtual bool validateVout(CTxOut vout, int32_t vout_n, std::string& message) const - { - //std::cerr << "CHeirSpendValidator::validateVout() entered" << std::endl; - - CPubKey ownerPubkey, heirPubkey; - int64_t inactivityTime; - std::string heirName, memo; - uint256 tokenid; - - // get heir pubkey: - uint8_t funcId = DecodeHeirEitherOpRet(m_fundingOpretScript, tokenid, ownerPubkey, heirPubkey, inactivityTime, heirName, memo, true); - if (funcId == 0) { - message = std::string("invalid opreturn format"); - return false; - } - - int32_t numblocks; - int64_t durationSec = CCduration(numblocks, m_latesttxid); - - // recreate scriptPubKey for heir and compare it with that of the vout: - if (vout.scriptPubKey == Helper::makeUserVout(vout.nValue, heirPubkey).scriptPubKey) { - // this is the heir is trying to spend - if (!m_isHeirSpendingBegan && durationSec <= inactivityTime) { - message = "heir is not allowed yet to spend funds"; - std::cerr << "CHeirSpendValidator::validateVout() heir is not allowed yet to spend funds" << std::endl; - return false; - } - else { - // heir is allowed to spend - return true; - } - } - - //std::cerr << "CHeirSpendValidator::validateVout() exits with true" << std::endl; - - // this is not heir: - return true; - } - virtual bool validateVin(CTxIn vin, std::vector prevVout, int32_t prevN, std::string& message) const { return true; } - -private: - CScript m_fundingOpretScript; - uint256 m_latesttxid; - uint8_t m_isHeirSpendingBegan; -}; - -/** - * Validates this opreturn and compares it with the opreturn from the previous tx - */ -template class COpRetValidator : CValidatorBase -{ -public: - COpRetValidator(CCcontract_info* cp, CScript opret) - : m_fundingOpretScript(opret), CValidatorBase(cp) {} - - virtual bool isVinValidator() const { return false; } - virtual bool validateVout(CTxOut vout, int32_t vout_n, std::string& message) const - { - //std::cerr << "COpRetValidator::validateVout() entered" << std::endl; - - uint256 fundingTxidInOpret = zeroid, dummyTxid, tokenid = zeroid, initialTokenid = zeroid; - uint8_t dummyIsHeirSpendingBegan; - - uint8_t funcId = DecodeHeirEitherOpRet(vout.scriptPubKey, tokenid, fundingTxidInOpret, dummyIsHeirSpendingBegan, true); - if (funcId == 0) { - message = std::string("invalid opreturn format"); - return false; - } - - uint8_t initialFuncId = DecodeHeirEitherOpRet(m_fundingOpretScript, initialTokenid, dummyTxid, dummyIsHeirSpendingBegan, true); - if (initialFuncId == 0) { - message = std::string("invalid initial tx opreturn format"); - return false; - } - - // validation rules: - if (!isMyFuncId(funcId)) { - message = std::string("invalid funcid in opret"); - return false; - } - - if (typeid(Helper) == typeid(TokenHelper)) { - if (tokenid != initialTokenid) { - message = std::string("invalid tokenid in opret"); - return false; - } - } - - //std::cerr << "COpRetValidator::validateVout() exits with true" << std::endl; - return true; - } - virtual bool validateVin(CTxIn vin, std::vector prevVout, int32_t prevN, std::string& message) const { return true; } - -private: - CScript m_fundingOpretScript; -}; - - -/** - * marker spending prevention validator, - * returns false if for tx with funcid=F vout.1 is being tried to spend - */ -template class CMarkerValidator : CValidatorBase -{ -public: - CMarkerValidator(CCcontract_info* cp) - : CValidatorBase(cp) { } - - virtual bool isVinValidator() const { return true; } // this is vin validator - virtual bool validateVout(CTxOut vout, int32_t vout_n, std::string& message) const { return true; } - virtual bool validateVin(CTxIn vin, std::vector prevVout, int32_t prevN, std::string& message) const { - - uint256 fundingTxidInOpret = zeroid, dummyTxid, tokenid = zeroid, initialTokenid = zeroid; - uint8_t dummyIsHeirSpendingBegan; - - //std::cerr << "CMarkerValidator::validateVin() prevVout.size()=" << prevVout.size() << " prevN=" << prevN << std::endl; - if (prevVout.size() > 0) { - - // get funcId for prev tx: - uint8_t funcId = DecodeHeirEitherOpRet(prevVout[prevVout.size()-1].scriptPubKey, tokenid, fundingTxidInOpret, dummyIsHeirSpendingBegan, true); - - //std::cerr << "CMarkerValidator::validateVin() funcId=" << (funcId?funcId:' ') << std::endl; - - if (funcId == 'F' && prevN == 1) { // do not allow to spend 'F' marker's vout - message = std::string("spending marker not allowed"); - return false; - } - } - //std::cerr << "CMarkerValidator::validateVin() exits with true" << std::endl; - return true; - } -}; - -/** - * empty validator always returns true - */ -template class CNullValidator : CValidatorBase -{ -public: - CNullValidator(CCcontract_info* cp) - : CValidatorBase(cp) { } - - virtual bool isVinValidator() const { return false; } - virtual bool validateVout(CTxOut vout, int32_t vout_n, std::string& message) const { return true; } - virtual bool validateVin(CTxIn vin, std::vector prevVout, int32_t prevN, std::string& message) const { return true; } -}; - - -#endif From 5b9906539d7100ab8a27ab8e323b81fdd06139f2 Mon Sep 17 00:00:00 2001 From: Duke Date: Sat, 10 Feb 2024 12:44:47 -0500 Subject: [PATCH 049/108] Delete more CCs #381 --- src/cc/eval.cpp | 99 +++--------------------------------------------- src/cc/makegames | 7 ---- src/cc/makerogue | 39 ------------------- 3 files changed, 5 insertions(+), 140 deletions(-) delete mode 100755 src/cc/makegames delete mode 100755 src/cc/makerogue diff --git a/src/cc/eval.cpp b/src/cc/eval.cpp index c4b3cde79..9c8aeb22b 100644 --- a/src/cc/eval.cpp +++ b/src/cc/eval.cpp @@ -37,32 +37,6 @@ extern pthread_mutex_t HUSH_CC_mutex; bool RunCCEval(const CC *cond, const CTransaction &tx, unsigned int nIn) { - EvalRef eval; - pthread_mutex_lock(&HUSH_CC_mutex); - bool out = eval->Dispatch(cond, tx, nIn); - pthread_mutex_unlock(&HUSH_CC_mutex); - if ( eval->state.IsValid() != out) - fprintf(stderr,"out %d vs %d isValid\n",(int32_t)out,(int32_t)eval->state.IsValid()); - //assert(eval->state.IsValid() == out); - - if (eval->state.IsValid()) return true; - - std::string lvl = eval->state.IsInvalid() ? "Invalid" : "Error!"; - fprintf(stderr, "CC Eval %s %s: %s spending tx %s\n", - EvalToStr(cond->code[0]).data(), - lvl.data(), - eval->state.GetRejectReason().data(), - tx.vin[nIn].prevout.hash.GetHex().data()); - if (eval->state.IsError()) fprintf(stderr, "Culprit: %s\n", EncodeHexTx(tx).data()); - CTransaction tmp; - if (mempool.lookup(tx.GetHash(), tmp)) - { - // This is to remove a payments airdrop if it gets stuck in the mempool. - // Miner will mine 1 invalid block, but doesnt stop them mining until a restart. - // This would almost never happen in normal use. - std::list dummy; - mempool.remove(tx,dummy,true); - } return false; } @@ -72,51 +46,7 @@ bool RunCCEval(const CC *cond, const CTransaction &tx, unsigned int nIn) */ bool Eval::Dispatch(const CC *cond, const CTransaction &txTo, unsigned int nIn) { - struct CCcontract_info *cp; - if (cond->codeLength == 0) - return Invalid("empty-eval"); - - uint8_t ecode = cond->code[0]; - if ( ASSETCHAINS_CCDISABLES[ecode] != 0 ) - { - // check if a height activation has been set. - if ( mapHeightEvalActivate[ecode] == 0 || this->GetCurrentHeight() == 0 || mapHeightEvalActivate[ecode] > this->GetCurrentHeight() ) - { - fprintf(stderr,"%s evalcode.%d %02x\n",txTo.GetHash().GetHex().c_str(),ecode,ecode); - fprintf(stderr, "ac_ccactivateht: evalcode.%i activates at height.%i vs current height.%i\n", ecode, mapHeightEvalActivate[ecode], this->GetCurrentHeight()); - return Invalid("disabled-code, -ac_ccenables didnt include this ecode"); - } - } - std::vector vparams(cond->code+1, cond->code+cond->codeLength); - if ( ecode >= EVAL_FIRSTUSER && ecode <= EVAL_LASTUSER ) - { - if ( ASSETCHAINS_CCLIB.size() > 0 && ASSETCHAINS_CCLIB == CClib_name() ) - return CClib_Dispatch(cond,this,vparams,txTo,nIn); - else return Invalid("mismatched -ac_cclib vs CClib_name"); - } - cp = &CCinfos[(int32_t)ecode]; - if ( cp->didinit == 0 ) - { - CCinit(cp,ecode); - cp->didinit = 1; - } - - switch ( ecode ) - { - /* - case EVAL_IMPORTPAYOUT: - return ImportPayout(vparams, txTo, nIn); - break; - - case EVAL_IMPORTCOIN: - return ImportCoin(vparams, txTo, nIn); - break; - */ - default: - return(ProcessCC(cp,this, vparams, txTo, nIn)); - break; - } - return Invalid("invalid-code, dont forget to add EVAL_NEWCC to Eval::Dispatch"); + return false; } @@ -129,21 +59,13 @@ bool Eval::GetSpendsConfirmed(uint256 hash, std::vector &spends) c bool Eval::GetTxUnconfirmed(const uint256 &hash, CTransaction &txOut, uint256 &hashBlock) const { - return(myGetTransaction(hash, txOut,hashBlock)); - /*if (!myGetTransaction(hash, txOut,hashBlock)) { - return(myGetTransaction(hash, txOut,hashBlock)); - } else return(true);*/ + return false; } bool Eval::GetTxConfirmed(const uint256 &hash, CTransaction &txOut, CBlockIndex &block) const { - uint256 hashBlock; - if (!GetTxUnconfirmed(hash, txOut, hashBlock)) - return false; - if (hashBlock.IsNull() || !GetBlock(hashBlock, block)) - return false; - return true; + return false; } unsigned int Eval::GetCurrentHeight() const @@ -153,12 +75,6 @@ unsigned int Eval::GetCurrentHeight() const bool Eval::GetBlock(uint256 hash, CBlockIndex& blockIdx) const { - auto r = mapBlockIndex.find(hash); - if (r != mapBlockIndex.end()) { - blockIdx = *r->second; - return true; - } - fprintf(stderr, "CC Eval Error: Can't get block from index\n"); return false; } @@ -172,13 +88,7 @@ int32_t Eval::GetNotaries(uint8_t pubkeys[64][33], int32_t height, uint32_t time bool Eval::CheckNotaryInputs(const CTransaction &tx, uint32_t height, uint32_t timestamp) const { - if (tx.vin.size() < 11) return false; - - CrosschainAuthority auth; - auth.requiredSigs = 11; - auth.size = GetNotaries(auth.notaries, height, timestamp); - - return CheckTxAuthority(tx, auth); + return false; } // Get MoM from a notarization tx hash (on HUSH) @@ -208,6 +118,7 @@ std::string Eval::GetAssetchainsSymbol() const /* * Notarization data, ie, OP_RETURN payload in notarization transactions */ +// This is used by notarizationdb.cpp bool ParseNotarizationOpReturn(const CTransaction &tx, NotarizationData &data) { if (tx.vout.size() < 2) return false; diff --git a/src/cc/makegames b/src/cc/makegames deleted file mode 100755 index b4b8cb803..000000000 --- a/src/cc/makegames +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/sh -gcc -O3 -DBUILD_GAMESCC -std=c++11 -I../secp256k1/include -I../univalue/include -I../cryptoconditions/include -I../cryptoconditions/src -I../cryptoconditions/src/asn -I.. -I. -fPIC -shared -c -o gamescc.so cclib.cpp -cp gamescc.so ../libcc.so -cd .. -make -cd cc - diff --git a/src/cc/makerogue b/src/cc/makerogue deleted file mode 100755 index 99b4f889f..000000000 --- a/src/cc/makerogue +++ /dev/null @@ -1,39 +0,0 @@ -#!/bin/sh -# Copyright 2016-2023 The Hush developers -cd rogue; -make clean; - -if [ "$HOST" = "x86_64-w64-mingw32" ]; then - echo "Not supported" - exit 1 - ./configure --host=x86_64-w64-mingw32 - echo $PWD - # wget ... - tar xvfz x86_64-w64-mingw32.tar.gz && rm x86_64-w64-mingw32.tar.gz - echo lib archive cleaned - echo $PWD - if make -f Makefile_win "$@"; then - echo rogue.exe build SUCCESSFUL - cd .. - else - echo rogue.exe build FAILED - exit 1 - fi -else - echo building rogue... - ./configure - if make "$@"; then - echo rogue build SUCCESSFUL - cd .. - else - echo rogue build FAILED - exit 1 - fi -fi - -if make -f Makefile_rogue "$@"; then - echo ROGUE BUILD SUCCESSFUL -else - echo ROGUE BUILD FAILED - exit 1 -fi From 7bd7a716df6e750daa1bef2689e6cbbe3e0db840 Mon Sep 17 00:00:00 2001 From: Duke Date: Sat, 10 Feb 2024 12:59:10 -0500 Subject: [PATCH 050/108] Delete more CCs #381 --- src/cc/CCtx.cpp | 492 +----------------------------------------------- 1 file changed, 8 insertions(+), 484 deletions(-) diff --git a/src/cc/CCtx.cpp b/src/cc/CCtx.cpp index bc358dcbe..e2b477330 100644 --- a/src/cc/CCtx.cpp +++ b/src/cc/CCtx.cpp @@ -46,350 +46,14 @@ By using -addressindex=1, it allows tracking of all the CC addresses */ std::string FinalizeCCTx(uint64_t CCmask, struct CCcontract_info *cp, CMutableTransaction &mtx, CPubKey mypk, uint64_t txfee, CScript opret, std::vector pubkeys) { - UniValue sigData = FinalizeCCTxExt(false, CCmask, cp, mtx, mypk, txfee, opret, pubkeys); - return sigData[JSON_HEXTX].getValStr(); + return std::string(""); } // extended version that supports signInfo object with conds to vins map for remote cc calls UniValue FinalizeCCTxExt(bool remote, uint64_t CCmask, struct CCcontract_info *cp, CMutableTransaction &mtx, CPubKey mypk, uint64_t txfee, CScript opret, std::vector pubkeys) { - auto consensusBranchId = CurrentEpochBranchId(chainActive.Height() + 1, Params().GetConsensus()); - CTransaction vintx; std::string hex; CPubKey globalpk; uint256 hashBlock; uint64_t mask=0,nmask=0,vinimask=0; - int64_t utxovalues[CC_MAXVINS],change,normalinputs=0,totaloutputs=0,normaloutputs=0,totalinputs=0,normalvins=0,ccvins=0; - int32_t i,flag,mgret,utxovout,n,err = 0; - char myaddr[64], destaddr[64], unspendable[64], mytokensaddr[64], mysingletokensaddr[64], unspendabletokensaddr[64],CC1of2CCaddr[64]; - uint8_t *privkey = NULL, myprivkey[32] = { '\0' }, unspendablepriv[32] = { '\0' }, /*tokensunspendablepriv[32],*/ *msg32 = 0; - CC *mycond=0, *othercond=0, *othercond2=0,*othercond4=0, *othercond3=0, *othercond1of2=NULL, *othercond1of2tokens = NULL, *cond=0, *condCC2=0,*mytokenscond = NULL, *mysingletokenscond = NULL, *othertokenscond = NULL; - CPubKey unspendablepk /*, tokensunspendablepk*/; - struct CCcontract_info *cpTokens, tokensC; - UniValue sigData(UniValue::VARR),result(UniValue::VOBJ); - const UniValue sigDataNull = NullUniValue; - - globalpk = GetUnspendable(cp,0); - n = mtx.vout.size(); - for (i=0; i CC_MAXVINS ) - { - fprintf(stderr,"FinalizeCCTx: %d is too many vins\n",n); - result.push_back(Pair(JSON_HEXTX, "0")); - return result; - } - - //Myprivkey(myprivkey); // for NSPV mode we need to add myprivkey for the explicitly defined mypk param -#ifdef ENABLE_WALLET - // get privkey for mypk - CKeyID keyID = mypk.GetID(); - CKey vchSecret; - if (pwalletMain->GetKey(keyID, vchSecret)) - memcpy(myprivkey, vchSecret.begin(), sizeof(myprivkey)); -#endif - - GetCCaddress(cp,myaddr,mypk); - mycond = MakeCCcond1(cp->evalcode,mypk); - - // to spend from single-eval evalcode 'unspendable' cc addr - unspendablepk = GetUnspendable(cp, unspendablepriv); - GetCCaddress(cp, unspendable, unspendablepk); - othercond = MakeCCcond1(cp->evalcode, unspendablepk); - GetCCaddress1of2(cp,CC1of2CCaddr,unspendablepk,unspendablepk); - - //fprintf(stderr,"evalcode.%d (%s)\n",cp->evalcode,unspendable); - - // tokens support: - // to spend from dual/three-eval mypk vout - GetTokensCCaddress(cp, mytokensaddr, mypk); - // NOTE: if additionalEvalcode2 is not set it is a dual-eval (not three-eval) cc cond: - mytokenscond = MakeTokensCCcond1(cp->evalcode, cp->additionalTokensEvalcode2, mypk); - - // to spend from single-eval EVAL_TOKENS mypk - cpTokens = CCinit(&tokensC, EVAL_TOKENS); - GetCCaddress(cpTokens, mysingletokensaddr, mypk); - mysingletokenscond = MakeCCcond1(EVAL_TOKENS, mypk); - - // to spend from dual/three-eval EVAL_TOKEN+evalcode 'unspendable' pk: - GetTokensCCaddress(cp, unspendabletokensaddr, unspendablepk); // it may be a three-eval cc, if cp->additionalEvalcode2 is set - othertokenscond = MakeTokensCCcond1(cp->evalcode, cp->additionalTokensEvalcode2, unspendablepk); - - //Reorder vins so that for multiple normal vins all other except vin0 goes to the end - //This is a must to avoid hardfork change of validation in every CC, because there could be maximum one normal vin at the begining with current validation. - for (i=0; i1 && ccvins) - { - for(i=1;i= totaloutputs+2*txfee ) - { - change = totalinputs - (totaloutputs+txfee); - mtx.vout.push_back(CTxOut(change,CScript() << ParseHex(HexStr(mypk)) << OP_CHECKSIG)); - } - if ( opret.size() > 0 ) - mtx.vout.push_back(CTxOut(0,opret)); - PrecomputedTransactionData txdata(mtx); - n = mtx.vin.size(); - for (i=0; i %s\n",utxovout,dstr(vintx.vout[utxovout].nValue),addr); - } - if ( NSPV_SignTx(mtx,i,vintx.vout[utxovout].nValue,vintx.vout[utxovout].scriptPubKey,0) == 0 ) - fprintf(stderr,"NSPV signing error for vini.%d of %llx\n",i,(long long)vinimask); - } - } - else - { - Getscriptaddress(destaddr,vintx.vout[utxovout].scriptPubKey); - //fprintf(stderr,"FinalizeCCTx() vin.%d is CC %.8f -> (%s) vs %s\n",i,(double)utxovalues[i]/COIN,destaddr,mysingletokensaddr); - //std::cerr << "FinalizeCCtx() searching destaddr=" << destaddr << " for vin[" << i << "] satoshis=" << utxovalues[i] << std::endl; - if( strcmp(destaddr, myaddr) == 0 ) - { -//fprintf(stderr, "FinalizeCCTx() matched cc myaddr (%s)\n", myaddr); - privkey = myprivkey; - cond = mycond; - } - else if (strcmp(destaddr, mytokensaddr) == 0) // if this is TokensCC1vout - { - privkey = myprivkey; - cond = mytokenscond; -//fprintf(stderr,"FinalizeCCTx() matched dual-eval TokensCC1vout my token addr.(%s)\n",mytokensaddr); - } - else if (strcmp(destaddr, mysingletokensaddr) == 0) // if this is TokensCC1vout - { - privkey = myprivkey; - cond = mysingletokenscond; -//fprintf(stderr, "FinalizeCCTx() matched single-eval token CC1vout my token addr.(%s)\n", mytokensaddr); - } - else if ( strcmp(destaddr,unspendable) == 0 ) - { - privkey = unspendablepriv; - cond = othercond; -//fprintf(stderr,"FinalizeCCTx evalcode(%d) matched unspendable CC addr.(%s)\n",cp->evalcode,unspendable); - } - else if (strcmp(destaddr, unspendabletokensaddr) == 0) - { - privkey = unspendablepriv; - cond = othertokenscond; -//fprintf(stderr,"FinalizeCCTx() matched unspendabletokensaddr dual/three-eval CC addr.(%s)\n",unspendabletokensaddr); - } - // check if this is the 2nd additional evalcode + 'unspendable' cc addr: - else if ( strcmp(destaddr, cp->unspendableaddr2) == 0) - { -//fprintf(stderr,"FinalizeCCTx() matched %s unspendable2!\n",cp->unspendableaddr2); - privkey = cp->unspendablepriv2; - if( othercond2 == 0 ) - othercond2 = MakeCCcond1(cp->unspendableEvalcode2, cp->unspendablepk2); - cond = othercond2; - } - // check if this is 3rd additional evalcode + 'unspendable' cc addr: - else if ( strcmp(destaddr,cp->unspendableaddr3) == 0 ) - { -//fprintf(stderr,"FinalizeCCTx() matched %s unspendable3!\n",cp->unspendableaddr3); - privkey = cp->unspendablepriv3; - if( othercond3 == 0 ) - othercond3 = MakeCCcond1(cp->unspendableEvalcode3, cp->unspendablepk3); - cond = othercond3; - } - // check if this is spending from 1of2 cc coins addr: - else if (strcmp(cp->coins1of2addr, destaddr) == 0) - { -//fprintf(stderr,"FinalizeCCTx() matched %s unspendable1of2!\n",cp->coins1of2addr); - privkey = cp->coins1of2priv;//myprivkey; - if (othercond1of2 == 0) - othercond1of2 = MakeCCcond1of2(cp->evalcode, cp->coins1of2pk[0], cp->coins1of2pk[1]); - cond = othercond1of2; - } - else if ( strcmp(CC1of2CCaddr,destaddr) == 0 ) - { -//fprintf(stderr,"FinalizeCCTx() matched %s CC1of2CCaddr!\n",CC1of2CCaddr); - privkey = unspendablepriv; - if (condCC2 == 0) - condCC2 = MakeCCcond1of2(cp->evalcode,unspendablepk,unspendablepk); - cond = condCC2; - } - // check if this is spending from 1of2 cc tokens addr: - else if (strcmp(cp->tokens1of2addr, destaddr) == 0) - { -//fprintf(stderr,"FinalizeCCTx() matched %s cp->tokens1of2addr!\n", cp->tokens1of2addr); - privkey = cp->tokens1of2priv;//myprivkey; - if (othercond1of2tokens == 0) - // NOTE: if additionalEvalcode2 is not set then it is dual-eval cc else three-eval cc - // TODO: verify evalcodes order if additionalEvalcode2 is not 0 - othercond1of2tokens = MakeTokensCCcond1of2(cp->evalcode, cp->additionalTokensEvalcode2, cp->tokens1of2pk[0], cp->tokens1of2pk[1]); - cond = othercond1of2tokens; - } - else - { - flag = 0; - if ( pubkeys != NULL_pubkeys ) - { - char coinaddr[64]; - GetCCaddress1of2(cp,coinaddr,globalpk,pubkeys[i]); - //fprintf(stderr,"%s + %s -> %s vs %s\n",HexStr(globalpk).c_str(),HexStr(pubkeys[i]).c_str(),coinaddr,destaddr); - if ( strcmp(destaddr,coinaddr) == 0 ) - { - privkey = cp->CCpriv; - if ( othercond4 != 0 ) - cc_free(othercond4); - othercond4 = MakeCCcond1of2(cp->evalcode,globalpk,pubkeys[i]); - cond = othercond4; - flag = 1; - } - } //else privkey = myprivkey; - - if ( flag == 0 ) - { - fprintf(stderr,"CC signing error: vini.%d has unknown CC address.(%s)\n",i,destaddr); - memset(myprivkey,0,32); - return sigDataNull; - } - } - uint256 sighash = SignatureHash(CCPubKey(cond), mtx, i, SIGHASH_ALL,utxovalues[i],consensusBranchId, &txdata); - if ( 0 ) - { - int32_t z; - for (z=0; z<32; z++) - fprintf(stderr,"%02x",privkey[z]); - fprintf(stderr," privkey, "); - for (z=0; z<32; z++) - fprintf(stderr,"%02x",((uint8_t *)sighash.begin())[z]); - fprintf(stderr," sighash [%d] %.8f %x\n",i,(double)utxovalues[i]/COIN,consensusBranchId); - } - - if (!remote) // we have privkey in the wallet - { - if (cc_signTreeSecp256k1Msg32(cond, privkey, sighash.begin()) != 0) - { - mtx.vin[i].scriptSig = CCSig(cond); - } - else - { - fprintf(stderr, "vini.%d has CC signing error address.(%s) %s\n", i, destaddr, EncodeHexTx(mtx).c_str()); - memset(myprivkey, 0, sizeof(myprivkey)); - return sigDataNull; - } - } - else // no privkey locally - remote call - { - // serialize cc: - UniValue ccjson; - ccjson.read(cc_conditionToJSONString(cond)); - if (ccjson.empty()) - { - fprintf(stderr, "vini.%d can't serialize CC.(%s) %s\n", i, destaddr, EncodeHexTx(mtx).c_str()); - memset(myprivkey, 0, sizeof(myprivkey)); - return sigDataNull; - } - - AddSigData2UniValue(sigData, i, ccjson, std::string(), vintx.vout[utxovout].nValue); // store vin i with scriptPubKey - } - } - } else fprintf(stderr,"FinalizeCCTx2 couldnt find %s mgret.%d\n",mtx.vin[i].prevout.hash.ToString().c_str(),mgret); - } - if ( mycond != 0 ) - cc_free(mycond); - if ( condCC2 != 0 ) - cc_free(condCC2); - if ( othercond != 0 ) - cc_free(othercond); - if ( othercond2 != 0 ) - cc_free(othercond2); - if ( othercond3 != 0 ) - cc_free(othercond3); - if ( othercond4 != 0 ) - cc_free(othercond4); - if ( othercond1of2 != 0 ) - cc_free(othercond1of2); - if ( othercond1of2tokens != 0 ) - cc_free(othercond1of2tokens); - if ( mytokenscond != 0 ) - cc_free(mytokenscond); - if ( mysingletokenscond != 0 ) - cc_free(mysingletokenscond); - if ( othertokenscond != 0 ) - cc_free(othertokenscond); - memset(myprivkey,0,sizeof(myprivkey)); - std::string strHex = EncodeHexTx(mtx); - if ( strHex.size() > 0 ) - result.push_back(Pair(JSON_HEXTX, strHex)); - else { - result.push_back(Pair(JSON_HEXTX, "0")); - } - if (sigData.size() > 0) result.push_back(Pair(JSON_SIGDATA,sigData)); + UniValue result(UniValue::VOBJ); return result; } @@ -399,187 +63,47 @@ void NSPV_CCtxids(std::vector &txids,char *coinaddr,bool ccflag, uint8_ void SetCCunspents(std::vector > &unspentOutputs,char *coinaddr,bool ccflag) { - int32_t type=0,i,n; char *ptr; std::string addrstr; uint160 hashBytes; std::vector > addresses; - if ( HUSH_NSPV_SUPERLITE ) - { - NSPV_CCunspents(unspentOutputs,coinaddr,ccflag); - return; - } - n = (int32_t)strlen(coinaddr); - addrstr.resize(n+1); - ptr = (char *)addrstr.data(); - for (i=0; i<=n; i++) - ptr[i] = coinaddr[i]; - CBitcoinAddress address(addrstr); - if ( address.GetIndexKey(hashBytes, type, ccflag) == 0 ) - return; - addresses.push_back(std::make_pair(hashBytes,type)); - for (std::vector >::iterator it = addresses.begin(); it != addresses.end(); it++) - { - if ( GetAddressUnspent((*it).first, (*it).second, unspentOutputs) == 0 ) - return; - } + return; } void SetCCtxids(std::vector > &addressIndex,char *coinaddr,bool ccflag) { - int32_t type=0,i,n; char *ptr; std::string addrstr; uint160 hashBytes; std::vector > addresses; - if ( HUSH_NSPV_SUPERLITE ) - { - NSPV_CCtxids(addressIndex,coinaddr,ccflag); - return; - } - n = (int32_t)strlen(coinaddr); - addrstr.resize(n+1); - ptr = (char *)addrstr.data(); - for (i=0; i<=n; i++) - ptr[i] = coinaddr[i]; - CBitcoinAddress address(addrstr); - if ( address.GetIndexKey(hashBytes, type, ccflag) == 0 ) - return; - addresses.push_back(std::make_pair(hashBytes,type)); - for (std::vector >::iterator it = addresses.begin(); it != addresses.end(); it++) - { - if ( GetAddressIndex((*it).first, (*it).second, addressIndex) == 0 ) - return; - } + return; } void SetCCtxids(std::vector &txids,char *coinaddr,bool ccflag, uint8_t evalcode, uint256 filtertxid, uint8_t func) { - int32_t type=0,i,n; char *ptr; std::string addrstr; uint160 hashBytes; std::vector > addresses; - std::vector > addressIndex; - if ( HUSH_NSPV_SUPERLITE ) - { - NSPV_CCtxids(txids,coinaddr,ccflag,evalcode,filtertxid,func); - return; - } - n = (int32_t)strlen(coinaddr); - addrstr.resize(n+1); - ptr = (char *)addrstr.data(); - for (i=0; i<=n; i++) - ptr[i] = coinaddr[i]; - CBitcoinAddress address(addrstr); - if ( address.GetIndexKey(hashBytes, type, ccflag) == 0 ) - return; - addresses.push_back(std::make_pair(hashBytes,type)); - for (std::vector >::iterator it = addresses.begin(); it != addresses.end(); it++) - { - if ( GetAddressIndex((*it).first, (*it).second, addressIndex) == 0 ) - return; - for (std::vector >::const_iterator it1=addressIndex.begin(); it1!=addressIndex.end(); it1++) - { - if (it1->second>=0) txids.push_back(it1->first.txhash); - } - } + return; } int64_t CCutxovalue(char *coinaddr,uint256 utxotxid,int32_t utxovout,int32_t CCflag) { - uint256 txid; std::vector > unspentOutputs; - SetCCunspents(unspentOutputs,coinaddr,CCflag!=0?true:false); - for (std::vector >::const_iterator it=unspentOutputs.begin(); it!=unspentOutputs.end(); it++) - { - txid = it->first.txhash; - if ( txid == utxotxid && utxovout == it->first.index ) - return(it->second.satoshis); - } return(0); } int64_t CCgettxout(uint256 txid,int32_t vout,int32_t mempoolflag,int32_t lockflag) { - CCoins coins; - //fprintf(stderr,"CCgettxoud %s/v%d\n",txid.GetHex().c_str(),vout); - if ( mempoolflag != 0 ) - { - if ( lockflag != 0 ) - { - LOCK(mempool.cs); - CCoinsViewMemPool view(pcoinsTip, mempool); - if (!view.GetCoins(txid, coins)) - return(-1); - else if ( myIsutxo_spentinmempool(ignoretxid,ignorevin,txid,vout) != 0 ) - return(-1); - } - else - { - CCoinsViewMemPool view(pcoinsTip, mempool); - if (!view.GetCoins(txid, coins)) - return(-1); - else if ( myIsutxo_spentinmempool(ignoretxid,ignorevin,txid,vout) != 0 ) - return(-1); - } - } - else - { - if (!pcoinsTip->GetCoins(txid, coins)) - return(-1); - } - if ( vout < coins.vout.size() ) - return(coins.vout[vout].nValue); - else return(-1); + return(-1); } int32_t CCgetspenttxid(uint256 &spenttxid,int32_t &vini,int32_t &height,uint256 txid,int32_t vout) { - CSpentIndexKey key(txid, vout); - CSpentIndexValue value; - if ( !GetSpentIndex(key, value) ) - return(-1); - spenttxid = value.txid; - vini = (int32_t)value.inputIndex; - height = value.blockHeight; return(0); } int64_t CCaddress_balance(char *coinaddr,int32_t CCflag) { - int64_t sum = 0; std::vector > unspentOutputs; - SetCCunspents(unspentOutputs,coinaddr,CCflag!=0?true:false); - for (std::vector >::const_iterator it=unspentOutputs.begin(); it!=unspentOutputs.end(); it++) - { - sum += it->second.satoshis; - } - return(sum); + return 0; } int64_t CCfullsupply(uint256 tokenid) { - uint256 hashBlock; int32_t numvouts; CTransaction tx; std::vector origpubkey; std::string name,description; - if ( myGetTransaction(tokenid,tx,hashBlock) != 0 && (numvouts= tx.vout.size()) > 0 ) - { - if (DecodeTokenCreateOpRet(tx.vout[numvouts-1].scriptPubKey,origpubkey,name,description)) - { - return(tx.vout[1].nValue); - } - } return(0); } int64_t CCtoken_balance(char *coinaddr,uint256 reftokenid) { - int64_t price,sum = 0; int32_t numvouts; CTransaction tx; uint256 tokenid,txid,hashBlock; - std::vector vopretExtra; - std::vector > unspentOutputs; - uint8_t evalCode; - - SetCCunspents(unspentOutputs,coinaddr,true); - for (std::vector >::const_iterator it=unspentOutputs.begin(); it!=unspentOutputs.end(); it++) - { - txid = it->first.txhash; - if ( myGetTransaction(txid,tx,hashBlock) != 0 && (numvouts=tx.vout.size()) > 0 ) - { - char str[65]; - std::vector voutTokenPubkeys; - std::vector> oprets; - if ( reftokenid==txid || (DecodeTokenOpRet(tx.vout[numvouts-1].scriptPubKey, evalCode, tokenid, voutTokenPubkeys, oprets) != 0 && reftokenid == tokenid)) - { - sum += it->second.satoshis; - } - } - } - return(sum); + return 0; } int32_t CC_vinselect(int32_t *aboveip,int64_t *abovep,int32_t *belowip,int64_t *belowp,struct CC_utxo utxos[],int32_t numunspents,int64_t value) From d81e8c0a3f90c93ea10102822116256d60c9481b Mon Sep 17 00:00:00 2001 From: Duke Date: Sat, 10 Feb 2024 18:56:37 -0500 Subject: [PATCH 051/108] Delete more CCs #381 --- src/cc/CCcustom.cpp | 389 -------------------------------------------- src/cc/CCcustom.inc | 17 -- 2 files changed, 406 deletions(-) delete mode 100644 src/cc/CCcustom.inc diff --git a/src/cc/CCcustom.cpp b/src/cc/CCcustom.cpp index 1e9653609..f526cd2fe 100644 --- a/src/cc/CCcustom.cpp +++ b/src/cc/CCcustom.cpp @@ -28,402 +28,13 @@ #include "CCPegs.h" #include "CCtokens.h" -/* - CCcustom has most of the functions that need to be extended to create a new CC contract. - - A CC scriptPubKey can only be spent if it is properly signed and validated. By constraining the vins and vouts, it is possible to implement a variety of functionality. CC vouts have an otherwise non-standard form, but it is properly supported by the enhanced bitcoin protocol code as a "cryptoconditions" output and the same pubkey will create a different address. - - This allows creation of a special address(es) for each contract type, which has the privkey public. That allows anybody to properly sign and spend it, but with the constraints on what is allowed in the validation code, the contract functionality can be implemented. - - what needs to be done to add a new contract: - 1. add EVAL_CODE to eval.h - 2. initialize the variables in the CCinit function below - 3. write a Validate function to reject any unsanctioned usage of vin/vout - 4. make helper functions to create rawtx for RPC functions - 5. add rpc calls to rpcserver.cpp and rpcserver.h and in one of the rpc.cpp files - 6. add the new .cpp files to src/Makefile.am - - IMPORTANT: make sure that all CC inputs and CC outputs are properly accounted for and reconcile to the satoshi. The built in utxo management will enforce overall vin/vout constraints but it wont know anything about the CC constraints. That is what your Validate function needs to do. - - Generally speaking, there will be normal coins that change into CC outputs, CC outputs that go back to being normal coins, CC outputs that are spent to new CC outputs. - - Make sure both the CC coins and normal coins are preserved and follow the rules that make sense. It is a good idea to define specific roles for specific vins and vouts to reduce the complexity of validation. - */ - -// to create a new CCaddr, add to rpcwallet the CCaddress and start with -pubkey= with the pubkey of the new address, with its wif already imported. set normaladdr and CChexstr. run CCaddress and it will print the privkey along with autocorrect the CCaddress. which should then update the CCaddr here - -// Assets, aka Tokens -#define FUNCNAME IsAssetsInput -#define EVALCODE EVAL_ASSETS -const char *AssetsCCaddr = "RGKRjeTBw4LYFotSDLT6RWzMHbhXri6BG6"; -const char *AssetsNormaladdr = "RFYE2yL3KknWdHK6uNhvWacYsCUtwzjY3u"; -char AssetsCChexstr[67] = { "02adf84e0e075cf90868bd4e3d34a03420e034719649c41f371fc70d8e33aa2702" }; -uint8_t AssetsCCpriv[32] = { 0x9b, 0x17, 0x66, 0xe5, 0x82, 0x66, 0xac, 0xb6, 0xba, 0x43, 0x83, 0x74, 0xf7, 0x63, 0x11, 0x3b, 0xf0, 0xf3, 0x50, 0x6f, 0xd9, 0x6b, 0x67, 0x85, 0xf9, 0x7a, 0xf0, 0x54, 0x4d, 0xb1, 0x30, 0x77 }; -#include "CCcustom.inc" -#undef FUNCNAME -#undef EVALCODE - -// Faucet -#define FUNCNAME IsFaucetInput -#define EVALCODE EVAL_FAUCET -const char *FaucetCCaddr = "R9zHrofhRbub7ER77B7NrVch3A63R39GuC"; -const char *FaucetNormaladdr = "RKQV4oYs4rvxAWx1J43VnT73rSTVtUeckk"; -char FaucetCChexstr[67] = { "03682b255c40d0cde8faee381a1a50bbb89980ff24539cb8518e294d3a63cefe12" }; -uint8_t FaucetCCpriv[32] = { 0xd4, 0x4f, 0xf2, 0x31, 0x71, 0x7d, 0x28, 0x02, 0x4b, 0xc7, 0xdd, 0x71, 0xa0, 0x39, 0xc4, 0xbe, 0x1a, 0xfe, 0xeb, 0xc2, 0x46, 0xda, 0x76, 0xf8, 0x07, 0x53, 0x3d, 0x96, 0xb4, 0xca, 0xa0, 0xe9 }; -#include "CCcustom.inc" -#undef FUNCNAME -#undef EVALCODE - -// Rewards -#define FUNCNAME IsRewardsInput -#define EVALCODE EVAL_REWARDS -const char *RewardsCCaddr = "RTsRBYL1HSvMoE3qtBJkyiswdVaWkm8YTK"; -const char *RewardsNormaladdr = "RMgye9jeczNjQx9Uzq8no8pTLiCSwuHwkz"; -char RewardsCChexstr[67] = { "03da60379d924c2c30ac290d2a86c2ead128cb7bd571f69211cb95356e2dcc5eb9" }; -uint8_t RewardsCCpriv[32] = { 0x82, 0xf5, 0xd2, 0xe7, 0xd6, 0x99, 0x33, 0x77, 0xfb, 0x80, 0x00, 0x97, 0x23, 0x3d, 0x1e, 0x6f, 0x61, 0xa9, 0xb5, 0x2e, 0x5e, 0xb4, 0x96, 0x6f, 0xbc, 0xed, 0x6b, 0xe2, 0xbb, 0x7b, 0x4b, 0xb3 }; -#include "CCcustom.inc" -#undef FUNCNAME -#undef EVALCODE - -// Dice -#define FUNCNAME IsDiceInput -#define EVALCODE EVAL_DICE -const char *DiceCCaddr = "REabWB7KjFN5C3LFMZ5odExHPenYzHLtVw"; -const char *DiceNormaladdr = "RLEe8f7Eg3TDuXii9BmNiiiaVGraHUt25c"; -char DiceCChexstr[67] = { "039d966927cfdadab3ee6c56da63c21f17ea753dde4b3dfd41487103e24b27e94e" }; -uint8_t DiceCCpriv[32] = { 0x0e, 0xe8, 0xf5, 0xb4, 0x3d, 0x25, 0xcc, 0x35, 0xd1, 0xf1, 0x2f, 0x04, 0x5f, 0x01, 0x26, 0xb8, 0xd1, 0xac, 0x3a, 0x5a, 0xea, 0xe0, 0x25, 0xa2, 0x8f, 0x2a, 0x8e, 0x0e, 0xf9, 0x34, 0xfa, 0x77 }; -#include "CCcustom.inc" -#undef FUNCNAME -#undef EVALCODE - -// Lotto -#define FUNCNAME IsLottoInput -#define EVALCODE EVAL_LOTTO -const char *LottoCCaddr = "RNXZxgyWSAE6XS3qGnTaf5dVNCxnYzhPrg"; -const char *LottoNormaladdr = "RLW6hhRqBZZMBndnyPv29Yg3krh6iBYCyg"; -char LottoCChexstr[67] = { "03f72d2c4db440df1e706502b09ca5fec73ffe954ea1883e4049e98da68690d98f" }; -uint8_t LottoCCpriv[32] = { 0xb4, 0xac, 0xc2, 0xd9, 0x67, 0x34, 0xd7, 0x58, 0x80, 0x4e, 0x25, 0x55, 0xc0, 0x50, 0x66, 0x84, 0xbb, 0xa2, 0xe7, 0xc0, 0x39, 0x17, 0xb4, 0xc5, 0x07, 0xb7, 0x3f, 0xca, 0x07, 0xb0, 0x9a, 0xeb }; -#include "CCcustom.inc" -#undef FUNCNAME -#undef EVALCODE - -// Finite State Machine -#define FUNCNAME IsFSMInput -#define EVALCODE EVAL_FSM -const char *FSMCCaddr = "RUKTbLBeKgHkm3Ss4hKZP3ikuLW1xx7B2x"; -const char *FSMNormaladdr = "RWSHRbxnJYLvDjpcQ2i8MekgP6h2ctTKaj"; -char FSMCChexstr[67] = { "039b52d294b413b07f3643c1a28c5467901a76562d8b39a785910ae0a0f3043810" }; -uint8_t FSMCCpriv[32] = { 0x11, 0xe1, 0xea, 0x3e, 0xdb, 0x36, 0xf0, 0xa8, 0xc6, 0x34, 0xe1, 0x21, 0xb8, 0x02, 0xb9, 0x4b, 0x12, 0x37, 0x8f, 0xa0, 0x86, 0x23, 0x50, 0xb2, 0x5f, 0xe4, 0xe7, 0x36, 0x0f, 0xda, 0xae, 0xfc }; -#include "CCcustom.inc" -#undef FUNCNAME -#undef EVALCODE - -// Auction -#define FUNCNAME IsAuctionInput -#define EVALCODE EVAL_AUCTION -const char *AuctionCCaddr = "RL4YPX7JYG3FnvoPqWF2pn3nQknH5NWEwx"; -const char *AuctionNormaladdr = "RFtVDNmdTZBTNZdmFRbfBgJ6LitgTghikL"; -char AuctionCChexstr[67] = { "037eefe050c14cb60ae65d5b2f69eaa1c9006826d729bc0957bdc3024e3ca1dbe6" }; -uint8_t AuctionCCpriv[32] = { 0x8c, 0x1b, 0xb7, 0x8c, 0x02, 0xa3, 0x9d, 0x21, 0x28, 0x59, 0xf5, 0xea, 0xda, 0xec, 0x0d, 0x11, 0xcd, 0x38, 0x47, 0xac, 0x0b, 0x6f, 0x19, 0xc0, 0x24, 0x36, 0xbf, 0x1c, 0x0a, 0x06, 0x31, 0xfb }; -#include "CCcustom.inc" -#undef FUNCNAME -#undef EVALCODE - -// Heir -#define FUNCNAME IsHeirInput -#define EVALCODE EVAL_HEIR -const char *HeirCCaddr = "RDVHcSekmXgeYBqRupNTmqo3Rn8QRXNduy"; -const char *HeirNormaladdr = "RTPwUjKYECcGn6Y4KYChLhgaht1RSU4jwf"; -char HeirCChexstr[67] = { "03c91bef3d7cc59c3a89286833a3446b29e52a5e773f738a1ad2b09785e5f4179e" }; -uint8_t HeirCCpriv[32] = { 0x9d, 0xa1, 0xf8, 0xf7, 0xba, 0x0a, 0x91, 0x36, 0x89, 0x9a, 0x86, 0x30, 0x63, 0x20, 0xd7, 0xdf, 0xaa, 0x35, 0xe3, 0x99, 0x32, 0x2b, 0x63, 0xc0, 0x66, 0x9c, 0x93, 0xc4, 0x5e, 0x9d, 0xb9, 0xce }; -#include "CCcustom.inc" -#undef FUNCNAME -#undef EVALCODE - -// Channels -#define FUNCNAME IsChannelsInput -#define EVALCODE EVAL_CHANNELS -const char *ChannelsCCaddr = "RQy3rwX8sP9oDm3c39vGKA6H315cgtPLfr"; -const char *ChannelsNormaladdr = "RQUuT8zmkvDfXqECH4m3VD3SsHZAfnoh1v"; -char ChannelsCChexstr[67] = { "035debdb19b1c98c615259339500511d6216a3ffbeb28ff5655a7ef5790a12ab0b" }; -uint8_t ChannelsCCpriv[32] = { 0xec, 0x91, 0x36, 0x15, 0x2d, 0xd4, 0x48, 0x73, 0x22, 0x36, 0x4f, 0x6a, 0x34, 0x5c, 0x61, 0x0f, 0x01, 0xb4, 0x79, 0xe8, 0x1c, 0x2f, 0xa1, 0x1d, 0x4a, 0x0a, 0x21, 0x16, 0xea, 0x82, 0x84, 0x60 }; -#include "CCcustom.inc" -#undef FUNCNAME -#undef EVALCODE - -// Oracles -#define FUNCNAME IsOraclesInput -#define EVALCODE EVAL_ORACLES -const char *OraclesCCaddr = "REt2C4ZMnX8YYX1DRpffNA4hECZTFm39e3"; -const char *OraclesNormaladdr = "RHkFKzn1csxA3fWzAsxsLWohoCgBbirXb5"; -char OraclesCChexstr[67] = { "038c1d42db6a45a57eccb8981b078fb7857b9b496293fe299d2b8d120ac5b5691a" }; -uint8_t OraclesCCpriv[32] = { 0xf7, 0x4b, 0x5b, 0xa2, 0x7a, 0x5e, 0x9c, 0xda, 0x89, 0xb1, 0xcb, 0xb9, 0xe6, 0x9c, 0x2c, 0x70, 0x85, 0x37, 0xdd, 0x00, 0x7a, 0x67, 0xff, 0x7c, 0x62, 0x1b, 0xe2, 0xfb, 0x04, 0x8f, 0x85, 0xbf }; -#include "CCcustom.inc" -#undef FUNCNAME -#undef EVALCODE - -// Prices -#define FUNCNAME IsPricesInput -#define EVALCODE EVAL_PRICES -const char *PricesCCaddr = "RAL5Vh8NXmFqEKJRKrk1KjKaUckK7mM1iS"; -const char *PricesNormaladdr = "RBunXCsMHk5NPd6q8SQfmpgre3x133rSwZ"; -char PricesCChexstr[67] = { "039894cb054c0032e99e65e715b03799607aa91212a16648d391b6fa2cc52ed0cf" }; -uint8_t PricesCCpriv[32] = { 0x0a, 0x3b, 0xe7, 0x5d, 0xce, 0x06, 0xed, 0xb7, 0xc0, 0xb1, 0xbe, 0xe8, 0x7b, 0x5a, 0xd4, 0x99, 0xb8, 0x8d, 0xde, 0xac, 0xb2, 0x7e, 0x7a, 0x52, 0x96, 0x15, 0xd2, 0xa0, 0xc6, 0xb9, 0x89, 0x61 }; -#include "CCcustom.inc" -#undef FUNCNAME -#undef EVALCODE - -// Pegs -#define FUNCNAME IsPegsInput -#define EVALCODE EVAL_PEGS -const char *PegsCCaddr = "RHnkVb7vHuHnjEjhkCF1bS6xxLLNZPv5fd"; -const char *PegsNormaladdr = "RMcCZtX6dHf1fz3gpLQhUEMQ8cVZ6Rzaro"; -char PegsCChexstr[67] = { "03c75c1de29a35e41606363b430c08be1c2dd93cf7a468229a082cc79c7b77eece" }; -uint8_t PegsCCpriv[32] = { 0x52, 0x56, 0x4c, 0x78, 0x87, 0xf7, 0xa2, 0x39, 0xb0, 0x90, 0xb7, 0xb8, 0x62, 0x80, 0x0f, 0x83, 0x18, 0x9d, 0xf4, 0xf4, 0xbd, 0x28, 0x09, 0xa9, 0x9b, 0x85, 0x54, 0x16, 0x0f, 0x3f, 0xfb, 0x65 }; -#include "CCcustom.inc" -#undef FUNCNAME -#undef EVALCODE - -// Payments -#define FUNCNAME IsPaymentsInput -#define EVALCODE EVAL_PAYMENTS -const char *PaymentsCCaddr = "REpyKi7avsVduqZ3eimncK4uKqSArLTGGK"; -const char *PaymentsNormaladdr = "RHRX8RTMAh2STWe9DHqsvJbzS7ty6aZy3d"; -char PaymentsCChexstr[67] = { "0358f1764f82c63abc7c7455555fd1d3184905e30e819e97667e247e5792b46856" }; -uint8_t PaymentsCCpriv[32] = { 0x03, 0xc9, 0x73, 0xc2, 0xb8, 0x30, 0x3d, 0xbd, 0xc8, 0xd9, 0xbf, 0x02, 0x49, 0xd9, 0x65, 0x61, 0x45, 0xed, 0x9e, 0x93, 0x51, 0xab, 0x8b, 0x2e, 0xe7, 0xc7, 0x40, 0xf1, 0xc4, 0xd2, 0xc0, 0x5b }; -#include "CCcustom.inc" -#undef FUNCNAME -#undef EVALCODE - -// Gateways -#define FUNCNAME IsGatewaysInput -#define EVALCODE EVAL_GATEWAYS -const char *GatewaysCCaddr = "RKWpoK6vTRtq5b9qrRBodLkCzeURHeEk33"; -const char *GatewaysNormaladdr = "RGJKV97ZN1wBfunuMt1tebiiHENNEq73Yh"; // wif UxJFYqEvLAjWPPRvn8NN1fRWscBxQZXZB5BBgc3HiapKVQBYNcmo -char GatewaysCChexstr[67] = { "03ea9c062b9652d8eff34879b504eda0717895d27597aaeb60347d65eed96ccb40" }; -uint8_t GatewaysCCpriv[32] = { 0xf7, 0x4b, 0x5b, 0xa2, 0x7a, 0x5e, 0x9c, 0xda, 0x89, 0xb1, 0xcb, 0xb9, 0xe6, 0x9c, 0x2c, 0x70, 0x85, 0x37, 0xdd, 0x00, 0x7a, 0x67, 0xff, 0x7c, 0x62, 0x1b, 0xe2, 0xfb, 0x04, 0x8f, 0x85, 0xbf }; -#include "CCcustom.inc" -#undef FUNCNAME -#undef EVALCODE - -// Tokens -#define FUNCNAME IsTokensInput -#define EVALCODE EVAL_TOKENS -const char *TokensCCaddr = "RAMvUfoyURBRxAdVeTMHxn3giJZCFWeha2"; -const char *TokensNormaladdr = "RCNgAngYAdrfzujYyPgfbjCGNVQZzCgTad"; -char TokensCChexstr[67] = { "03e6191c70c9c9a28f9fd87089b9488d0e6c02fb629df64979c9cdb6b2b4a68d95" }; -uint8_t TokensCCpriv[32] = { 0x1d, 0x0d, 0x0d, 0xce, 0x2d, 0xd2, 0xe1, 0x9d, 0xf5, 0xb6, 0x26, 0xd5, 0xad, 0xa0, 0xf0, 0x0a, 0xdd, 0x7a, 0x72, 0x7d, 0x17, 0x35, 0xb5, 0xe3, 0x2c, 0x6c, 0xa9, 0xa2, 0x03, 0x16, 0x4b, 0xcf }; -#include "CCcustom.inc" -#undef FUNCNAME -#undef EVALCODE - -#define FUNCNAME IsCClibInput -#define EVALCODE EVAL_FIRSTUSER -const char *CClibNormaladdr = "RVVeUg43rNcq3mZFnvZ8yqagyzqFgUnq4u"; -char CClibCChexstr[67] = { "032447d97655da079729dc024c61088ea415b22f4c15d4810ddaf2069ac6468d2f" }; -uint8_t CClibCCpriv[32] = { 0x57, 0xcf, 0x49, 0x71, 0x7d, 0xb4, 0x15, 0x1b, 0x4f, 0x98, 0xc5, 0x45, 0x8d, 0x26, 0x52, 0x4b, 0x7b, 0xe9, 0xbd, 0x55, 0xd8, 0x20, 0xd6, 0xc4, 0x82, 0x0f, 0xf5, 0xec, 0x6c, 0x1c, 0xa0, 0xc0 }; -#include "CCcustom.inc" -#undef FUNCNAME -#undef EVALCODE - -// ImportGateway -#define FUNCNAME IsImportGatewayInput -#define EVALCODE EVAL_IMPORTGATEWAY -const char *ImportGatewayCCaddr = "RXJT6CRAXHFuQ2UjqdxMj7EfrayF6UJpzZ"; -const char *ImportGatewayNormaladdr = "RNFRho63Ddz1Rh2eGPETykrU4fA8r67S4Y"; -char ImportGatewayCChexstr[67] = { "0397231cfe04ea32d5fafb2206773ec9fba6e15c5a4e86064468bca195f7542714" }; -uint8_t ImportGatewayCCpriv[32] = { 0x65, 0xef, 0x27, 0xeb, 0x3d, 0xb0, 0xb4, 0xae, 0x0f, 0xbc, 0x77, 0xdb, 0xf8, 0x40, 0x48, 0x90, 0x52, 0x20, 0x9e, 0x45, 0x3b, 0x49, 0xd8, 0x97, 0x60, 0x8c, 0x27, 0x4c, 0x59, 0x46, 0xe1, 0xdf }; -#include "CCcustom.inc" -#undef FUNCNAME -#undef EVALCODE - int32_t CClib_initcp(struct CCcontract_info *cp,uint8_t evalcode) { - CPubKey pk; int32_t i; uint8_t pub33[33],check33[33],hash[32]; char CCaddr[64],checkaddr[64],str[67]; - cp->evalcode = evalcode; - cp->ismyvin = IsCClibInput; - memcpy(cp->CCpriv,CClibCCpriv,32); - if ( evalcode == EVAL_FIRSTUSER ) // eventually make a hashchain for each evalcode - { - strcpy(cp->CChexstr,CClibCChexstr); - decode_hex(pub33,33,cp->CChexstr); - pk = buf2pk(pub33); - Getscriptaddress(cp->normaladdr,CScript() << ParseHex(HexStr(pk)) << OP_CHECKSIG); - if ( strcmp(cp->normaladdr,CClibNormaladdr) != 0 ) - fprintf(stderr,"CClib_initcp addr mismatch %s vs %s\n",cp->normaladdr,CClibNormaladdr); - GetCCaddress(cp,cp->unspendableCCaddr,pk); - if ( priv2addr(checkaddr,check33,cp->CCpriv) != 0 ) - { - if ( buf2pk(check33) == pk && strcmp(checkaddr,cp->normaladdr) == 0 ) - { - //fprintf(stderr,"verified evalcode.%d %s %s\n",cp->evalcode,checkaddr,pubkey33_str(str,pub33)); - return(0); - } else fprintf(stderr,"CClib_initcp mismatched privkey -> addr %s vs %s\n",checkaddr,cp->normaladdr); - } - } - else - { - for (i=EVAL_FIRSTUSER; iCCpriv,32); - memcpy(cp->CCpriv,hash,32); - } - if ( priv2addr(cp->normaladdr,pub33,cp->CCpriv) != 0 ) - { - pk = buf2pk(pub33); - for (i=0; i<33; i++) - sprintf(&cp->CChexstr[i*2],"%02x",pub33[i]); - cp->CChexstr[i*2] = 0; - GetCCaddress(cp,cp->unspendableCCaddr,pk); - //printf("evalcode.%d initialized\n",evalcode); - return(0); - } - } return(-1); } struct CCcontract_info *CCinit(struct CCcontract_info *cp, uint8_t evalcode) { - // important to clear because not all members are always initialized! - memset(cp, '\0', sizeof(*cp)); - - cp->evalcode = evalcode; - switch ( evalcode ) - { - case EVAL_ASSETS: - strcpy(cp->unspendableCCaddr,AssetsCCaddr); - strcpy(cp->normaladdr,AssetsNormaladdr); - strcpy(cp->CChexstr,AssetsCChexstr); - memcpy(cp->CCpriv,AssetsCCpriv,32); - //cp->validate = AssetsValidate; - //cp->ismyvin = IsAssetsInput; - break; - case EVAL_FAUCET: - strcpy(cp->unspendableCCaddr,FaucetCCaddr); - strcpy(cp->normaladdr,FaucetNormaladdr); - strcpy(cp->CChexstr,FaucetCChexstr); - memcpy(cp->CCpriv,FaucetCCpriv,32); - //cp->validate = FaucetValidate; - //cp->ismyvin = IsFaucetInput; - break; - case EVAL_REWARDS: - strcpy(cp->unspendableCCaddr,RewardsCCaddr); - strcpy(cp->normaladdr,RewardsNormaladdr); - strcpy(cp->CChexstr,RewardsCChexstr); - memcpy(cp->CCpriv,RewardsCCpriv,32); - //cp->validate = RewardsValidate; - //cp->ismyvin = IsRewardsInput; - break; - case EVAL_DICE: - strcpy(cp->unspendableCCaddr,DiceCCaddr); - strcpy(cp->normaladdr,DiceNormaladdr); - strcpy(cp->CChexstr,DiceCChexstr); - memcpy(cp->CCpriv,DiceCCpriv,32); - //cp->validate = DiceValidate; - //cp->ismyvin = IsDiceInput; - break; - case EVAL_LOTTO: - strcpy(cp->unspendableCCaddr,LottoCCaddr); - strcpy(cp->normaladdr,LottoNormaladdr); - strcpy(cp->CChexstr,LottoCChexstr); - memcpy(cp->CCpriv,LottoCCpriv,32); - //cp->validate = LottoValidate; - //cp->ismyvin = IsLottoInput; - break; - case EVAL_FSM: - strcpy(cp->unspendableCCaddr,FSMCCaddr); - strcpy(cp->normaladdr,FSMNormaladdr); - strcpy(cp->CChexstr,FSMCChexstr); - memcpy(cp->CCpriv,FSMCCpriv,32); - //cp->validate = FSMValidate; - //cp->ismyvin = IsFSMInput; - break; - case EVAL_AUCTION: - strcpy(cp->unspendableCCaddr,AuctionCCaddr); - strcpy(cp->normaladdr,AuctionNormaladdr); - strcpy(cp->CChexstr,AuctionCChexstr); - memcpy(cp->CCpriv,AuctionCCpriv,32); - //cp->validate = AuctionValidate; - //cp->ismyvin = IsAuctionInput; - break; - case EVAL_HEIR: - strcpy(cp->unspendableCCaddr,HeirCCaddr); - strcpy(cp->normaladdr,HeirNormaladdr); - strcpy(cp->CChexstr,HeirCChexstr); - memcpy(cp->CCpriv,HeirCCpriv,32); - //cp->validate = HeirValidate; - //cp->ismyvin = IsHeirInput; - break; - case EVAL_CHANNELS: - strcpy(cp->unspendableCCaddr,ChannelsCCaddr); - strcpy(cp->normaladdr,ChannelsNormaladdr); - strcpy(cp->CChexstr,ChannelsCChexstr); - memcpy(cp->CCpriv,ChannelsCCpriv,32); - //cp->validate = ChannelsValidate; - //cp->ismyvin = IsChannelsInput; - break; - case EVAL_ORACLES: - strcpy(cp->unspendableCCaddr,OraclesCCaddr); - strcpy(cp->normaladdr,OraclesNormaladdr); - strcpy(cp->CChexstr,OraclesCChexstr); - memcpy(cp->CCpriv,OraclesCCpriv,32); - //cp->validate = OraclesValidate; - //cp->ismyvin = IsOraclesInput; - break; - case EVAL_PRICES: - strcpy(cp->unspendableCCaddr,PricesCCaddr); - strcpy(cp->normaladdr,PricesNormaladdr); - strcpy(cp->CChexstr,PricesCChexstr); - memcpy(cp->CCpriv,PricesCCpriv,32); - //cp->validate = PricesValidate; - //cp->ismyvin = IsPricesInput; - break; - case EVAL_PEGS: - strcpy(cp->unspendableCCaddr,PegsCCaddr); - strcpy(cp->normaladdr,PegsNormaladdr); - strcpy(cp->CChexstr,PegsCChexstr); - memcpy(cp->CCpriv,PegsCCpriv,32); - //cp->validate = PegsValidate; - //cp->ismyvin = IsPegsInput; - break; - case EVAL_PAYMENTS: - strcpy(cp->unspendableCCaddr,PaymentsCCaddr); - strcpy(cp->normaladdr,PaymentsNormaladdr); - strcpy(cp->CChexstr,PaymentsCChexstr); - memcpy(cp->CCpriv,PaymentsCCpriv,32); - //cp->validate = PaymentsValidate; - //cp->ismyvin = IsPaymentsInput; - break; - case EVAL_GATEWAYS: - strcpy(cp->unspendableCCaddr,GatewaysCCaddr); - strcpy(cp->normaladdr,GatewaysNormaladdr); - strcpy(cp->CChexstr,GatewaysCChexstr); - memcpy(cp->CCpriv,GatewaysCCpriv,32); - //cp->validate = GatewaysValidate; - //cp->ismyvin = IsGatewaysInput; - break; - - case EVAL_TOKENS: - strcpy(cp->unspendableCCaddr, TokensCCaddr); - strcpy(cp->normaladdr, TokensNormaladdr); - strcpy(cp->CChexstr, TokensCChexstr); - memcpy(cp->CCpriv, TokensCCpriv, 32); - //cp->validate = TokensValidate; - //cp->ismyvin = IsTokensInput; - break; - case EVAL_IMPORTGATEWAY: - strcpy(cp->unspendableCCaddr, ImportGatewayCCaddr); - strcpy(cp->normaladdr, ImportGatewayNormaladdr); - strcpy(cp->CChexstr, ImportGatewayCChexstr); - memcpy(cp->CCpriv, ImportGatewayCCpriv, 32); - //cp->validate = ImportGatewayValidate; - //cp->ismyvin = IsImportGatewayInput; - break; - default: - if ( CClib_initcp(cp,evalcode) < 0 ) - return(0); - break; - } return(cp); } diff --git a/src/cc/CCcustom.inc b/src/cc/CCcustom.inc deleted file mode 100644 index c33ca4f5b..000000000 --- a/src/cc/CCcustom.inc +++ /dev/null @@ -1,17 +0,0 @@ - -bool FUNCNAME(CScript const& scriptSig) -{ - CC *cond; - if (!(cond = GetCryptoCondition(scriptSig))) - return false; - // Recurse the CC tree to find asset condition - auto findEval = [] (CC *cond, struct CCVisitor _) { - bool r = cc_typeId(cond) == CC_Eval && cond->codeLength == 1 && cond->code[0] == EVALCODE; - // false for a match, true for continue - return r ? 0 : 1; - }; - CCVisitor visitor = {findEval, (uint8_t*)"", 0, NULL}; - bool out =! cc_visit(cond, visitor); - cc_free(cond); - return out; -} From 5fa46e1d8dff4892b64145d896916ab194e0fd3d Mon Sep 17 00:00:00 2001 From: Duke Date: Sat, 10 Feb 2024 21:46:36 -0500 Subject: [PATCH 052/108] Delete more CCs #381 --- src/cc/CCHeir.h | 39 ------------------------- src/cc/CCOracles.h | 37 ----------------------- src/cc/CCPegs.h | 18 ------------ src/cc/CCPrices.h | 66 ------------------------------------------ src/cc/CCassets.h | 50 -------------------------------- src/cc/CCauction.h | 33 --------------------- src/cc/CCcustom.cpp | 9 ------ src/cc/CCfaucet.h | 31 -------------------- src/cc/CCfsm.h | 33 --------------------- src/rpc/blockchain.cpp | 1 - 10 files changed, 317 deletions(-) delete mode 100644 src/cc/CCHeir.h delete mode 100644 src/cc/CCOracles.h delete mode 100644 src/cc/CCPegs.h delete mode 100644 src/cc/CCPrices.h delete mode 100644 src/cc/CCassets.h delete mode 100644 src/cc/CCauction.h delete mode 100644 src/cc/CCfaucet.h delete mode 100644 src/cc/CCfsm.h diff --git a/src/cc/CCHeir.h b/src/cc/CCHeir.h deleted file mode 100644 index 2701251b3..000000000 --- a/src/cc/CCHeir.h +++ /dev/null @@ -1,39 +0,0 @@ -// Copyright (c) 2016-2023 The Hush developers -// Distributed under the GPLv3 software license, see the accompanying -// file COPYING or https://www.gnu.org/licenses/gpl-3.0.en.html -/****************************************************************************** - * Copyright © 2014-2019 The SuperNET Developers. * - * * - * See the AUTHORS, DEVELOPER-AGREEMENT and LICENSE files at * - * the top-level directory of this distribution for the individual copyright * - * holder information and the developer policies on copyright and licensing. * - * * - * Unless otherwise agreed in a custom licensing agreement, no part of the * - * SuperNET software, including this file may be copied, modified, propagated * - * or distributed except according to the terms contained in the LICENSE file * - * * - * Removal or modification of this copyright notice is prohibited. * - * * - ******************************************************************************/ - -#ifndef CC_HEIR_H -#define CC_HEIR_H - -#include "CCinclude.h" -#include "CCtokens.h" - -//#define EVAL_HEIR 0xea - -bool HeirValidate(struct CCcontract_info *cp,Eval* eval,const CTransaction &tx, uint32_t nIn); - -class CoinHelper; -class TokenHelper; - -UniValue HeirFundCoinCaller(int64_t txfee, int64_t coins, std::string heirName, CPubKey heirPubkey, int64_t inactivityTimeSec, std::string memo); -UniValue HeirFundTokenCaller(int64_t txfee, int64_t satoshis, std::string heirName, CPubKey heirPubkey, int64_t inactivityTimeSec, std::string memo, uint256 tokenid); -UniValue HeirClaimCaller(uint256 fundingtxid, int64_t txfee, std::string amount); -UniValue HeirAddCaller(uint256 fundingtxid, int64_t txfee, std::string amount); -UniValue HeirInfo(uint256 fundingtxid); -UniValue HeirList(); - -#endif diff --git a/src/cc/CCOracles.h b/src/cc/CCOracles.h deleted file mode 100644 index 9ab6082a4..000000000 --- a/src/cc/CCOracles.h +++ /dev/null @@ -1,37 +0,0 @@ -// Copyright (c) 2016-2023 The Hush developers -// Distributed under the GPLv3 software license, see the accompanying -// file COPYING or https://www.gnu.org/licenses/gpl-3.0.en.html -/****************************************************************************** - * Copyright © 2014-2019 The SuperNET Developers. * - * * - * See the AUTHORS, DEVELOPER-AGREEMENT and LICENSE files at * - * the top-level directory of this distribution for the individual copyright * - * holder information and the developer policies on copyright and licensing. * - * * - * Unless otherwise agreed in a custom licensing agreement, no part of the * - * SuperNET software, including this file may be copied, modified, propagated * - * or distributed except according to the terms contained in the LICENSE file * - * * - * Removal or modification of this copyright notice is prohibited. * - * * - ******************************************************************************/ - - -#ifndef CC_ORACLES_H -#define CC_ORACLES_H - -#include "CCinclude.h" - -bool OraclesValidate(struct CCcontract_info *cp,Eval* eval,const CTransaction &tx, uint32_t nIn); -UniValue OracleCreate(const CPubKey& pk, int64_t txfee,std::string name,std::string description,std::string format); -UniValue OracleFund(const CPubKey& pk, int64_t txfee,uint256 oracletxid); -UniValue OracleRegister(const CPubKey& pk, int64_t txfee,uint256 oracletxid,int64_t datafee); -UniValue OracleSubscribe(const CPubKey& pk, int64_t txfee,uint256 oracletxid,CPubKey publisher,int64_t amount); -UniValue OracleData(const CPubKey& pk, int64_t txfee,uint256 oracletxid,std::vector data); -// CCcustom -UniValue OracleDataSample(uint256 reforacletxid,uint256 txid); -UniValue OracleDataSamples(uint256 reforacletxid,char* batonaddr,int32_t num); -UniValue OracleInfo(uint256 origtxid); -UniValue OraclesList(); - -#endif diff --git a/src/cc/CCPegs.h b/src/cc/CCPegs.h deleted file mode 100644 index 5cc2ce473..000000000 --- a/src/cc/CCPegs.h +++ /dev/null @@ -1,18 +0,0 @@ -// Copyright (c) 2016-2023 The Hush developers -// Distributed under the GPLv3 software license, see the accompanying -// file COPYING or https://www.gnu.org/licenses/gpl-3.0.en.html -/****************************************************************************** - * Copyright © 2014-2019 The SuperNET Developers. * - * * - * See the AUTHORS, DEVELOPER-AGREEMENT and LICENSE files at * - * the top-level directory of this distribution for the individual copyright * - * holder information and the developer policies on copyright and licensing. * - * * - * Unless otherwise agreed in a custom licensing agreement, no part of the * - * SuperNET software, including this file may be copied, modified, propagated * - * or distributed except according to the terms contained in the LICENSE file * - * * - * Removal or modification of this copyright notice is prohibited. * - * * - ******************************************************************************/ - diff --git a/src/cc/CCPrices.h b/src/cc/CCPrices.h deleted file mode 100644 index 592a63136..000000000 --- a/src/cc/CCPrices.h +++ /dev/null @@ -1,66 +0,0 @@ -// Copyright (c) 2016-2023 The Hush developers -// Distributed under the GPLv3 software license, see the accompanying -// file COPYING or https://www.gnu.org/licenses/gpl-3.0.en.html -/****************************************************************************** - * Copyright © 2014-2019 The SuperNET Developers. * - * * - * See the AUTHORS, DEVELOPER-AGREEMENT and LICENSE files at * - * the top-level directory of this distribution for the individual copyright * - * holder information and the developer policies on copyright and licensing. * - * * - * Unless otherwise agreed in a custom licensing agreement, no part of the * - * SuperNET software, including this file may be copied, modified, propagated * - * or distributed except according to the terms contained in the LICENSE file * - * * - * Removal or modification of this copyright notice is prohibited. * - * * - ******************************************************************************/ - - -#ifndef CC_PRICES_H -#define CC_PRICES_H - -#include "hush_defs.h" -#include "CCinclude.h" - -int32_t hush_priceget(int64_t *buf64,int32_t ind,int32_t height,int32_t numblocks); -extern void GetHushEarlytxidScriptPub(); -extern CScript HUSH_EARLYTXID_SCRIPTPUB; - -// #define PRICES_DAYWINDOW ((3600*24/ASSETCHAINS_BLOCKTIME) + 1) // defined in hush_defs.h -#define PRICES_TXFEE 10000 -#define PRICES_MAXLEVERAGE 777 -#define PRICES_SMOOTHWIDTH 1 -#define HUSH_MAXPRICES 2048 // must be power of 2 and less than 8192 -#define HUSH_PRICEMASK (~(HUSH_MAXPRICES - 1)) // actually 1111 1000 0000 0000 -#define PRICES_WEIGHT (HUSH_MAXPRICES * 1) // 0000 1000 0000 0000 -#define PRICES_MULT (HUSH_MAXPRICES * 2) // 0001 0000 0000 0000 -#define PRICES_DIV (HUSH_MAXPRICES * 3) // 0001 1000 0000 0000 -#define PRICES_INV (HUSH_MAXPRICES * 4) // 0010 0000 0000 0000 -#define PRICES_MDD (HUSH_MAXPRICES * 5) // 0010 1000 0000 0000 -#define PRICES_MMD (HUSH_MAXPRICES * 6) // 0011 0000 0000 0000 -#define PRICES_MMM (HUSH_MAXPRICES * 7) // 0011 1000 0000 0000 -#define PRICES_DDD (HUSH_MAXPRICES * 8) // 0100 0000 0000 0000 - -//#define PRICES_NORMFACTOR (int64_t)(SATOSHIDEN) -//#define PRICES_POINTFACTOR (int64_t)10000 - -#define PRICES_REVSHAREDUST 10000 -#define PRICES_SUBREVSHAREFEE(amount) ((amount) * 199 / 200) // revshare fee percentage == 0.005 -#define PRICES_MINAVAILFUNDFRACTION 0.1 // leveraged bet limit < fund fraction - -bool PricesValidate(struct CCcontract_info *cp,Eval* eval,const CTransaction &tx, uint32_t nIn); - -// CCcustom -UniValue PricesBet(int64_t txfee,int64_t amount,int16_t leverage,std::vector synthetic); -UniValue PricesAddFunding(int64_t txfee,uint256 bettxid,int64_t amount); -UniValue PricesSetcostbasis(int64_t txfee,uint256 bettxid); -UniValue PricesRekt(int64_t txfee,uint256 bettxid,int32_t rektheight); -UniValue PricesCashout(int64_t txfee,uint256 bettxid); -UniValue PricesInfo(uint256 bettxid,int32_t refheight); -UniValue PricesList(uint32_t filter, CPubKey mypk); -UniValue PricesGetOrderbook(); -UniValue PricesRefillFund(int64_t amount); - - -#endif diff --git a/src/cc/CCassets.h b/src/cc/CCassets.h deleted file mode 100644 index 3b03570f8..000000000 --- a/src/cc/CCassets.h +++ /dev/null @@ -1,50 +0,0 @@ -// Copyright (c) 2016-2023 The Hush developers -// Distributed under the GPLv3 software license, see the accompanying -// file COPYING or https://www.gnu.org/licenses/gpl-3.0.en.html -/****************************************************************************** - * Copyright © 2014-2019 The SuperNET Developers. * - * * - * See the AUTHORS, DEVELOPER-AGREEMENT and LICENSE files at * - * the top-level directory of this distribution for the individual copyright * - * holder information and the developer policies on copyright and licensing. * - * * - * Unless otherwise agreed in a custom licensing agreement, no part of the * - * SuperNET software, including this file may be copied, modified, propagated * - * or distributed except according to the terms contained in the LICENSE file * - * * - * Removal or modification of this copyright notice is prohibited. * - * * - ******************************************************************************/ - - -/* - CCassetstx has the functions that create the EVAL_ASSETS transactions. It is expected that rpc calls would call these functions. For EVAL_ASSETS, the rpc functions are in rpcwallet.cpp - - CCassetsCore has functions that are used in two contexts, both during rpc transaction create time and also during the blockchain validation. Using the identical functions is a good way to prevent them from being mismatched. The must match or the transaction will get rejected. - */ - -#ifndef CC_ASSETS_H -#define CC_ASSETS_H - -#include "CCinclude.h" - -// CCcustom -bool AssetsValidate(struct CCcontract_info *cp,Eval* eval,const CTransaction &tx, uint32_t nIn); - -// CCassetsCore -vscript_t EncodeAssetOpRet(uint8_t assetFuncId, uint256 assetid2, int64_t price, std::vector origpubkey); -uint8_t DecodeAssetTokenOpRet(const CScript &scriptPubKey, uint8_t &assetsEvalCode, uint256 &tokenid, uint256 &assetid2, int64_t &price, std::vector &origpubkey); -bool SetAssetOrigpubkey(std::vector &origpubkey,int64_t &price,const CTransaction &tx); -int64_t IsAssetvout(struct CCcontract_info *cp, int64_t &price, std::vector &origpubkey, const CTransaction& tx, int32_t v, uint256 refassetid); -bool ValidateBidRemainder(int64_t remaining_price,int64_t remaining_nValue,int64_t orig_nValue,int64_t received_nValue,int64_t paidprice,int64_t totalprice); -bool ValidateAskRemainder(int64_t remaining_price,int64_t remaining_nValue,int64_t orig_nValue,int64_t received_nValue,int64_t paidprice,int64_t totalprice); -bool ValidateSwapRemainder(int64_t remaining_price,int64_t remaining_nValue,int64_t orig_nValue,int64_t received_nValue,int64_t paidprice,int64_t totalprice); -bool SetBidFillamounts(int64_t &paid,int64_t &remaining_price,int64_t orig_nValue,int64_t &received,int64_t totalprice); -bool SetAskFillamounts(int64_t &paid,int64_t &remaining_price,int64_t orig_nValue,int64_t &received,int64_t totalprice); -bool SetSwapFillamounts(int64_t &paid,int64_t &remaining_price,int64_t orig_nValue,int64_t &received,int64_t totalprice); -int64_t AssetValidateBuyvin(struct CCcontract_info *cp,Eval* eval,int64_t &tmpprice,std::vector &tmporigpubkey,char *CCaddr,char *origaddr,const CTransaction &tx,uint256 refassetid); -int64_t AssetValidateSellvin(struct CCcontract_info *cp,Eval* eval,int64_t &tmpprice,std::vector &tmporigpubkey,char *CCaddr,char *origaddr,const CTransaction &tx,uint256 assetid); -bool AssetCalcAmounts(struct CCcontract_info *cpAssets, int64_t &inputs, int64_t &outputs, Eval* eval, const CTransaction &tx, uint256 assetid); - - -#endif diff --git a/src/cc/CCauction.h b/src/cc/CCauction.h deleted file mode 100644 index becbb86ff..000000000 --- a/src/cc/CCauction.h +++ /dev/null @@ -1,33 +0,0 @@ -// Copyright (c) 2016-2023 The Hush developers -// Distributed under the GPLv3 software license, see the accompanying -// file COPYING or https://www.gnu.org/licenses/gpl-3.0.en.html -/****************************************************************************** - * Copyright © 2014-2019 The SuperNET Developers. * - * * - * See the AUTHORS, DEVELOPER-AGREEMENT and LICENSE files at * - * the top-level directory of this distribution for the individual copyright * - * holder information and the developer policies on copyright and licensing. * - * * - * Unless otherwise agreed in a custom licensing agreement, no part of the * - * SuperNET software, including this file may be copied, modified, propagated * - * or distributed except according to the terms contained in the LICENSE file * - * * - * Removal or modification of this copyright notice is prohibited. * - * * - ******************************************************************************/ - - -#ifndef CC_AUCTION_H -#define CC_AUCTION_H - -#include "CCinclude.h" - -#define EVAL_AUCTION 0xe8 - -bool AuctionValidate(struct CCcontract_info *cp,Eval* eval,const CTransaction &tx, uint32_t nIn); - -std::string AuctionPost(uint64_t txfee,uint256 itemhash,int64_t minbid,char *title,char *description); -std::string AuctionBid(uint64_t txfee,uint256 itemhash,int64_t amount); -std::string AuctionDeliver(uint64_t txfee,uint256 itemhash,uint256 bidtxid); - -#endif diff --git a/src/cc/CCcustom.cpp b/src/cc/CCcustom.cpp index f526cd2fe..a0a6039e1 100644 --- a/src/cc/CCcustom.cpp +++ b/src/cc/CCcustom.cpp @@ -18,15 +18,6 @@ #include "key_io.h" #include "CCinclude.h" -#include "CCassets.h" -#include "CCfaucet.h" -#include "CCauction.h" -#include "CCfsm.h" -#include "CCHeir.h" -#include "CCOracles.h" -#include "CCPrices.h" -#include "CCPegs.h" -#include "CCtokens.h" int32_t CClib_initcp(struct CCcontract_info *cp,uint8_t evalcode) { diff --git a/src/cc/CCfaucet.h b/src/cc/CCfaucet.h deleted file mode 100644 index 4e3c40c1d..000000000 --- a/src/cc/CCfaucet.h +++ /dev/null @@ -1,31 +0,0 @@ -// Copyright (c) 2016-2023 The Hush developers -// Distributed under the GPLv3 software license, see the accompanying -// file COPYING or https://www.gnu.org/licenses/gpl-3.0.en.html -/****************************************************************************** - * Copyright © 2014-2019 The SuperNET Developers. * - * * - * See the AUTHORS, DEVELOPER-AGREEMENT and LICENSE files at * - * the top-level directory of this distribution for the individual copyright * - * holder information and the developer policies on copyright and licensing. * - * * - * Unless otherwise agreed in a custom licensing agreement, no part of the * - * SuperNET software, including this file may be copied, modified, propagated * - * or distributed except according to the terms contained in the LICENSE file * - * * - * Removal or modification of this copyright notice is prohibited. * - * * - ******************************************************************************/ -#ifndef CC_FAUCET_H -#define CC_FAUCET_H -#include "CCinclude.h" -#define EVAL_FAUCET 0xe4 -#define FAUCETSIZE (COIN / 10) - -bool FaucetValidate(struct CCcontract_info *cp,Eval* eval,const CTransaction &tx, uint32_t nIn); - -// CCcustom -UniValue FaucetFund(const CPubKey& mypk,uint64_t txfee,int64_t funds); -UniValue FaucetGet(const CPubKey& mypk,uint64_t txfee); -UniValue FaucetInfo(); - -#endif diff --git a/src/cc/CCfsm.h b/src/cc/CCfsm.h deleted file mode 100644 index 8c6f487f2..000000000 --- a/src/cc/CCfsm.h +++ /dev/null @@ -1,33 +0,0 @@ -// Copyright (c) 2016-2023 The Hush developers -// Distributed under the GPLv3 software license, see the accompanying -// file COPYING or https://www.gnu.org/licenses/gpl-3.0.en.html -/****************************************************************************** - * Copyright © 2014-2019 The SuperNET Developers. * - * * - * See the AUTHORS, DEVELOPER-AGREEMENT and LICENSE files at * - * the top-level directory of this distribution for the individual copyright * - * holder information and the developer policies on copyright and licensing. * - * * - * Unless otherwise agreed in a custom licensing agreement, no part of the * - * SuperNET software, including this file may be copied, modified, propagated * - * or distributed except according to the terms contained in the LICENSE file * - * * - * Removal or modification of this copyright notice is prohibited. * - * * - ******************************************************************************/ - - -#ifndef CC_FSM_H -#define CC_FSM_H - -#include "CCinclude.h" - -#define EVAL_FSM 0xe7 - -bool FSMValidate(struct CCcontract_info *cp,Eval* eval,const CTransaction &tx, uint32_t nIn); - -std::string FSMList(); -std::string FSMInfo(uint256 fsmtxid); -std::string FSMCreate(uint64_t txfee,std::string name,std::string states); - -#endif diff --git a/src/rpc/blockchain.cpp b/src/rpc/blockchain.cpp index 793dff4ab..b27e01db3 100644 --- a/src/rpc/blockchain.cpp +++ b/src/rpc/blockchain.cpp @@ -40,7 +40,6 @@ #include #include #include "cc/CCinclude.h" -#include "cc/CCPrices.h" using namespace std; From c6aa5e939d27892dd40fe4b526cc7ee39a1ea243 Mon Sep 17 00:00:00 2001 From: Duke Date: Sat, 10 Feb 2024 21:54:36 -0500 Subject: [PATCH 053/108] Delete more CCs #381 --- src/cc/betprotocol.h | 78 ---------- src/cc/dilithium.h | 346 ------------------------------------------- 2 files changed, 424 deletions(-) delete mode 100644 src/cc/betprotocol.h delete mode 100644 src/cc/dilithium.h diff --git a/src/cc/betprotocol.h b/src/cc/betprotocol.h deleted file mode 100644 index b8c4cf49e..000000000 --- a/src/cc/betprotocol.h +++ /dev/null @@ -1,78 +0,0 @@ -// Copyright (c) 2016-2023 The Hush developers -// Distributed under the GPLv3 software license, see the accompanying -// file COPYING or https://www.gnu.org/licenses/gpl-3.0.en.html -/****************************************************************************** - * Copyright © 2014-2019 The SuperNET Developers. * - * * - * See the AUTHORS, DEVELOPER-AGREEMENT and LICENSE files at * - * the top-level directory of this distribution for the individual copyright * - * holder information and the developer policies on copyright and licensing. * - * * - * Unless otherwise agreed in a custom licensing agreement, no part of the * - * SuperNET software, including this file may be copied, modified, propagated * - * or distributed except according to the terms contained in the LICENSE file * - * * - * Removal or modification of this copyright notice is prohibited. * - * * - ******************************************************************************/ - -#ifndef BETPROTOCOL_H -#define BETPROTOCOL_H - -#include "cc/eval.h" -#include "pubkey.h" -#include "primitives/transaction.h" -#include "cryptoconditions/include/cryptoconditions.h" - - -class MoMProof -{ -public: - MerkleBranch branch; - uint256 notarizationHash; - ADD_SERIALIZE_METHODS; - template - inline void SerializationOp(Stream& s, Operation ser_action) { - READWRITE(branch); - READWRITE(notarizationHash); - } -}; - - - -class BetProtocol -{ -protected: - std::vector playerConditions(); -public: - EvalCode disputeCode; - std::vector players; - std::vector vmParams; - uint32_t waitBlocks; - - // Utility - BetProtocol(EvalCode dc, std::vector ps, uint32_t wb, std::vector vmp) - : disputeCode(dc), waitBlocks(wb), vmParams(vmp), players(ps) {} - std::vector PlayerConditions(); - - // on PANGEA - CC* MakeDisputeCond(); - CMutableTransaction MakeSessionTx(CAmount spendFee); - CMutableTransaction MakeDisputeTx(uint256 signedSessionTxHash, uint256 vmResultHash); - CMutableTransaction MakePostEvidenceTx(uint256 signedSessionTxHash, - int playerIndex, std::vector state); - - // on HUSH - CC* MakePayoutCond(uint256 signedSessionTxHash); - CMutableTransaction MakeStakeTx(CAmount totalPayout, uint256 signedSessionTx); - CMutableTransaction MakeAgreePayoutTx(std::vector payouts, uint256 signedStakeTxHash); - CMutableTransaction MakeImportPayoutTx(std::vector payouts, - CTransaction signedDisputeTx, uint256 signedStakeTxHash, MoMProof momProof); -}; - - - -bool GetOpReturnHash(CScript script, uint256 &hash); - - -#endif /* BETPROTOCOL_H */ diff --git a/src/cc/dilithium.h b/src/cc/dilithium.h deleted file mode 100644 index 91d0a0753..000000000 --- a/src/cc/dilithium.h +++ /dev/null @@ -1,346 +0,0 @@ -// Copyright (c) 2016-2023 The Hush developers -// Distributed under the GPLv3 software license, see the accompanying -// file COPYING or https://www.gnu.org/licenses/gpl-3.0.en.html -#include - -#ifndef HUSH_DILITHIUM_H -#define HUSH_DILITHIUM_H - -#define SHAKE128_RATE 168 -#define SHAKE256_RATE 136 - -void shake128_absorb(uint64_t *s, const uint8_t *input, int32_t inlen); -void shake128_squeezeblocks(uint8_t *output, int32_t nblocks, uint64_t *s); -void shake256_absorb(uint64_t *s, const uint8_t *input, int32_t inlen); -void shake256_squeezeblocks(uint8_t *output, int32_t nblocks, uint64_t *s); -void shake128(uint8_t *output, int32_t outlen, const uint8_t *input, int32_t inlen); -void shake256(uint8_t *output, int32_t outlen, const uint8_t *input, int32_t inlen); - -#endif - -#ifndef PARAMS_H -#define PARAMS_H - -#ifndef MODE -#define MODE 3 -#endif - -#define SEEDBYTES 32U -#define CRHBYTES 48U -#define N 256U -#define Q 8380417U -#define QBITS 23U -#define ROOT_OF_UNITY 1753U -#define D 14U -#define GAMMA1 ((Q - 1U)/16U) -#define GAMMA2 (GAMMA1/2U) -#define ALPHA (2U*GAMMA2) - -#if MODE == 0 -#define K 3U -#define L 2U -#define ETA 7U -#define SETABITS 4U -#define BETA 375U -#define OMEGA 64U - -#elif MODE == 1 -#define K 4U -#define L 3U -#define ETA 6U -#define SETABITS 4U -#define BETA 325U -#define OMEGA 80U - -#elif MODE == 2 -#define K 5U -#define L 4U -#define ETA 5U -#define SETABITS 4U -#define BETA 275U -#define OMEGA 96U - -#elif MODE == 3 -#define K 6U -#define L 5U -#define ETA 3U -#define SETABITS 3U -#define BETA 175U -#define OMEGA 120U - -#endif - -#define POL_SIZE_PACKED ((N*QBITS)/8) -#define POLT1_SIZE_PACKED ((N*(QBITS - D))/8) -#define POLT0_SIZE_PACKED ((N*D)/8) -#define POLETA_SIZE_PACKED ((N*SETABITS)/8) -#define POLZ_SIZE_PACKED ((N*(QBITS - 3))/8) -#define POLW1_SIZE_PACKED ((N*4)/8) -#define POLVECK_SIZE_PACKED (K*POL_SIZE_PACKED) -#define POLVECL_SIZE_PACKED (L*POL_SIZE_PACKED) - -#define CRYPTO_PUBLICKEYBYTES (SEEDBYTES + K*POLT1_SIZE_PACKED) -#define CRYPTO_SECRETKEYBYTES (2*SEEDBYTES + (L + K)*POLETA_SIZE_PACKED + CRHBYTES + K*POLT0_SIZE_PACKED) -#define CRYPTO_BYTES (L*POLZ_SIZE_PACKED + (OMEGA + K) + (N/8 + 8)) - -#endif -#ifndef POLY_H -#define POLY_H - -//#include -//#include "params.h" -//#include "fips202.h" - -typedef struct { - uint32_t coeffs[N]; -} poly __attribute__((aligned(32))); - -void poly_reduce(poly *a); -void poly_csubq(poly *a); -void poly_freeze(poly *a); - -void poly_add(poly *c, const poly *a, const poly *b); -void poly_sub(poly *c, const poly *a, const poly *b); -void poly_neg(poly *a); -void poly_shiftl(poly *a, uint32_t k); - -void poly_ntt(poly *a); -void poly_invntt_montgomery(poly *a); -void poly_pointwise_invmontgomery(poly *c, const poly *a, const poly *b); - -void poly_power2round(poly *a1, poly *a0, const poly *a); -void poly_decompose(poly *a1, poly *a0, const poly *a); -uint32_t poly_make_hint(poly *h, const poly *a, const poly *b); -void poly_use_hint(poly *a, const poly *b, const poly *h); - -int poly_chknorm(const poly *a, uint32_t B); -void poly_uniform(poly *a, const uint8_t *buf); -void poly_uniform_eta(poly *a, - const uint8_t seed[SEEDBYTES], - uint8_t nonce); -void poly_uniform_gamma1m1(poly *a, - const uint8_t seed[SEEDBYTES + CRHBYTES], - uint16_t nonce); - -void polyeta_pack(uint8_t *r, const poly *a); -void polyeta_unpack(poly *r, const uint8_t *a); - -void polyt1_pack(uint8_t *r, const poly *a); -void polyt1_unpack(poly *r, const uint8_t *a); - -void polyt0_pack(uint8_t *r, const poly *a); -void polyt0_unpack(poly *r, const uint8_t *a); - -void polyz_pack(uint8_t *r, const poly *a); -void polyz_unpack(poly *r, const uint8_t *a); - -void polyw1_pack(uint8_t *r, const poly *a); -#endif -#ifndef POLYVEC_H -#define POLYVEC_H - -//#include -//#include "params.h" -//#include "poly.h" - -/* Vectors of polynomials of length L */ -typedef struct { - poly vec[L]; -} polyvecl; - -void polyvecl_freeze(polyvecl *v); - -void polyvecl_add(polyvecl *w, const polyvecl *u, const polyvecl *v); - -void polyvecl_ntt(polyvecl *v); -void polyvecl_pointwise_acc_invmontgomery(poly *w, - const polyvecl *u, - const polyvecl *v); - -int polyvecl_chknorm(const polyvecl *v, uint32_t B); - - - -/* Vectors of polynomials of length K */ -typedef struct { - poly vec[K]; -} polyveck; - -void polyveck_reduce(polyveck *v); -void polyveck_csubq(polyveck *v); -void polyveck_freeze(polyveck *v); - -void polyveck_add(polyveck *w, const polyveck *u, const polyveck *v); -void polyveck_sub(polyveck *w, const polyveck *u, const polyveck *v); -void polyveck_shiftl(polyveck *v, uint32_t k); - -void polyveck_ntt(polyveck *v); -void polyveck_invntt_montgomery(polyveck *v); - -int polyveck_chknorm(const polyveck *v, uint32_t B); - -void polyveck_power2round(polyveck *v1, polyveck *v0, const polyveck *v); -void polyveck_decompose(polyveck *v1, polyveck *v0, const polyveck *v); -uint32_t polyveck_make_hint(polyveck *h, - const polyveck *u, - const polyveck *v); -void polyveck_use_hint(polyveck *w, const polyveck *v, const polyveck *h); - -#endif - -#ifndef NTT_H -#define NTT_H - -//#include -//#include "params.h" - -void ntt(uint32_t p[N]); -void invntt_frominvmont(uint32_t p[N]); - -#endif -#ifndef PACKING_H -#define PACKING_H - -//#include "params.h" -//#include "polyvec.h" - -void pack_pk(uint8_t pk[CRYPTO_PUBLICKEYBYTES], - const uint8_t rho[SEEDBYTES], const polyveck *t1); -void pack_sk(uint8_t sk[CRYPTO_SECRETKEYBYTES], - const uint8_t rho[SEEDBYTES], - const uint8_t key[SEEDBYTES], - const uint8_t tr[CRHBYTES], - const polyvecl *s1, - const polyveck *s2, - const polyveck *t0); -void pack_sig(uint8_t sig[CRYPTO_BYTES], - const polyvecl *z, const polyveck *h, const poly *c); - -void unpack_pk(uint8_t rho[SEEDBYTES], polyveck *t1, - const uint8_t pk[CRYPTO_PUBLICKEYBYTES]); -void unpack_sk(uint8_t rho[SEEDBYTES], - uint8_t key[SEEDBYTES], - uint8_t tr[CRHBYTES], - polyvecl *s1, - polyveck *s2, - polyveck *t0, - const uint8_t sk[CRYPTO_SECRETKEYBYTES]); -int unpack_sig(polyvecl *z, polyveck *h, poly *c, - const uint8_t sig[CRYPTO_BYTES]); - -#endif -#ifndef REDUCE_H -#define REDUCE_H - -//#include - -#define MONT 4193792U // 2^32 % Q -#define QINV 4236238847U // -q^(-1) mod 2^32 - -/* a <= Q*2^32 => r < 2*Q */ -uint32_t montgomery_reduce(uint64_t a); - -/* r < 2*Q */ -uint32_t reduce32(uint32_t a); - -/* a < 2*Q => r < Q */ -uint32_t csubq(uint32_t a); - -/* r < Q */ -uint32_t freeze(uint32_t a); - -#endif -#ifndef ROUNDING_H -#define ROUNDING_H - -//#include - -uint32_t power2round(const uint32_t a, uint32_t *a0); -uint32_t decompose(uint32_t a, uint32_t *a0); -uint32_t make_hint(const uint32_t a, const uint32_t b); -uint32_t use_hint(const uint32_t a, const uint32_t hint); - -#endif -#ifndef SIGN_H -#define SIGN_H - -//#include "params.h" -//#include "poly.h" -//#include "polyvec.h" - -void expand_mat(polyvecl mat[K], const uint8_t rho[SEEDBYTES]); -void challenge(poly *c, const uint8_t mu[CRHBYTES], - const polyveck *w1); - -int crypto_sign_keypair(uint8_t *pk, uint8_t *sk); - -int crypto_sign(uint8_t *sm, int32_t *smlen, - const uint8_t *msg, int32_t len, - const uint8_t *sk); - -int crypto_sign_open(uint8_t *m, int32_t *mlen, - const uint8_t *sm, int32_t smlen, - const uint8_t *pk); - -#endif - -#ifndef API_H -#define API_H - -#ifndef MODE -#define MODE 3 -#endif - -#if MODE == 0 -#if CRYPTO_PUBLICKEYBYTES -896U -CRYPTO_PUBLICKEYBYTES size error -#endif -#if CRYPTO_SECRETKEYBYTES -2096U -CRYPTO_SECRETKEYBYTES size error -#endif -#if CRYPTO_BYTES -1387U -CRYPTO_BYTES size error -#endif - -#elif MODE == 1 -#if CRYPTO_PUBLICKEYBYTES -1184U -CRYPTO_PUBLICKEYBYTES size error -#endif -#if CRYPTO_SECRETKEYBYTES -2800U -CRYPTO_SECRETKEYBYTES size error -#endif -#if CRYPTO_BYTES -2044U -CRYPTO_BYTES size error -#endif - -#elif MODE == 2 -#if CRYPTO_PUBLICKEYBYTES -1472U -CRYPTO_PUBLICKEYBYTES size error -#endif -#if CRYPTO_SECRETKEYBYTES -3504U -CRYPTO_SECRETKEYBYTES size error -#endif -#if CRYPTO_BYTES -2701U -CRYPTO_BYTES size error -#endif - -#elif MODE == 3 -#if CRYPTO_PUBLICKEYBYTES -1760U -CRYPTO_PUBLICKEYBYTES size error -#endif -#if CRYPTO_SECRETKEYBYTES -3856U -CRYPTO_SECRETKEYBYTES size error -#endif -#if CRYPTO_BYTES -3366U -CRYPTO_BYTES size error -#endif - -#endif - -#define CRYPTO_ALGNAME "Dilithium" - -int crypto_sign_keypair(uint8_t *pk, uint8_t *sk); -int crypto_sign(uint8_t *sm, int32_t *smlen, const uint8_t *msg, int32_t len, const uint8_t *sk); -int crypto_sign_open(uint8_t *m, int32_t *mlen, const uint8_t *sm, int32_t smlen, const uint8_t *pk); - -#endif From 958bc486d4acf4e445a00aeff28098ce012e229a Mon Sep 17 00:00:00 2001 From: Duke Date: Sat, 10 Feb 2024 22:37:22 -0500 Subject: [PATCH 054/108] Delete more CCs #381 --- src/cc/CCinclude.h | 40 ------- src/cc/CCtokenutils.cpp | 236 ++-------------------------------------- src/cc/CCutils.cpp | 121 ++------------------ src/cc/customcc.cpp | 22 +--- src/script/cc.cpp | 40 +------ 5 files changed, 21 insertions(+), 438 deletions(-) diff --git a/src/cc/CCinclude.h b/src/cc/CCinclude.h index 3af9e0711..9846939fb 100644 --- a/src/cc/CCinclude.h +++ b/src/cc/CCinclude.h @@ -18,41 +18,6 @@ #ifndef CC_INCLUDE_H #define CC_INCLUDE_H -/*! \file CCinclude.h -\brief Cryptoconditions - -CCs for teh lulz - -*/ - -/// \mainpage Brief introduction into cryptocondition contracts -/// There are only a very few types in bitcoin: pay to pubkey, pay to pubkey hash and pay to script hash (p2pk, p2pkh, p2sh). -/// There are actually more that are possible, but those three are 99%+ of bitcoin transactions. -/// So you can pay to a pubkey, or to its hash or to a script's hash. The last is how most of the more complex scripts are invoked. To spend a p2sh vout, you need to provide the redeemscript, -/// this script's hash is what the p2sh address was. -/// All of the above are the standard bitcoin vout types and there should be plenty of materials about it. -/// -/// Cryptoconditions (CC) contracts created a fourth type of vout, the CC vout. This is using the cryptoconditions standard and it is even a different signature mechanism, -/// ed25519 instead of secp256k1. It is basically a big extension to the bitcoin script. There is a special opcode that is added that says it is a CC script. -/// -/// But it gets more interesting. Each CC script has an evalcode. -/// This is just an arbitrary number but what it does is allows to create a self-contained universe of CC utxo that all have the same evalcode and that is -/// how a faucet CC contract differentiates itself from a dice CC contract, the eval code is different. -/// -/// One effect from using a different eval code is that even if the rest of the CC script is the same, the bitcoin address that is calculated is different. -/// What this means is that for each pubkey, there is a unique address for each different eval code! -/// And this allows efficient segregation of one CC contracts transactions from another. -/// The final part that will make it all clear how the funds can be locked inside the contract. -/// This is what makes a contract, a contract. -/// I put both the privkey and pubkey for a randomly chosen address and associate it with each CC contract. -/// That means anybody can sign outputs for that privkey. -/// However, it is a CC output, so in addition to the signature, whatever constraints a CC contract implements must also be satistifed. -/// This allows funds to be locked and yet anybody is able to spend it, assuming they satisfy the CC's rules. -/// -/// One other technical note is that Hush has the insight-explorer extensions built in -/// so it can lookup directly all transactions to any address. -/// This is a key performance boosting thing as if it wasnt there, trying to get all the utxo for an address not in the wallet is quite time consuming. -/// #include #include