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

First PR for the detoks transaction engine #149

Open
wants to merge 95 commits into
base: master
Choose a base branch
from

Conversation

nealsweijen61
Copy link

This PR contains a system that can send transactions using the trustchain and store these aswell.

Nealzahar and others added 28 commits March 5, 2023 14:24
# Conflicts:
#	app/src/main/java/nl/tudelft/trustchain/app/TrustChainApplication.kt
#	detoks/src/main/java/nl/tudelft/trustchain/detoks/DeToksFragment.kt
#	detoks/src/main/java/nl/tudelft/trustchain/detoks/DeToksMainActivity.kt
# Conflicts:
#	detoks/src/main/java/nl/tudelft/trustchain/detoks/DeToksFragment.kt
Fix refresh button by using the existing list instead of assigning ou…
@nealsweijen61 nealsweijen61 temporarily deployed to apk_build April 11, 2023 11:37 — with GitHub Actions Inactive
# Conflicts:
#	detoks-engine/src/main/java/nl/tudelft/trustchain/detoks_engine/manage_tokens/TokenManageActivity.kt
@nealsweijen61 nealsweijen61 temporarily deployed to apk_build April 19, 2023 09:39 — with GitHub Actions Inactive
@AkramNexus AkramNexus temporarily deployed to apk_build April 19, 2023 09:57 — with GitHub Actions Inactive
@nealsweijen61 nealsweijen61 temporarily deployed to apk_build April 19, 2023 10:05 — with GitHub Actions Inactive
@bbrockbernd bbrockbernd temporarily deployed to apk_build April 19, 2023 10:16 — with GitHub Actions Inactive
@nealsweijen61 nealsweijen61 temporarily deployed to apk_build April 19, 2023 10:23 — with GitHub Actions Inactive
@C6H5-NO2 C6H5-NO2 temporarily deployed to apk_build April 19, 2023 15:18 — with GitHub Actions Inactive
@C6H5-NO2 C6H5-NO2 temporarily deployed to apk_build April 19, 2023 22:04 — with GitHub Actions Inactive
@bbrockbernd bbrockbernd temporarily deployed to apk_build April 20, 2023 11:15 — with GitHub Actions Inactive
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.

6 participants