Update all platforms to miniupnpc 2.2.2 and Windows to Python 3.9 #6703
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
Tested on MacOS x86_64 and working |
canhmai
added a commit
to canhmai/chia-blockchain
that referenced
this pull request
Jul 4, 2021
* Minor fixes to how 'chia farm summary' handles wallet errors (Chia-Network#6653) * Minor fixes to how 'chia farm summary' handles wallet errors * Fix command to proper chia start wallet * Fixed up code per comments * Fix UI refreshes. (Chia-Network#6639) * Add event for new peak. * Refresh connections for farmer and wallet. * Display syncing x/x instead of x/0. * Refresh UI connections tasks. * Preventive catch exception inside new_peak related to UI tasks. * Add back black line. * Try to optimize refreshes. * Limit refreshes. * Try 1s sleep. * Typo in the comment. * Try 1.5s * Update all platforms to miniupnpc 2.2.2 and Windows to Python 3.9 (Chia-Network#6703) * Update all platforms to miniupnpc 2.2.2 and Windows to Python 3.9 * Actually use python 3.9 in Windows * Less log getter setup calls (Chia-Network#6123) * init * remove whitespace * docs * rem double colon * more type annotation * retrigger timed out test Co-authored-by: wjblanke * add missing cost constants for conditions (Chia-Network#6655) * Log syslog (Chia-Network#6490) * Keep mnemnic as secret as possible * Add logging support for remote syslog * Fix lint (W293 and E251) * syslog Formatter in one line * Set log_syslog to False in case not specified * Bump github/super-linter from 4.0.2 to 4.2.2 (Chia-Network#6762) Bumps [github/super-linter](https://github.com/github/super-linter) from 4.0.2 to 4.2.2. - [Release notes](https://github.com/github/super-linter/releases) - [Commits](github/super-linter@v4.0.2...v4.2.2) --- updated-dependencies: - dependency-name: github/super-linter dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Fix timelord bug (Chia-Network#6761) * Fix timelord bug * Fix lint * Another lint fix * Refresh download/upload rates in farmer. (Chia-Network#6776) * factor out common parts of mempool condition tests (Chia-Network#6770) * Validate summaries while syncing (Chia-Network#5284) * block pre process check se matches wp * test * test * test * lint * merge * lint * Release Pipeline (Chia-Network#3588) Release Pipeline Co-authored-by: Justin England <justin@chia.net> Co-authored-by: Chris Marslender <chrismarslender@gmail.com> * fix windows artifact name (Chia-Network#6784) * change checksum extension to algorithm (Chia-Network#6788) Change file extensions on checksum files to sha256 * Fix compact error message. (Chia-Network#6808) * extend and improve Mempool tests (Chia-Network#6781) * make sure mempool condition tests fail for the right reason * use int_to_bytes * add more mempool condition tests * simplify one mempool test * move chia.util.block_tools and chia.util.wallet_tools into tests (Chia-Network#6799) * move chia.util.block_tools and chia.util.wallet_tools into tests * only depend on block_tools when we actually run the wallet in test mode * fix flaky cc test (Chia-Network#6800) * fix flaky cc test * lint * add assert * lower test times * dont use timeout * lint * don't use wall-clock time in mempool test for absolute time condition. The validation does not use wall-clock, but expected time based on the peak timestamp (Chia-Network#6801) * second times a charm (Chia-Network#6834) * second times a charm * Update .github/workflows/build-linux-arm64-installer.yml Co-authored-by: Chris Marslender <chris@chia.net> * Update .github/workflows/build-linux-installer.yml Co-authored-by: Chris Marslender <chris@chia.net> * fixing yaml bug * fixing syntax Co-authored-by: Chris Marslender <chris@chia.net> * remove non-ascii space (Chia-Network#6842) * factor out common test boilerplate from mempool tests (Chia-Network#6815) * Adds Farmer and Pool public keys to API. Required for Chia-Network/chia-blockchain-gui#286 (Chia-Network#6694) Co-authored-by: Animazing <Animazing@protonmail.com> * fix typo in build-linux-installer.yml and build-linux-arm64-installer.yml * generate and upload torrent files (Chia-Network#6810) Generate and Upload torrent files for chia installers. Files are located here: https://s3.console.aws.amazon.com/s3/buckets/download-chia-net?region=us-west-2&prefix=torrents/&showversions=false * fix yml syntax (Chia-Network#6903) * fix mypy warning (Chia-Network#6910) * Bump clvm rs version (Chia-Network#6892) * use deserialize_and_run_program2 from clvm_rs * bump clvm_rs to 0.1.8 * bump clvm to 0.9.7 * Notify glue API as each installer is done building (Chia-Network#6922) * validate more aspects of conditions earlier (Chia-Network#6654) * validate more aspects of conditions earlier, in the process clvm execution is offloaded to * more tests * use as_int() in SExp rather than int_from_bytes() * put condition parser tests in its own test class * capitalize module-scope variable * abbreviate enum names in parse_condition_args * use a more realistic cost per byte in test_rom * merge parse_coin_id and parse_hash, since they are identical * check, and limit, memory usage of tests (Chia-Network#6964) * service singleton (Chia-Network#6735) * use is_trusted_peer (Chia-Network#6830) * use is_trusted_peer * fix indentation * lint * dont assume localhost is trusted * wallet short batch sync (Chia-Network#6112) * short batch sync * switch log for fixing ci * switch log level back * increase test time * new line * test fix * change sem to lock * change sem to lock * refactor * move weight check under lock * short sync tests * lint * remove duplicate code * remove duplicate code * add await * fix * configure aws creds (Chia-Network#7043) * check if has secret * config branch of submodule mozilla-ca. based on 7020 from opct (Chia-Network#7044) * Sanity check correct header hash in replace proof. (Chia-Network#7045) * Pools mainnet (Chia-Network#7047) * added clarifying comments * WIP test * added WIP test * Refine genesis challenge. Remove unnecessary pool_puzzle function * Sign spend. Remove create_member_spend. Rename state transition function to create_travel_spend * Rename create_member_spend to create_travel_spend * Add singleton id logging * Enhance logging for debugging * renaming * rephrase inside the puzzle * fixed signing and added some support functions * Fix issue with announcement * Progress spending the singleton * Fix arguments to pool_state_to_inner_puzzle call * Fix arguments to pool_state_to_inner_puzzle * Improve error message when wallet is not running * Remove misleading message about missing wallet process, when problem is the farmer by making poolnft command error out earlier * Fix parent coin info bug * Multiple state transitions in one block * Lint * Remove assert * Fix incorrect p2_singleton_ph calculation (thanks nil00) * Update waiting room puzzle to accept genesis_challenge * Update calls to create_waiting * Go to waiting state from committed state * Augment debug_spend_bundle * fix 2 bugs in wallet * Fix lint * fix bad_agg_sig bug * Tests and lint * remove breakpoint * fix clvm tests for new hexs and hashs * Fixed a bug in the coin store that was probably from merging. (Chia-Network#6577) * Fixed a bug in the coin store that was probably from merging. * The exception doesn't need to be there * CI Lint fix * Added lifecycle tests for pooling drivers (Chia-Network#6610) * Ms.poolabsorb (Chia-Network#6615) * Support for absorbing rewards in pools (untested) * Style improvements * More work on absorb * Revert default root and remove log * Revert small plots * Use real sub slot iters * Update types * debug1 * Fix bugs * fix output of agg sig log messages * Make fewer calls to pw_status in test * remove old comment * logging and state management * logging * small bug fix & rename for accuracy * format * Fix types for uncurry function * lint * Update test to use exceptions * Change assumptions about self-pooling in lifecycle test * Install types for mypy * Revert "Install types for mypy" This reverts commit a82dcb7. * install types for mypy * install types for mypy * More keys * Remove flags requiring interactive prompts * Change initial spend to waiting room if self-pooling * lint * lint * linting * Refactor test * Use correct value in log message * update p2_singleton_or_delated_puzhash * initial version of pool wallet with p2_singleton_or_delay * run black formatting * fix rebase wonkiness * fix announcement code in p2_singleton_or_delayed * removed redundant defaulting standardised hexstr handling * lint fixes * Fixed pool lifecycle tests to current standards, but discovered tests are not validating signatures * Signatures validate on this test now although the test still does not check it. * Lint fix * Fixed plotnft show and linting errors * fixed failing farmer/harvester rpc test * lint fix * Commenting out some outdated tests * Updated test coverage * lint fix * Some minor P2singleton improvements (Chia-Network#6325) * Improve some debugging tools. * Tidy pool clvm. * Use `SINGLETON_STRUCT`. Remove unused `and` macro. * Use better name `SINGLETON_MOD_HASH`. * Finish lifecycle test suite. * Fixing for merge with chia-blockchain/pools_delayed_puzzle (Chia-Network#72) Co-authored-by: Matt Hauff <quexington@gmail.com> * Default delay time was being set incorrectly * Extracted get_delayed_puz_info_from_launcher_spend to driver code * Ms.taproot plot2 (Chia-Network#6692) * Start work on adding taproot to new plots * Fix issue in block_tools * new test-cache * Lint * DID fixexs * Fix other tests * Python black * Fix full node store test * Ensure block index <= 128 bits. * fix test_pool_config test * fix comments in pool_config and in chialisp files * self_pool -> pool -> self_pool * Implement leaving pools * Fix conflicts with main via mini-rebase * Fixup rebase mistakes * Bring in Mariano's node discovery chagnes from pools.dev * Fix adapters - Thanks Richard * build tests * Add pools tests * Disable DID tests * farmer|protocol: Some renaming related to the pool protocol * farmer: Use `None` instead of `{}` and add local `pool_state` * protocol|farmer: Introduce and use `PoolErrorCode` * rename: `pool_payout_instructions` -> `payout_instructions` * refactor: `AuthenticationKeyInfo` -> `authentication_key` * refactor: Move `launcher_id` up * rename: Some variable name changes * rename: `points_balance` -> `points` * format: Squash aggregation into one line * farmer: Make `update_pool_state` public * farmer: Print traceback if `update_pool_state` fails * farmer: Periodically call `GET /pool_info`, add `_pool_get_pool_info` * farmer: Add `authentication_token_timeout` to `pool_state` Fetch it from `GET /pool_info` * protocol|farmer: Implement support for `GET|POST|PUT /farmer` * farmer: Make use of `GET|POST /farmer` - To make the farmer known by the pool - To update local balance/difficulty from the pool periodically * farmer|protocol: Adjust `POST /partial` to match the latest spec * farmer: Hash messages before signing * pools: Drop unused code * farmer: Fix aggregation of partial signatures * farmer: support self pooling, don't pool if url=="" * wallet: return uint64 for delay time, instead of bytes * pool: add error code for delay time too short * farmer: cleaner logging when no connection to pool * farmer: add harvester node id to pool protocol * Rename method (test fix) and lint fix * Change errors to warnings (pool communication) * Remove pool callbacks on a reorg * farmer: Continue earlier when no pool URL is provided * farmer: Print method in log * farmer: Handle exceptions for all pool endpoint calls * farmer|protocol: Keep track of failed requests to the pool * farmer: Fix typo which caused issue with pooling * wallet: simplify solution_to_extra_data * tests: Comment out DID tests which are not working yet * Remove DID Wallet test workflows * Return launcher_id when creating Pool Wallet * Name p2_singleton_puzzle_hash correctly * Improve 'test_singleton_lifecycle_fast.py'. * Make test more robust in the face of asynchronous adversity * Add commandline cmds for joining and leaving pools * Fix poolnft leave params * Remove redundant assignment brought in from main * Remove unneeded code * Style and parsimony * pool_puzzles: Check was wrong, and bad naming * format: Fix linting * format: Remove log and rename variable * pool-wallet: Fix self pooling with multiple pool wallets. Don't remove interested puzzle_hash * gui: Use pools branch * format: fix lint * Remove ununsed code, improve initial_pool_state_from_dict * farmer: Instantly update the config, when config file changes * format: Speed up loading of the authentication key * logging: less annoying logging * Test pool NFT creation directly to pool * Test switching pools without self-farming in between * lint * pooling: Use integer for protocol version (Chia-Network#6797) * pooling: Use integer for protocol version * pooling: Fix import * Update GUI commit * Ms.login2 (Chia-Network#6804) * pooling: Login WIP * pooling: add RPC for get_link * dont use timeout * pooling: rename to get_login_link * format: remove logging * Fix SES test * Required cli argument Co-authored-by: almog <almogdepaz@gmail.com> * farmer|protocols: Rename `current_difficulty` for `POST /partial` (Chia-Network#6807) * Fix to farm summary * Use target_puzzlehash param name in RPC call * Pool test coverage (Chia-Network#6782) * Improvement in test coverage and typing * Added an extra absorb to the pool lifecycle test (only works when merged with Chia-Network#6733) * Added new drivers for the p2_singleton puzzles * Added new tests and test coverage for singletons * organize pools testing directory * black formatting * black formatting in venv * lint fix * Update CI tests * Fixing tests post rebase * lint fix * Minor readability fix Co-authored-by: matt <matt@chia.net> * farmer: Drop `target_puzzle_hash` from `GET /farmer` and `GET /login` (Chia-Network#6816) * Allow creation of PlotNFTs in self-farming state * gui: Fix install with more RAM (Chia-Network#6821) * Allow implicit payout_address in self-pool state, improve error messages and param ergonomics * print units in non-standard wallets correctly * Fix farmer import * Make syncing message in CLI more intuitive like the GUI * Fix linting and show header hash instead of height * gui: Update to 725071236eff8c81d5b267dc8eb69d7e03f3df8c * Revert "Merge" This reverts commit 23a1e68, reversing changes made to a850246. * Revert "Revert "Merge"" This reverts commit 6803318. * Treat tx_record as Dict. Refactor tx submission * Also add passed-in coin spends when processing new blocks in reconsider_peak * Test utilities had moved * Fix import of moved block_tools * Potentially fix yaml * Previously didn't take the right part of this change * Add -y flag, improve commandline plotnft handling * Fix typo * Add -y flag to plotnft create * pool_wallet: Restore from DB properly * wallet: ignore bad pool configs * Reduce memory * pool_wallet: Add claim command * pool_wallet: Set transaction records to confirmed * wallet: Fix bug in transaction cache * Formatting and remove log * pool_wallet: CLI balance and improvements to plotnft_funcs.py * pool_wallet: Simplify, and fix issue with double submission * pool_wallet: Fix tests * pool_wallet: Don't allow switching before relative lock height * update gui * change to 3000 mem * Correct sense of -y flag for self-pooling * cli: Display payout instructions for pool * pool_wallet: Don't create massive transactions * cli: Improvements to plotnft * pool_wallet: Get correct pool state * pool_wallet: Use last transaction block to prevent condition failure * Add block height for current state * Add outstanding unconfirmed transactions to pw_status * Refine command line plotnft show pending transactions * Fix tests by using the correct output from pw_status * Try to fix windows build * Print expected leave height * label pool urls * pool_wallet: Don't include pool 1.75 rewards in total * wallet: Add RPC and CLI for deleting unconfirmed transactions for a wallet * pool_wallet: If farming to a pool, show 0 balance in wallet * pool_wallet: Show error message if invalid state, in CLI * pool_wallet: Don't allow switching if there are pending unconfirmed transactions * tests: Clean up pool test logging * tests: Fix lint * Changed the pool innerpuzzes (Chia-Network#6802) * overload solutions for pool_innerpuz parameters * Fix tests for reduced size puzzles * deleted messy deprecated test * Fix lint. * fix bug where spend types were the wrong way around * merge with richard's lint fix * fix wallet bug remove unnecessary signature add defun-inline for clarity * Swap to defun for absorb case Use cons box for member innerpuz solution * fix if statement for cons box p1 * remove unnecessary solution arg * quick innerpuz fix to make tests pass * Switch to key-value pairs Undo cons box solution in pool_member inner puzzle * fix singleton lifecycle test * added some comments to calrify the meaning on "ps" * lint fix * reduce label size, search for label when reconstructing from solution * no need to keep looping if `p` found * lint fix * Removed unecessary defun-inline and changed hyphens to underscores * Changed created_coin_value_or_0 to an inline function * Changed morph_condition to an inline function * Added a comment for odd_cons_m113 * Rename output_odd and odd_output_found * Add inline functions to document the lineage proof values * Stager two rewrite * Added an ASSER_MY_AMOUNT to p2_singleton_or_delayed * Extract truth functionality to singleton_truths.clib * Fix tree hashes * Changed truths to a struct rather than a list. * fix test_singletons update did_innerpuz * recompile did_innerpuz * fix a log error * Renamed variable and factored out code per @richardkiss * lint fix * switch launcher extra_data to key_value pairs * fix parsing of new format of extra_data in launcher solution * fix broken test for new launcher solution format * remove bare raise Co-authored-by: Richard Kiss <him@richardkiss.com> Co-authored-by: Matt Hauff <quexington@gmail.com> * Also add passed-in coin spends when processing new blocks in reconsider_peak (Chia-Network#6898) Co-authored-by: Adam Kelly <aqk> * Moved debug_spend_bundle and added it to the SpendBundle object (Chia-Network#6840) * Moved debug_spend_bundle and added it to the SpendBundle object * Remove problematic typing * Add testnet config * wallet: Memory would get corrupted if there was an error (Chia-Network#6902) * wallet: Memory would get corrupted if there was an error * wallet: Use block_record * wallet: Add records in a full fork too * wallet: remove unnecessary arguments in CC and DID * add to cache, revert if transaction fails Co-authored-by: Yostra <straya@chia.net> * Improve comment * pool_wallet: Fix driver bug * wallet: Fix memory corruption * gui: Update to latest * Increase memory size * tests: Add test for absorbing from pool * small fix in solution_to_extra_data * Fixed incorrect function name * pooling: Fix EOS handling in full node * [pools.testnet9]add post /partial and /farmer header (Chia-Network#6957) * Update farmer.py add post header * Update farmer_api.py add post header * Update chia/farmer/farmer.py Co-authored-by: dustinface <35775977+xdustinface@users.noreply.github.com> * Update chia/farmer/farmer_api.py Co-authored-by: dustinface <35775977+xdustinface@users.noreply.github.com> Co-authored-by: Mariano Sorgente <3069354+mariano54@users.noreply.github.com> Co-authored-by: dustinface <35775977+xdustinface@users.noreply.github.com> * Fix lint and cleanup farmer.py * farmer: Fix linting issues (Chia-Network#7010) * Handle the case of incorrectly formatted PoolState data returned from inner singleton * wallet: Resubmit transaction if not successful, rename to new_transaction_block_callback (Chia-Network#7008) * Fix lint in pool_puzzles * pooling: Fix owner private key lookup, and remove unnecessary argument * pooling: Clear target state on `delete_unconfirmed_transactions` * Lint * Fix non-deterministic test * Slight cleanup clvm driver code (Chia-Network#7028) * Return None when a deserialized CLVM structure does not fit the expected format of var-value pair for singleton data * lint Co-authored-by: Adam Kelly <aqk> * Revert "Add testnet config" This reverts commit 9812442. Co-authored-by: matt <matt@chia.net> Co-authored-by: Adam Kelly <aqk@aqk.im> Co-authored-by: Mariano Sorgente <sorgente711@gmail.com> Co-authored-by: Matt Hauff <quexington@gmail.com> Co-authored-by: Mariano Sorgente <3069354+mariano54@users.noreply.github.com> Co-authored-by: Adam <aqk@Adams-MacBook-Pro.local> Co-authored-by: Adam Kelly <aqk> Co-authored-by: Richard Kiss <him@richardkiss.com> Co-authored-by: xdustinface <xdustinfacex@gmail.com> Co-authored-by: almog <almogdepaz@gmail.com> Co-authored-by: dustinface <35775977+xdustinface@users.noreply.github.com> Co-authored-by: Earle Lowe <e.lowe@chia.net> Co-authored-by: arvidn <arvid@libtorrent.org> Co-authored-by: willi123yao <willi123yao@gmail.com> Co-authored-by: arty <art.yerkes@gmail.com> Co-authored-by: William Blanke <wjb98672@gmail.com> Co-authored-by: matt-o-how <48453825+matt-o-how@users.noreply.github.com> Co-authored-by: Chris Marslender <chrismarslender@gmail.com> Co-authored-by: Yostra <straya@chia.net> Co-authored-by: DouCrazy <43004977+lpf763827726@users.noreply.github.com> * Update to Pools GUI (Chia-Network#7048) * Revert "Update to Pools GUI (Chia-Network#7048)" This reverts commit 5727021. Co-authored-by: Earle Lowe <30607889+emlowe@users.noreply.github.com> Co-authored-by: Florin Chirica <fchirica96@gmail.com> Co-authored-by: Gene Hoffman <30377676+hoffmang9@users.noreply.github.com> Co-authored-by: Nikolaj Kuntner <treegraph@gmail.com> Co-authored-by: Arvid Norberg <arvid@libtorrent.org> Co-authored-by: Gian Luca Decurtins <35364122+gldecurtins@users.noreply.github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Mariano Sorgente <3069354+mariano54@users.noreply.github.com> Co-authored-by: Almog De Paz <almogdepaz@gmail.com> Co-authored-by: nirajpathak13 <72772761+nirajpathak13@users.noreply.github.com> Co-authored-by: Justin England <justin@chia.net> Co-authored-by: Chris Marslender <chrismarslender@gmail.com> Co-authored-by: Chris Marslender <chris@chia.net> Co-authored-by: Maran <maran.hidskes@gmail.com> Co-authored-by: Animazing <Animazing@protonmail.com> Co-authored-by: Yostra <straya@chia.net> Co-authored-by: wjblanke <wjb98672@gmail.com> Co-authored-by: Adam Kelly <338792+aqk@users.noreply.github.com> Co-authored-by: matt <matt@chia.net> Co-authored-by: Adam Kelly <aqk@aqk.im> Co-authored-by: Mariano Sorgente <sorgente711@gmail.com> Co-authored-by: Matt Hauff <quexington@gmail.com> Co-authored-by: Adam <aqk@Adams-MacBook-Pro.local> Co-authored-by: Richard Kiss <him@richardkiss.com> Co-authored-by: xdustinface <xdustinfacex@gmail.com> Co-authored-by: dustinface <35775977+xdustinface@users.noreply.github.com> Co-authored-by: Earle Lowe <e.lowe@chia.net> Co-authored-by: willi123yao <willi123yao@gmail.com> Co-authored-by: arty <art.yerkes@gmail.com> Co-authored-by: matt-o-how <48453825+matt-o-how@users.noreply.github.com> Co-authored-by: DouCrazy <43004977+lpf763827726@users.noreply.github.com>
Closed
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Now that miniupnpc is building Windows Python 3.9 wheels (https://ci.appveyor.com/project/miniupnp/miniupnp/builds/39279415/job/eecqje66ec053m6e/artifacts) we can update Windows to 3.9 and move everything else to 2.2.2. We're using this commit for all platforms - miniupnp/miniupnp@7783ac1
For everything but windows and M1 this was built using the github-builds branch of the Chia Network fork of miniupnp. Windows was downloaded from Appveyor and the M1 was hand built on an M1. All were uploaded to Keybase/Chia Pypi