Skip to content

Add support for sapphire-paratime 2.x#16

Merged
matevz merged 2 commits intomasterfrom
matevz/sapphire-paratime-2.0
Feb 3, 2025
Merged

Add support for sapphire-paratime 2.x#16
matevz merged 2 commits intomasterfrom
matevz/sapphire-paratime-2.0

Conversation

@matevz
Copy link
Member

@matevz matevz commented Jun 19, 2024

This PR:

Merge after oasisprotocol/sapphire-paratime#332 and oasisprotocol/sapphire-paratime#303

TODO: Wait for sapphire-contracts to be deployed on npmjs (oasisprotocol/sapphire-paratime#490). Then update the lock file.

@matevz matevz force-pushed the matevz/sapphire-paratime-2.0 branch 2 times, most recently from e1f11cf to 536f5af Compare June 28, 2024 16:51
@matevz matevz self-assigned this Jul 4, 2024
@matevz matevz force-pushed the matevz/sapphire-paratime-2.0 branch from 536f5af to 746a641 Compare July 12, 2024 15:46
@matevz matevz marked this pull request as ready for review July 12, 2024 15:51
@matevz matevz force-pushed the matevz/sapphire-paratime-2.0 branch 2 times, most recently from 7b94b2d to 296b961 Compare July 12, 2024 15:59
@rube-de
Copy link

rube-de commented Oct 25, 2024

This PR should be now merged in the vue branch.

@matevz matevz force-pushed the matevz/sapphire-paratime-2.0 branch 4 times, most recently from 11c2ae8 to 3b27751 Compare November 12, 2024 15:46
@lubej
Copy link
Contributor

lubej commented Nov 12, 2024

This PR should be now merged in the vue branch.

This would break, current React rewrite, as it is based on "v1". Can we hold off merging? Until rewrite of frontend is done on top of this PR?

cc: @matevz

@lubej lubej mentioned this pull request Jan 30, 2025
@lubej
Copy link
Contributor

lubej commented Jan 30, 2025

@matevz I didn't want to mess with your branch, thats why I created #24. Could you double check my PR? And I can rebase this one on top of mine, or if you want to do that, that is fine as well.

@matevz matevz force-pushed the matevz/sapphire-paratime-2.0 branch 4 times, most recently from 73a3601 to edfd962 Compare January 31, 2025 16:24
Copy link
Contributor

@lubej lubej left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM.

@matevz matevz force-pushed the matevz/sapphire-paratime-2.0 branch from edfd962 to f023836 Compare January 31, 2025 17:59
@matevz matevz force-pushed the matevz/sapphire-paratime-2.0 branch from f023836 to 89aeab3 Compare February 3, 2025 11:15
@matevz matevz merged commit 4e22bec into master Feb 3, 2025
@matevz matevz deleted the matevz/sapphire-paratime-2.0 branch February 3, 2025 11:43
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants