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

feat: tari launchpad downstream merge #4322

Merged
merged 6 commits into from
Jul 19, 2022
Merged

Conversation

CjS77
Copy link
Collaborator

@CjS77 CjS77 commented Jul 19, 2022

Merging source code changes required for tari_launchpad.

The launchpad source code itself is present in the PR, but this will be removed presently.

The only code that really needs to be reviewed here are changes to files outside of applications/launchpad

A follow-up PR will be removing the applications/launchpad folder into its own repo.

This is a deep merge of the tari launchpad codebase.
Conflicting workflows (like GHA) should have been removed in this commit
and represents the backend source, the react front-end and several small
changes to the wallet and base noe RPC clients needed to make launchpad
work
@CjS77 CjS77 changed the title Launchpad such wow feat: tari launchpad downstream merge Jul 19, 2022
@CjS77 CjS77 requested a review from stringhandler July 19, 2022 14:20
stringhandler
stringhandler previously approved these changes Jul 19, 2022
Copy link
Collaborator

@stringhandler stringhandler left a comment

Choose a reason for hiding this comment

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

Reviewed everything outside of the launchpad folder and it looks good

scripts/file_license_check.sh Outdated Show resolved Hide resolved
stringhandler
stringhandler previously approved these changes Jul 19, 2022
@aviator-app aviator-app bot added mq-failed and removed mq-failed labels Jul 19, 2022
@CjS77 CjS77 merged commit 222052f into testnet-dibbler Jul 19, 2022
sdbondi added a commit to sdbondi/tari that referenced this pull request Jul 22, 2022
* testnet-dibbler: (29 commits)
  refactor(launchpad): move launchpad to its own repo (tari-project#4323)
  feat: tari launchpad downstream merge (tari-project#4322)
  feat: bump toolchain for GHA from nightly-2021-11-20 to nightly-2022-05-01 (tari-project#4308)
  fix: fix OSX GHA build fix by bumping OSX release (tari-project#4300)
  v0.32.12
  fix: cbindgen fix (tari-project#4298)
  v0.32.11
  chore: wallet ffi refactor (tari-project#4295)
  fix: fixed bug in wallet_coin_join (tari-project#4290)
  v0.32.10
  feat(wallet_ffi): added mined_timestamp to TariUtxo (tari-project#4284)
  fix: removed code duplication in TariUtxo conversion (tari-project#4283)
  fix: improve GHA docker image builds (tari-project#4257)
  feat: add mined_timestamp to wallet.db (tari-project#4267)
  chore(deps): docker gha builds (tari-project#4274)
  chore(deps): improve xmrig docker builds (tari-project#4273)
  v0.32.9
  feat(ffi): added 3 functions (tari-project#4266)
  ffi: added 2 functions, wallet_preview_coin_split and wallet_preview_coin_join (tari-project#4264)
  v0.32.8
  ...
@stringhandler stringhandler deleted the launchpad_such_wow branch September 27, 2022 14:15
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.

2 participants