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

[WIP] Currency II (BTC Multisig Shared Wallets) #5

Merged
merged 309 commits into from
Apr 7, 2020
Merged

[WIP] Currency II (BTC Multisig Shared Wallets) #5

merged 309 commits into from
Apr 7, 2020

Conversation

MKuijpers
Copy link
Contributor

Currency II: Bitcoin multi-signature shared wallets

This PR adds the Bitcoin multi-signature shared wallet integration into the Trustchain infrastructure. This allows users to use their Bitcoin to collectively create, add users to, and transfer funds using a shared Bitcoin wallet. All communication is done on top of the Trustchain communication infrastructure.

Note: This PR is still WIP, it has two minor problems:

  • A minor navigation issue, which prevents going back to the super-app main screen
  • An issue with joining shared wallets

We decided to still open the WIP PR since the amount of code to be added and reviewed is quite a lot.

@MattSkala
add demo community in jvm demo
4888227
@MattSkala
add trustchain initial tests
9ce9328
@MattSkala
add trustchain explorer to android demo app
b18984b
@MattSkala
refactor ipv8 service
6522bf4
@MattSkala
update ipv8 initialization
8badc05
@MattSkala
Add my chain, debug, block info to demo app
f0236b9
@MattSkala
Remove unused import
9197e4c
@MattSkala
Add TrustChain overview
22057b7
@MattSkala
Implement chain crawling
7badb8b
@MattSkala
Fix ULong serialization, UI tweaks
991e67e
@MattSkala
Remove unused methods
ba471bf
@MattSkala
Merge pull request #5 from Tribler/trustchain
344e3fe 
TrustChain
@MattSkala
Add trustchain screenshot
da6c094
@MattSkala
Update codecov badge
3ea8af4
@MattSkala
Add TrustChain agreement blocks
64da1a5
@MattSkala
Add latest blocks tab, show block status
6c00581
@MattSkala
UI tweaks, show block count on debug screen
dbe6b20
@MattSkala
Implement transaction serialization
2c88622
@MattSkala
Add tests for TrustChain store and crawler
dca5257
@MattSkala
Merge pull request #6 from Tribler/update-trustchain
b7a99ea 
Update TrustChain transaction serialization
@MattSkala
Refactor configuration
bb37e65
@MattSkala
Refactor intialization and stopping on Android
86a1e46
@MattSkala
Fix tests
626547d
@MattSkala
Update readme, add overlay tutorial
768593b
@MattSkala
Remove deprecated method calls
51c793f
@MattSkala
Show discovered addresses in peer list
489ca55
@MattSkala
Add TrustChain tutorial
6a3488a
@MattSkala
Update overlay tutorial
81afecf
@MattSkala
Fix sign button visibility
08c6e5a
@MattSkala
Improve peer discovery
6f6ee61
InvictusRMC and others added 22 commits March 30, 2020 18:10
@InvictusRMC
Prepare moving
dc20c32
@InvictusRMC
Merge remote-tracking branch 'currencyii/moving_branch' into import_c…
1f73665 
…urrencyii
@InvictusRMC
import currencyii
472d532
@MKuijpers
Update package name and gradle.build files, now building and installing
6b17c2e
@MKuijpers
Go to correct page for bitcoin page
25c83c2
@brian2509
Add methods to generate random mnemonic seeds in serialized form
861eb26
@brian2509
Merge pull request #1 from InvictusRMC/import_currencyii
0996454 
Import Currency II project into superapp
@brian2509
Add login views with ability to load/create/import wallet
c180136
@brian2509
Remove old wallet manager buttons on bitcoin fragment
2f33b1c
@brian2509
Change seed/address text views to be editable for copying
0b7027e
@brian2509
Merge remote-tracking branch 'origin/master' into login
8e8aad3
@PJvanderLaan
Merge pull request #2 from InvictusRMC/login
aded1c5 
Login with create/import/load choices
@PJvanderLaan
Fix join shared wallet json key bug
0be03fa
@PJvanderLaan
Fix transfer funds protocol
1fcc0ec
@PJvanderLaan
Remove blank line for linting
c898bfa
@PJvanderLaan
Remove blank line
ccc6e18
@MKuijpers
Remove unused trustchain files, and misc. cleanup/changes
1815aa9
@MKuijpers
Disable linting abortOnError again due to a known issue with linting,…
254e42c 
… causing build to fail
@brian2509
Navigation fix for login screen and main dashboard
35de3d2
@MKuijpers
Merge pull request #3 from InvictusRMC/general-bug-fixes
3e6efc3 
General bug fixes
@brian2509
Merge pull request #4 from InvictusRMC/clean_module
ea69ae6 
Cleanup currencyii module
@MKuijpers
Merge pull request #5 from InvictusRMC/navigation_fix
67cf513 
Navigation fix to go back to dashboard
@MattSkala MattSkala changed the base branch from master to dao April 4, 2020 14:52
@MattSkala
Copy link
Collaborator

Thanks for the pull request.

I see there are some compiler warnings, as well as minor ktlint issues. You should see them after running ./gradlew check --no-build-cache. Can you please fix those? You can fix most formatting issues automatically by running ./gradlew ktlintFormat.

I would recommend you to treat compiler and lint warnings as errors by setting android.kotlinOptions.allWarningsAsErrors = true and ktlint.ignoreFailures = false in your build.gradle, in the same way as I did for the common module. In that way, they will not go unnoticed by the CI check that should now run automatically for every pull request.

@PJvanderLaan
Fix merge conflicts with dao branch
d03972a 
# Conflicts:
#	app/build.gradle
#	app/src/main/AndroidManifest.xml
#	app/src/main/java/nl/tudelft/trustchain/app/AppDefinition.kt
#	settings.gradle
@PJvanderLaan
Fix app crash + add treat warnings as error in gradle currency ii
c5ddd1c
@synctext
Copy link
Member

synctext commented Apr 7, 2020

cool! please also rebase. thnx

@MattSkala MattSkala merged commit cdda518 into Tribler:dao Apr 7, 2020
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
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
6 participants
@MKuijpers @MattSkala @synctext @InvictusRMC @PJvanderLaan @brian2509