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.

Sign up for GitHub

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

Jump to bottom

[release] 1.0.3-beta #1761

Closed
wants to merge 96 commits into from
Closed

[release] 1.0.3-beta #1761

wants to merge 96 commits into from

Conversation

ca333
Copy link

@ca333 ca333 commented Apr 21, 2023

No description provided.

rozhkovdmitrii and others added 30 commits March 22, 2023 11:48
feat: introduce adex cli utility, that is aimed to facilitate using m…
6cddedb 
…m2 and atomic swap protocol
CHANGELOG was changed
f480d2d
CHANGELOG header style changed
8ffaf33
Use winapi crate to manage mm2 process
7896139
rollback changes
59f0621
use common::log proxy instead of log
4355e72
Get rid of log4rs
117a3f2
Spit on init_coins and polish
e890d94
Get rid of hyper
abafc9b
Spit and polish
ae4808c
Spit on init_log and polish
4ef0f6f
Merge remote-tracking branch 'komodo/dev' into feature-1682-introduce…
523fa9d 
…-adex

# Conflicts:
#	Cargo.lock
#	mm2src/common/Cargo.toml
spit and polish
7de4766
spit and polish
fa0747b
spit and polish
7ffff62
roll back cli
d536767
roll back cli
6ea0ce9
Merge remote-tracking branch 'komodo/dev' into feature-1682-introduce…
b371fd7 
…-adex

# Conflicts:
#	CHANGELOG.md
squash changes
e0bab19
Got rid of userhome from mm2 help
34d08fc
Use default gui configuration value
6addf5f
Spti and polish
3f93b33
Merge remote-tracking branch 'komodo/dev' into feature-1682-introduce…
aaff7f5 
…-adex
Provide macos configuration
4aac321
@onur-ozkan
ci: improve CI/CD workflows (#1736)
514884c 
* improve CI/CD logic

Signed-off-by: ozkanonur <work@onurozkan.dev>

* add changelog entry

Signed-off-by: ozkanonur <work@onurozkan.dev>

---------

Signed-off-by: ozkanonur <work@onurozkan.dev>
Reviewed-by: shamardy <shamardy@yahoo.com>
Merge remote-tracking branch 'komodo/dev' into feature-1682-introduce…
2cd70d8 
…-adex

# Conflicts:
#	CHANGELOG.md
Inline each inquire method on initializing mm configuration
04f4f14
Fix errors related to macos configuration
addf3b0
Fix errors related to macos configuration
11518ca
Try to ignore adex-cli for wasm32
52767e2
rozhkovdmitrii and others added 18 commits April 6, 2023 18:05
spit and p
aab6f3c
Polish processing of mm2 on start
98befa1
rollback some changes
72b440f
Fit logging after fork
688c1e0
fork and setsid
c16d5cb
Fit logging after fork
1a386cf
Fit logging after fork
11b14fe
Fit logging after fork
01fe98a
Fit logging after fork
de43f3d
Use std::mem::forget to detach mm2 process
37a1d2a
@ca333
Merge pull request #1729 from rozhkovdmitrii/feature-1682-introduce-adex
a0ee6b6 
adex tool was introduced
@ca333
[docs] add release date to changelog
e562792
@ca333
Merge pull request #1743 from KomodoPlatform/bump-mm2
9bf8d32 
bump mm2 to `v1.0.2-beta`
@onur-ozkan
fix: stream stdout/err to a file (#1751)
54fd58a 
* stream stdout/err to a file

Signed-off-by: ozkanonur <work@onurozkan.dev>

* add changelog entry

Signed-off-by: ozkanonur <work@onurozkan.dev>

* use default target for `lightning::util::Logger`

Signed-off-by: ozkanonur <work@onurozkan.dev>

* add new config parameter `silent_console`

Signed-off-by: ozkanonur <work@onurozkan.dev>

* ignore mergetool temp files

Signed-off-by: ozkanonur <work@onurozkan.dev>

* sync back the `Cargo.lock`

Signed-off-by: ozkanonur <work@onurozkan.dev>

---------

Signed-off-by: ozkanonur <work@onurozkan.dev>
Reviewed-by: cipig, shamardy <shamardy@yahoo.com>
@ca333
[docs] update 1.0.2 release date in changelog
8ce972d
@onur-ozkan
ci: remove unnecessary deny.toml (#1754)
f2bfecc 
Signed-off-by: ozkanonur <work@onurozkan.dev>
Reviewed by: shamardy <shamardy@yahoo.com>
@shamardy
fix: avoid waiting for all EVM nodes to sync the latest nonce (#1757)
ef753cd 
Return latest nonce quickly without waiting for all nodes to sync.

Send evm transactions to only the nodes that synced the latest nonce.

---------

Reviewed-by: laruh, caglaryucekaya <caglaryucekaya@gmail.com>, ozkanonur <work@onurozkan.dev>
@onur-ozkan
remove ci compilation profile and optimize dev-release profiles (#1759)
52eb282 
Signed-off-by: ozkanonur <work@onurozkan.dev>
@shamardy
Copy link
Collaborator

We seem to have already merged code to main appear again in this PR because of how 1.0.2-beta commit was merged by squashing, I will look into how to fix this today to have a consistent git history for both dev and main branch.

@shamardy
Copy link
Collaborator

shamardy commented Apr 21, 2023 •
edited

To fix the issue I mentioned in #1761 (comment):

  1. I will reset the dev branch to the state of the main branch locally using git reset --hard main
  2. I will merge these 3 pull requests branches locally remove unnecessary files #1754, update compilation profiles #1759, avoid waiting for all EVM nodes to sync the latest nonce #1757.
  3. Then I will force push the changes to the dev branch by using git push -f origin dev

What everybody thinks @KomodoPlatform/mm2?

@shamardy
Copy link
Collaborator

shamardy commented Apr 21, 2023 •
edited

@ca333 @ozkanonur most agreed in DM to a second solution where:

  1. We don't force push and instead merge main to dev to fix conflicts and include the v1.0.2-beta commit in dev
  2. When merging this PR to main we don't squash the commits.

onur-ozkan and others added 3 commits April 22, 2023 19:11
@onur-ozkan @shamardy
improve p2p stack (#1755)
547a30a 
* optimize p2p network layer

Signed-off-by: ozkanonur <work@onurozkan.dev>

* update default gas limit for tendermint

Signed-off-by: ozkanonur <work@onurozkan.dev>

* rollback topic limit

Signed-off-by: ozkanonur <work@onurozkan.dev>

* remove unused arg from `lp_ordermatch::process_msg`

Signed-off-by: ozkanonur <work@onurozkan.dev>

* use OrderbookP2PHandlerResult for process_orders_keep_alive and process_maker_order_updated

* return one error for failed SwapMsg, SwapStatus deserialization

* fix process_swap_msg in wasm to return error if SwapMsg can't be deserialized

* remove additional space in SwapMsg, SwapStatus decode error message

* roll back crate visibility for new_protocol mod

---------

Signed-off-by: ozkanonur <work@onurozkan.dev>
Co-authored-by: shamardy <shamardy@yahoo.com>
@onur-ozkan
implement cosmos/iris ethermint account compatibility (#1765)
d85a9d7 
Signed-off-by: ozkanonur <work@onurozkan.dev>
@onur-ozkan
fix: improve get_receiver_trade_fee for tendermint (#1767)
f59eb1d 
Signed-off-by: ozkanonur <work@onurozkan.dev>
Reviewed-by: cipig, shamardy <shamardy@yahoo.com>
@onur-ozkan onur-ozkan mentioned this pull request Apr 25, 2023
Merged
@onur-ozkan onur-ozkan added the blocked requires additional attention label Apr 25, 2023
@ca333
Copy link
Author

ca333 commented Apr 26, 2023

closing this due mistakenly propagating the conflict resolution to a new branch - will push directly to dev instead

@ca333 ca333 closed this Apr 26, 2023
@ca333 ca333 deleted the 1.0.3-conflict-resolution branch April 26, 2023 07:34
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
blocked requires additional attention
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@ca333 @shamardy @onur-ozkan