Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

GH-744-merge-test #559

Open
wants to merge 167 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
167 commits
Select commit Hold shift + click to select a range
e908666
Added base comments
Syther007 Sep 27, 2023
8b71081
GH-744: removed .wait() from handle_request_balances_to_pay_payables
Syther007 Sep 27, 2023
99e36a5
GH-744: added future return type to get_transaction_fee_balance
Syther007 Oct 2, 2023
4fba6f1
Fixed error mapping for .get_token_balance
Syther007 Oct 3, 2023
7d0d075
GH-744: Fixed failing tests, all tests passing
Syther007 Oct 3, 2023
159ad22
GH-744: Added future return to ReportAccountsPayable
Syther007 Oct 4, 2023
5b25bce
GH-744: Fixed more errors
Syther007 Oct 9, 2023
ffe6b81
GH-744: Added batch lifetime
Syther007 Oct 10, 2023
cb2f3e4
Revert "GH-744: Added batch lifetime"
Syther007 Oct 10, 2023
e5482f7
GH-744: Fixed more errors
Syther007 Oct 13, 2023
8093caf
GH-744: small clean up
Syther007 Oct 17, 2023
85529d0
GH-744: Moved batch_payable_tools functions
Syther007 Oct 24, 2023
aa811db
GH-744: send_payables_within_batch accounts changed to Vec
Syther007 Oct 25, 2023
d1659ec
GH-744: added blockchain_interface_slim
Syther007 Oct 30, 2023
0877056
Added blockchain_interface_utils.js
Syther007 Nov 1, 2023
a075b5d
GH-744: process_payments is working with futures
Syther007 Nov 3, 2023
70ee731
GH-744: Fixed a few more tests in blockchain_interface_utils
Syther007 Nov 6, 2023
2f03dbe
GH-744: Fixed test useing test_gas_limit_is_between_limits
Syther007 Nov 6, 2023
ba6a7f9
Changed sign_transaction_data amount data type to u128
Syther007 Nov 7, 2023
c7725b1
GH-744 converted handle_retrieve_transactions return type to future
Syther007 Nov 8, 2023
2a16982
GH-744: Fixed some error with handle_retrieve_transactions
Syther007 Nov 8, 2023
93189ec
GH-744: update_start_block_message_works test works
Syther007 Nov 13, 2023
231cce3
GH-744: Added get_batch_web3 Mock
Syther007 Nov 13, 2023
25593c5
GH-744: Fixed test report_accounts_payable_returns_error_fetching_pen…
Syther007 Nov 13, 2023
c313533
GH-744: fixed test process_payments_returns_error_from_sending_batch
Syther007 Nov 14, 2023
e771cd5
GH-744: fixed test handle_report_accounts_payable_transmits_eleventh_…
Syther007 Nov 20, 2023
d3a3694
GH-744: Edited test handle_report_accounts_payable_transacts_and_send…
Syther007 Nov 21, 2023
6c6a146
GH-744: updated test handle_report_accounts_payable_transacts_and_sen…
Syther007 Nov 22, 2023
e645549
GH-744: FIxed test handle_retrieve_transactions_sends_received_paymen…
Syther007 Nov 22, 2023
5e1dac1
GH-744: Update to test processing_of_received_payments_continues_even…
Syther007 Nov 22, 2023
cae5818
GH-744: Added Future return type to sign_transaction
Syther007 Nov 27, 2023
f7cd59f
GH-744: Added Future return to sign_and_append_payment
Syther007 Nov 27, 2023
6b3a0de
GH-744: sign_and_append_multiple_payments returns futures
Syther007 Dec 4, 2023
05bce93
GH-744: Fixed more test errors
Syther007 Dec 5, 2023
4bc36c7
GH-744: Fixed Lifetime issues
Syther007 Dec 5, 2023
814bfdb
GH-744: fixed some tests
Syther007 Dec 6, 2023
c87a357
GH-744: added new test: sign_transaction_just_works
Syther007 Dec 12, 2023
144064c
GH-744: cleaned up sign_transaction
Syther007 Dec 12, 2023
33fe30d
GH-744: Added tests sign_and_append_payment_just_works, sign_and_appe…
Syther007 Dec 20, 2023
c39d20e
GH-744: Warning clean up
Syther007 Jan 3, 2024
64765ad
GH-744: Cleanup & add todos
Syther007 Feb 5, 2024
9d43873
GH-744: removed Batch_web3
Syther007 Feb 5, 2024
b12ba5d
Merge branch 'master' into GH-744
Syther007 Feb 6, 2024
eb7004e
GH-744: Changes after merge
Syther007 Feb 6, 2024
7d663cc
GH-744: Merging Master, code is compiling
Syther007 Feb 20, 2024
ab424da
GH-744: Removed the generics from BlockchainInterface
Syther007 Feb 26, 2024
b446e14
GH-744: added get_service_fee_balance to Blockchain_interface
Syther007 Feb 27, 2024
f2b3b21
GH-744: Improved merge of retrieve_transactions
Syther007 Feb 28, 2024
4ee4739
GH-744: retrieve_transactions test are all passing
Syther007 Mar 5, 2024
d7b6aac
GH-744: Trying to fix test in BlockChainBridge
Syther007 Mar 12, 2024
3917967
GH-744: working on merging master
Syther007 Mar 15, 2024
7369aa2
GH-744: added testsign_and_append_multiple_payments_works
Syther007 Mar 19, 2024
192f2cf
GH-744: added test send_transaction_works
Syther007 Mar 26, 2024
d551ef8
GH-744: send_transaction_2() is working fine on Utkarsh's machine
utkarshg6 Mar 26, 2024
b58bbe6
GH-744: fixed a few blockchain interface tests
Syther007 Mar 26, 2024
4daefab
GH-744: add new tests for sign_and_append_payment()
utkarshg6 Mar 27, 2024
618fdd2
GH-744: Debugging Connection reset transport error
Syther007 Apr 5, 2024
0f3fdc8
GH-744: Migrated MBCSBuilder to masq_lib, fixed two tests
Syther007 Apr 8, 2024
dbac17b
GH-744: fixed alot of test within blockchain_interface_utils
Syther007 Apr 9, 2024
c75475d
GH-744: Added some tmp tests
Syther007 Apr 16, 2024
e145252
GH-744: Removed futures from send_and_append_multiple_payments functi…
Syther007 Apr 19, 2024
d5121b5
GH-744: Fixed a bunch of test for blockchain_interface_utils
Syther007 Apr 22, 2024
8f18b41
GH-744: added two tested for send_payables
Syther007 Apr 23, 2024
08cb2fe
GH-744: all tests passing on file blockchain_interface_utils
Syther007 Apr 24, 2024
53b2746
GH-744: added new test process_payments_works
Syther007 Apr 24, 2024
3059710
GH-744: Finished tests for process_payments
Syther007 Apr 26, 2024
8343ced
GH-744: added two tested for handle_outbound_payments_instructions
Syther007 Apr 29, 2024
07a7fe4
GH-744: Migrated get_transaction_fee_balance to blockchain_interface_…
Syther007 Apr 30, 2024
3a3bc39
GH-744: migrated get_token_balance to blockchain_interface_util
Syther007 Apr 30, 2024
395487a
GH-744: build_blockchain_agent now returns a Future
Syther007 May 8, 2024
efbba6b
GH-744: refactored build_blockchain_agent
Syther007 May 14, 2024
5a83f82
GH-744: Fixed formatting
Syther007 May 14, 2024
67a2ce9
GH-744: Fixed all test on blockchain_interface_web3/mod.rs
Syther007 May 21, 2024
b5ef74a
GH-744: Finished tests for handle_qualified_payable_msg
Syther007 May 22, 2024
a3e717b
GH-744: added get_gast_price to build_blockchain_agent
Syther007 May 27, 2024
840a204
GH-744: Removed persistent_config from build_blockchain_agent
Syther007 May 27, 2024
99f8e33
GH-744: clean up of build_blockchain_agent
Syther007 May 27, 2024
ea3125f
GH-744: refactored retrieve_transactions
Syther007 May 29, 2024
f023e86
GH-744: Fixed test handle_retrieve_transactions_sends_received_paymen…
Syther007 Jun 3, 2024
aa0692c
GH-744: all tests working on blockchain_bridge.rs
Syther007 Jun 5, 2024
2cfb4a3
GH-744: Cleaned up warnings
Syther007 Jun 7, 2024
17787ca
GH-744: Fixed a bunch of tests & clean up
Syther007 Jun 10, 2024
70fe63c
GH-744: get_transaction_fee_balance now returns a future
Syther007 Jun 17, 2024
6b688f8
GH-744: Migrated all functions back into lower_level_interface
Syther007 Jun 24, 2024
b892b06
GH-744: Fixed test: blockchain_bridge_is_constructed_with_correctly_f…
Syther007 Jun 25, 2024
b86d64d
GH-744: fixed test: blockchain_interface_null_as_result_of_missing_bl…
Syther007 Jun 25, 2024
b0e918b
GH-744: removed blockchain_interface_null
Syther007 Jun 25, 2024
7fb5a3b
GH-744: all tests within lower_level_interface are now working
Syther007 Jun 25, 2024
a32fabe
GH-744: Moved get_transaction_receipt_batch to lower_level_interface
Syther007 Jul 2, 2024
cee7825
GH-744: Added tests for transaction_receipt_batch
Syther007 Jul 2, 2024
df499b6
GH-744: All tests passing on blockchain_birdge
Syther007 Jul 8, 2024
c6c79f4
GH-744: added fn get_transaction_logs to lower_level_interface
Syther007 Jul 9, 2024
591e074
GH-744: added fn submit_payables_in_batch to lower_level_interface
Syther007 Jul 9, 2024
1d9dffc
GH-744: removed unnecessary functions from BlockchainInterface
Syther007 Jul 15, 2024
236247c
GH-744: Todo clean up
Syther007 Jul 15, 2024
3108a0b
GH-744: test: pending_transaction_is_registered_and_monitored_until_i…
Syther007 Jul 23, 2024
00661b8
GH-744: clean up & all tests pasing
Syther007 Jul 23, 2024
108fbaa
GH-744: cleanup of more todos
Syther007 Jul 29, 2024
ff74544
Merge branch 'master' of https://github.com/MASQ-Project/Node into GH…
Syther007 Jul 29, 2024
2288287
GH-744: Compiling after merge
Syther007 Jul 29, 2024
00cc396
GH-744: all but 1 tests are passing after merge
Syther007 Jul 30, 2024
f904a71
GH-744: Fixed pending_transaction_is_registered_and_monitored_until_i…
Syther007 Jul 31, 2024
b60a6a8
GH-744: Removed all warnings
Syther007 Jul 31, 2024
5598918
GH-744: Formatting
Syther007 Jul 31, 2024
01ff73c
GH-744: fixed all clippys warnings
Syther007 Aug 12, 2024
8a3f1e7
GH-744: multinode tests running, but failing on MBCS
Syther007 Aug 13, 2024
fed2a85
GH-744 fixed more multinode tests
Syther007 Aug 20, 2024
cfdb772
GH-744: Added check for wildcard ip inside neighborhood
Syther007 Aug 21, 2024
d54a3d0
GH-744: Fixed all multinode intergration tests
Syther007 Aug 28, 2024
e677373
GH-744: All tests are passing!
Syther007 Aug 28, 2024
1f5940d
GH-744: fixed test send_payables_within_batch_fails_on_submit_batch_c…
Syther007 Sep 2, 2024
0ea951c
GH-744: fixed handle_scan_future tests
Syther007 Sep 2, 2024
aee1544
GH-744: Added a fallback blockchain_service_url
Syther007 Sep 3, 2024
b9e7572
GH-744: changes for self review
Syther007 Sep 13, 2024
b6a0b65
GH-744: Removed gas_price_result from tests
Syther007 Sep 13, 2024
d098022
GH-744: Formatting
Syther007 Sep 16, 2024
3d35b4c
GH-744: Review-1 first lot of changes
Syther007 Oct 21, 2024
cc709be
GH-744: Review-1 - fixed more tests
Syther007 Oct 22, 2024
e9bddc8
GH-744: improved wildcard IP check
Syther007 Oct 22, 2024
b72c61b
GH-744: removed unused imports
Syther007 Oct 22, 2024
d4c5be9
GH-744: fixed a bunch more comments from review 1
Syther007 Oct 25, 2024
43456e7
GH-744: resolved more review comments
Syther007 Nov 1, 2024
4d7fa8a
GH-744: started converting gas_price units from gwei to wei
Syther007 Nov 1, 2024
6a3ceaf
GH-744: finish converting gas price from gwei to wei
Syther007 Nov 4, 2024
8f131bb
GH-744: Formating & removed warnings
Syther007 Nov 4, 2024
67a9786
GH-744: Added TransactionFailed to TransactionReceiptResult
Syther007 Nov 5, 2024
4db1f91
GH-744: Migrated the guts of get_transaction_receipt_in_batch to proc…
Syther007 Nov 8, 2024
b0aed3a
GH-744: Moved submit_payables_in_batch to blockchain_interface
Syther007 Nov 11, 2024
fac4936
GH-744: removed test: blockchain_bridge_can_return_report_transaction…
Syther007 Nov 12, 2024
c5ddb57
GH-744: Fixed a few more URGENCY comments
Syther007 Nov 13, 2024
237a533
GH-744: cleanup & formatting
Syther007 Nov 13, 2024
1be2642
GH-744: add some TODOs as discussed on Wed and Thu
utkarshg6 Nov 15, 2024
8d22c61
GH-744: handle_request_transaction_receipts chaged error to a DEBUG log
Syther007 Nov 15, 2024
b3cafe4
GH-744: handle_retrieve_transactions inbeded extract_max_block_count
Syther007 Nov 15, 2024
ab32fb6
GH-744: code refactor
Syther007 Nov 15, 2024
1a92588
GH-744: removed transaction_id from Agent
Syther007 Nov 18, 2024
5172c82
GH-744: Removed get_gas_price from submit_batch call
Syther007 Nov 18, 2024
89419ed
GH-744: logger is now a reference in send_payables_within_batch
Syther007 Nov 18, 2024
5181f1c
GH-744: send_payables_within_batch web3_batch is now a reference
Syther007 Nov 18, 2024
54ab85e
GH-744: sign_and_append_multiple_payments accounts is now a reference
Syther007 Nov 18, 2024
e93c0f1
GH-744 removed Blockchan_interface_mock
Syther007 Nov 19, 2024
ef88ab4
GH-744: Refactored all 4 test for send_payables_within_batch
Syther007 Nov 20, 2024
f18b8a6
GH-744: cleanup & formatting
Syther007 Nov 20, 2024
a5e6f68
GH-744: small fixs
Syther007 Nov 20, 2024
3d4f552
GH-744: handle_normal_client_data detects wildcard IP & localhost wit…
Syther007 Nov 22, 2024
4de72c8
GH-744: Finished all urgent comments
Syther007 Nov 25, 2024
94cea47
Merged in Master
Syther007 Dec 3, 2024
9a6bcb4
GH-744: changed actions macos-12 to 13
Syther007 Dec 4, 2024
7499332
GH-744: increased sleep time for test provided_and_consumed_services_…
Syther007 Dec 4, 2024
e2317ae
GH-744: Fixed multinode tests
Syther007 Dec 16, 2024
1c4b7f0
GH-744: Added start block +1 to handle_transaction_logs
Syther007 Dec 17, 2024
e80e1d0
GH-744: Fixed some tests
Syther007 Dec 17, 2024
b3bb461
Merge branch 'GH-744-merge-test' of https://github.com/MASQ-Project/N…
Syther007 Dec 17, 2024
0c82a79
GH-744: Fixes from review 2
Syther007 Dec 18, 2024
6961751
GH-744: Fixed test debtors_are_credited_once_but_not_twice
Syther007 Dec 18, 2024
ace75e7
GH-744: removed BlockNumber::Number
Syther007 Dec 18, 2024
e132f66
GH-744: Resolved TODOs
Syther007 Dec 18, 2024
6b9d987
GH-744: First commit for review-3, fixed tests
Syther007 Dec 20, 2024
d81ac19
GH-744: Refactored TxReceipt
Syther007 Dec 20, 2024
69f70c1
GH-744: Refactored TxResponse
Syther007 Dec 20, 2024
d30dc27
GH-744 moved & renamed blockchain_interface_utils.rs
Syther007 Dec 23, 2024
83dc7bc
GH-744: fixed test: dns_resolution_failure_for_wildcard_ip_with_real_…
Syther007 Dec 23, 2024
91eefcf
GH-744: add review 4 changes
utkarshg6 Dec 30, 2024
f4b8150
GH-744: add review 5 changes
utkarshg6 Dec 31, 2024
64f2f40
GH-744: remove the map_err()
utkarshg6 Jan 2, 2025
a047291
GH-744: migrate the logging code to a different function
utkarshg6 Jan 2, 2025
d07760b
GH-744: add review 6 changes
utkarshg6 Jan 6, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/ci-matrix.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
matrix:
target:
- { name: linux, os: ubuntu-22.04 }
- { name: macos, os: macos-12 }
- { name: macos, os: macos-13 }
- { name: windows, os: windows-2022 }

name: Build node on ${{ matrix.target.os }}
Expand Down
2 changes: 2 additions & 0 deletions masq/tests/startup_shutdown_tests_integration.rs
Original file line number Diff line number Diff line change
Expand Up @@ -115,6 +115,8 @@ fn handles_startup_and_shutdown_integration() {
"zero-hop",
"--data-directory",
dir_path.to_str().unwrap(),
"--blockchain-service-url",
"https://nonexistentblockchainservice.com",
]);

let (stdout, stderr, exit_code) = masq_handle.stop();
Expand Down
Loading