Merge from master #13
Merged
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
* dotnet format * fix CRLF
* Fix consensus (CRLF) * Removing unnecessary lines changes - Cleaning PR * Reverting all changes on CC * Modifying ConsensusContext with proposed changes
* Small update * Cache native persist script
…r mark) (#1057) * Check dotnet format in travis * Try to find the path * Update .travis.yml * Update .travis.yml * Update .travis.yml * Format travis * test and source * test and source * Move to before the script * testing if CRLF format is respected * fix crlf on unit tests * testing for crlf on unit tests too * all utf-8 * neo/ on utf8 too * looks like sudo is needed by travis * download dos2unix 7.4.0 * temporaly remove | test * back to | test * explicit test zero * no bom * more non-boom to boom * ensuring no_bom at all files * Printing files with bom prefix * Check both folders in one command * Add verbosity * Create .editorconfig * Ensure the path of .editorconfig file * Update .editorconfig * Update .editorconfig * Update .editorconfig * use only dotnet-format Is confirmed that .editorconfig works, so we should configure only this file * basic formatting (just 5 files affected) * dotnet version * new lines on end * update travis * advice on auto crlf * Update .travis.yml * Update .travis.yml * enforcing lf * Fix dotnet format version * removed dos2unix
* Supported methods names * dotnet format * Simplify
It's not working
* Optimization * Prevent relay * Change comment * Optimizations
* empty scripthash, all notifications * || to && * Fix ut
* Update NuGets * Clean BOM * Update Neo.VM
* Add NEO SDK based on RPC client * add rpc interface methods for neo3 * update unit test * add unit test * Update TransactionHelper.cs Changed for neo 3.0, not final yet. * implement sdk rpc client methods * backup files * change class name * remove uncompleted modules for pull request * change json deserialize method with Neo JObject * modified JSON implementation, added FromJson() * more RPC change * PR correction * RPC module fix, remove newton.json * fix * fix getblock issue * PR correction * PR Correction * PR Correction: rename RPC models * PR Correction * resolve conflicts * Clean code * Clean code * Clean code * Clean code * Update RpcValidateAddressResult.cs * Clean code * PR correction * Move test file to the right place * Added SDK Transaction module. * Add SDK SmartContract module * height = count - 1 * Add sign function for TxManager * Add Deploy Contract * Add unit tests * Add Network Fee calculate for TxManager, add unit tests * adjust cosigners change * PR Correction * Remove empty line * Rename TxManager to TransactionManager * PR correction * PR correction * change namespace * Reorder methods * Remove TransactionContext * fix unit test * Remove `virtual` * Remove virtuals * Remove ScriptHash from KeyPair * Add comments * Add comments * Adjust to Neo_Contract_Create parameter * use default mainfest * fix unit test * Fix typo * use manifest as parameter * add cosigner for nep5 transfer * code clean * Update neo.UnitTests/Network/RPC/UT_RpcClient.cs Co-Authored-By: Shargon <shargon@gmail.com> * move MakeScript to VM.Helper * Add unit test for InteropInterface * PR Correction * Add unit test
* Fixing template * Fix
* update test ledger * format * Add enter between classes * fix ut suggestion * Update UT_PoolItem.cs * Update UT_MemoryPool.cs * Reduce usings * Reduce changes * More details on TestReVerifyTopUnverifiedTransactionsIfNeeded and fixed comment on ReVerifyTopUnverifiedTransactionsIfNeeded * Minor fix on generic transaction generation fee * Applying dotnet format * Enhance functions in TestDataCache * dotnet format * Cast refactor * comment tx3 for mempool * Removing TODO comment
* add internal to DB and WriteBatch * tx.reverify add hashes.length != witnesses.length condition * reset db.cs writebatch.cs * format
* add internal to DB and WriteBatch * add vmstate field in rpc getrawtransaction result * reset db.cs writebatch.cs * Optimize * Update RpcServer.cs * Format * Update RpcServer.cs * Update RpcTransaction.cs * Update UT_RpcClient.cs * Fixes `RpcTransaction.VMState`
* Speed up * Update UT_NEP6Wallet.cs * Speed ut * More speed up * Format * Remove blank line * Reduce travis verbosity * Coverage only on linux * CollectCoverage only if is needed * Update .travis.yml * Already build * no-restore * Update .travis.yml * Back verbosity * Update netcore version * Remove BOM * Update nugets * Fix fluent update * Paralellize * format * Update .travis.yml * Fix * Update .travis.yml * Min verbose * Remove parallel execution * Fix change * Revert AsParallel()
…ion (#1149) * Simplify and improve consensus payload serialiation * Simplyfing read * Function return instead of out parameter * Reorganize * Update UT_IOHelper.cs
* Remove global randoms * Wallet * Optimize * Use random class * Revert wallet
* Add Transaction.Sender and Transaction.Script * Allow to get the current Transaction * Update unit test, refactor transactions methods * UT * Summary TX object inside VM * Revert some changes * Refactor to new model and UT * Fix * Reduce conditional * Fix ut * Fix ut * Change order * Block * Some fixes * Fix comment * Fix comments * Move hash to the top * Remove GetHeader * Remove GetHeader * Block with transactions count * Migrate ContractState * Format * Close #1096 Close #1096 * Update nulls * Remove Neo.Account.IsStandard * Revert last change * Fix Unit tests * Remove unused var * TrimmedBlock * Change fee * Neo.VM v3.0.0-CI00041 * Neo.VM v3.0.0-CI00042 * Rename * ContractNullParameter * Clean using * Revert Null in ContractParameterType
* Fix Syscall * Fix
* submit ut * fix * Enhance functions in TestDataCache * git amend blockchain * fix test related to TestDataCache * dotnet format * dotnet format * add blank line * fix test * Optimize random * Optimize Random * fix test * add decimal test * fix * 2019/9/25 16:54 change format * Fixes events * update assertion sentence * update UT following code change * format * add type check * recommit * recommit
…ictionary (#1354) * update connections.tell * optimise * update * add comment
* Set limits in MerkleBlockPayload (3x) * Update MerkleBlockPayload.cs * Update src/neo/Network/P2P/Payloads/MerkleBlockPayload.cs Co-Authored-By: Erik Zhang <erik@neo.org> * Update MerkleBlockPayload.cs Co-authored-by: Erik Zhang <erik@neo.org>
* add relay-block-filter * modify * modify * modify * modify Co-authored-by: Vitor Nazário Coelho <vncoelho@gmail.com>
* Adding some comments to datacache * Adding Exception comment tip of @Tommo-L Co-authored-by: Shargon <shargon@gmail.com>
…1389) * update * change fifoset to hashsetcache for knownhashes and senthashes * format * optimise HashSetCache * remove FIFOSet * remove FIFOSet and update ut * change List to LinkedList * remove bucket count upper limit * update exception message * Adding some comments * dotnet format * rename maxBucketCount * format * Cache count * Vitor suggestions * Update HashSetCache.cs * format * Fix * fix counting count * optimise * optimse * update List Co-authored-by: Shargon <shargon@gmail.com> Co-authored-by: Vitor Nazário Coelho <vncoelho@gmail.com>
…ived (#1408) * add containsTx recheck * add UT * Update to just View check * update * revert * Update UT_Blockchain.cs Co-authored-by: Vitor Nazário Coelho <vncoelho@gmail.com>
* inputs validation * more validation * recover constructor in ECPoint * format * minor changes * format * changes based on review * recover validation in AesEncrypt
…60 (#1387) * Fix undefined layout behaviour, and remove pinning * Update UInt256.cs * Update UInt256.cs * add StructLayout * set pack=1 * Explicit * Remove UIntBase * Revert constructor * add unsafe * Comment * Comment Uint256 * Removing comments from value 1 * Removing comments from value1 Co-authored-by: Luchuan <luchuan@ngd.neo.org> Co-authored-by: Vitor Nazário Coelho <vncoelho@gmail.com> Co-authored-by: Erik Zhang <erik@neo.org> Co-authored-by: Shargon <shargon@gmail.com>
* Verify Import * Default true
Co-authored-by: Vitor Nazário Coelho <vncoelho@gmail.com>
* NEP2 * Clean code * Use MasterKey as passphrase * Add Salt * Unique Scrypt for all wallets * Clean using * Clean parameters * Fix UT * Random Salt
* Allow to sign multisignature account if you have some of them * Update IsMultiSigContract() * Fixes UT * Check null * Update Wallet.cs * Change if Co-authored-by: Erik Zhang <erik@neo.org>
* Read Fixed * format * Rename * Fix Consensus UT * Add ut, and allow buffered streams * Add ut, and allow buffered streams * Change name * Update Helper.cs Co-authored-by: erikzhang <erik@neo.org>
* first commit * format * commit again * format
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.
No description provided.