Skip to content

Commit

Permalink
Change reference from bitcoin solutions to keepkey
Browse files Browse the repository at this point in the history
change POM configuration
update dependencies for multibit hardware and bitcoinj-alice
  • Loading branch information
keepkey-builder committed Sep 16, 2016
1 parent ad31b12 commit 952a592
Show file tree
Hide file tree
Showing 17 changed files with 82 additions and 42 deletions.
2 changes: 1 addition & 1 deletion LICENSE
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
The MIT License (MIT)

Copyright (c) 2016 Bitcoin Solutions Ltd
Copyright (c) 2016 KeepKey, LLC

Permission is hereby granted, free of charge, to any person obtaining a copy of
this software and associated documentation files (the "Software"), to deal in
Expand Down
22 changes: 11 additions & 11 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ A desktop Hierarchical Deterministic Wallet (HDW) for Bitcoin using the Simplifi
The target audience is "international mainstream" which compels the user interface to remain as simple and consistent as possible while still retaining advanced capabilities
under the covers.

Support for external hardware wallets (such as the Trezor) is [available through the MultiBit Hardware project](https://github.com/bitcoin-solutions/mbhd-hardware).
Support for external hardware wallets (such as the Trezor) is [available through the MultiBit Hardware project](https://github.com/keepkey/mbhd-hardware).

### Main website

Expand All @@ -21,7 +21,7 @@ Pre-packaged installers are available from the [MultiBit website](https://beta.m
* Java 7 and Swing
* [Bitcoinj](https://github.com/bitcoinj/bitcoinj) - Providing various Bitcoin protocol utilities (GitHub is the reference)
* [hid4java](https://github.com/gary-rowe/hid4java) - Java library providing USB Human Interface Device (HID) native interface
* [MultiBit Hardware](https://github.com/bitcoin-solutions/multibit-hardware) - Java library providing Trezor support
* [MultiBit Hardware](https://github.com/keepkey/multibit-hardware) - Java library providing Trezor support
* [Google Protocol Buffers](https://code.google.com/p/protobuf/) (protobuf) - For use with serialization and hardware communications
* [Font Awesome](http://fortawesome.github.io/Font-Awesome/) - for iconography
* [Install4j](https://www.ej-technologies.com/download/install4j/files) - for a smooth installation and update process
Expand All @@ -30,7 +30,7 @@ Pre-packaged installers are available from the [MultiBit website](https://beta.m

MultiBit HD is a standard Maven build from a GitHub repository and currently relies on some builds of libraries which aren't available in Maven Central.

Below are some basic instructions for developers - there is [more information in the MultiBit HD wiki](https://github.com/bitcoin-solutions/multibit-hd/wiki).
Below are some basic instructions for developers - there is [more information in the MultiBit HD wiki](https://github.com/keepkey/multibit-hd/wiki).

#### Verify you have Git

Expand All @@ -43,7 +43,7 @@ $ git --version
Then, if this is your first time working with MultiBit HD source code, clone the source code repository (over HTTPS) using:

```
$ git clone https://github.com/bitcoin-solutions/multibit-hd.git
$ git clone https://github.com/keepkey/multibit-hd.git
```
A sub-directory called `multibit-hd` will be created which is your project root directory.

Expand All @@ -69,7 +69,7 @@ Maven uses a file called `pom.xml` present in the MultiBit HD source code projec

#### We currently use a forked version of Bitcoinj

The [MultiBit Staging repository](https://github.com/bitcoin-solutions/mbhd-maven) contains a fork of the bitcoinj library
The [MultiBit Staging repository](https://github.com/keepkey/mbhd-maven) contains a fork of the bitcoinj library
and its supporting Orchid JAR for Tor that is aligned with the MultiBit HD `develop` branch. This should be used for
development builds and is suitable for production. As we make changes to our fork we update the staging repository.

Expand Down Expand Up @@ -128,7 +128,7 @@ As always, donations to the MultiBit address are welcome: [1AhN6rPdrMuKBGFDKR1k9

#### Where's the Trezor support ?

We've begun the process of integrating the Trezor device through the [MultiBit Hardware](https://github.com/bitcoin-solutions/multibit-hardware) project. If you are a hardware
We've begun the process of integrating the Trezor device through the [MultiBit Hardware](https://github.com/keepkey/multibit-hardware) project. If you are a hardware
wallet developer, or are just interested to learn how the Trezor device works under the covers please watch this project.

From now you should be able to attach your Trezor device and see an alert message providing information and a button to switch your current wallet over to one that tracks your
Expand All @@ -140,7 +140,7 @@ At the time MBHD was being written (Q4 2013 - Q2 2014) Java 8 was not in product
Classic and 3x the standard Java 7 packaged footprints). That footprint alone would be sufficient to dramatically increase the cost of serving the application and deter people
from downloading in countries where bandwidth is less available.

We will revisit this once we have suitable Install4j JREs available. We expect this to occur shortly after [Release 0.1](https://github.com/bitcoin-solutions/multibit-hd/milestones).
We will revisit this once we have suitable Install4j JREs available. We expect this to occur shortly after [Release 0.1](https://github.com/keepkey/multibit-hd/milestones).

#### Why not JavaFX ?

Expand Down Expand Up @@ -186,14 +186,14 @@ As new changes are released they will update automatically over HTTPS from 0.0.4

#### Is there a developer wiki ?

Yes. [The wiki pages](https://github.com/bitcoin-solutions/multibit-hd/wiki/_pages) provide comprehensive instructions for developers that cover a variety of environments.
Yes. [The wiki pages](https://github.com/keepkey/multibit-hd/wiki/_pages) provide comprehensive instructions for developers that cover a variety of environments.

#### What is your development roadmap ?

We are currently working to the following timetable:

1. Hardware wallet (Trezor) support (see [version 0.0.5 issues](https://github.com/bitcoin-solutions/multibit-hd/milestones/Beta%205%20Trezor))
1. BIP70-73 payment protocol support (see [version 0.1.0 issues](https://github.com/bitcoin-solutions/multibit-hd/milestones/Release%200.1%20Payment%20Protocol))
1. Hardware wallet (Trezor) support (see [version 0.0.5 issues](https://github.com/keepkey/multibit-hd/milestones/Beta%205%20Trezor))
1. BIP70-73 payment protocol support (see [version 0.1.0 issues](https://github.com/keepkey/multibit-hd/milestones/Release%200.1%20Payment%20Protocol))
1. Hierarchical deterministic multi-signature (HDM) support (still planning)

## Developer tools
Expand Down Expand Up @@ -227,7 +227,7 @@ Use the `ResourceBundleTools` to find similar entries and to arrange keys in the

To do an internal help refresh:

1. Ensure you have cloned the [MultiBit website](https://github.com/bitcoin-solutions/multibit-website) into a sibling directory to MultiBit HD
1. Ensure you have cloned the [MultiBit website](https://github.com/keepkey/multibit-website) into a sibling directory to MultiBit HD
1. Switch to the appropriate site branch (e.g. `master` for ongoing releases) and update
1. Use Ant to execute the `update-internal-help.xml` script to copy the relevant files into the correct locations
1. Within Intellij, navigate to `assets/images/en/screenshots/mbhd-01`, select all image files and copy to clipboard
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ public enum WalletType {
/**
* MultiBit HD soft wallet (Beta 7 wallet)
* This was the first attempt at a BIP32 wallet and was NOT compliant
* (see https://github.com/bitcoin-solutions/multibit-hd/issues/445)
* (see https://github.com/keepkey/multibit-hd/issues/445)
*
* Wallet is NOT BIP 32 compliant
* m/0'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -270,7 +270,7 @@ public Optional<WalletSummary> openWalletFromWalletId(File applicationDataDirect
* <h1>THIS METHOD DOES NOT PRODUCE BIP32 COMPLIANT WALLETS !</h1>
* <h1>THIS METHOD DOES NOT PRODUCE BIP32 COMPLIANT WALLETS !</h1>
*
* See: https://github.com/bitcoin-solutions/multibit-hd/issues/445
* See: https://github.com/keepkey/multibit-hd/issues/445
*
* <p>Create a MBHD soft wallet from a seed.</p>
* <p>This is stored in the specified directory.</p>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -868,7 +868,7 @@ public void readPayments(CharSequence password) throws PaymentsLoadException {
for (PaymentRequestData paymentRequestData : paymentRequestDataCollection) {

// Clear any tx hash if the tx is not in the wallet
// (See issue https://github.com/bitcoin-solutions/multibit-hd/issues/463)
// (See issue https://github.com/keepkey/multibit-hd/issues/463)
// This will get persisted at MBHD close or when payments is next written
Optional<Sha256Hash> transactionHashOptional = paymentRequestData.getTransactionHash();
if (transactionHashOptional.isPresent() && walletSummaryOptional.isPresent()) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ public class WalletManagerTest {
public final static String TREZOR_ADDRESS_M_44H_0H_0H_1_3 = "1DzVLMA4HzjXPAr6aZoaacDPHXXntsZ2zL";

/**
* The 'skin' seed phrase used in the issue: https://github.com/bitcoin-solutions/multibit-hd/issues/445
* The 'skin' seed phrase used in the issue: https://github.com/keepkey/multibit-hd/issues/445
*/
public static final String SKIN_SEED_PHRASE = "skin join dog sponsor camera puppy ritual diagram arrow poverty boy elbow";

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ public void run() {
*/
private static void initialiseSystemProperties() {

// Fix for "TimSort" clipboard failure - https://github.com/bitcoin-solutions/multibit-hd/issues/645
// Fix for "TimSort" clipboard failure - https://github.com/keepkey/multibit-hd/issues/645
// Suggested by https://www.java.net/node/700601
// See also http://stackoverflow.com/a/26829874/396747 for more details on ordering at startup
// Verified that java.util.Arrays has not been loaded at this stage
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ public interface MultiBitUI {
* In particular this affects some Linux variants perhaps due to an issue
* within MiG Layout.
*
* See <a href="https://github.com/bitcoin-solutions/multibit-hd/issues/230">Issue #230</a> for details.
* See <a href="https://github.com/keepkey/multibit-hd/issues/230">Issue #230</a> for details.
*/
String WIZARD_MAX_WIDTH_SEED_PHRASE_MIG = "width 300:300:" + (MultiBitUI.WIZARD_MIN_WIDTH - 30);

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@ public static void apply(JComponent component, float size) {
Font font = TITLE_FONT.deriveFont(size);
component.setFont(font);
} catch (NullPointerException npe) {
// Fix for https://github.com/bitcoin-solutions/multibit-hd/issues/676
// Fix for https://github.com/keepkey/multibit-hd/issues/676
log.warn("Failed to apply font to component", npe);
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ <h4>Advanced topics</h4>

<h4>Alternative sites containing help</h4>
<ul>
<li><a href="https://github.com/bitcoin-solutions/multibit-hd/search?q=help&type=Issues" target="_blank">Search previous MultiBit HD issues</a></li>
<li><a href="https://github.com/keepkey/multibit-hd/search?q=help&type=Issues" target="_blank">Search previous MultiBit HD issues</a></li>
<li><a href="https://bitcoin.stackexchange.com/search?q=multibit+hd" target="_blank">Bitcoin Stack Exchange</a></li>
<li><a href="https://www.google.com/search?q=help+with+multibit+hd" target="_blank">Google</a></li>
</ul>
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ <h3>Deterministic build process</h3>
<li>removal of time-sensitive information from build for repeatable results</li>
<li>signed declarations of interim build artifact hashes by known developers</li>
<li>signed declarations of code-signed JARs by known developers</li>
<li>signed declaration of installer by Bitcoin Solutions Ltd</li>
<li>signed declaration of installer by KeepKey, LLC</li>
</ul>

<h4>Co-signing a release</h4>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@ <h4>I'm seeing a SIGSEV (0xb) crash when creating a wallet</h4>
SIGSEGV (0xb) at pc=0x00007f97ec7d06a0, pid=588, tid=140289289742080
</pre>

<p>After some research <a href="https://github.com/bitcoin-solutions/multibit/issues/325" target="_blank">members of the MultiBit community</a> found that installing the Oracle Java 7 JVM
<p>After some research <a href="https://github.com/keepkey/multibit/issues/325" target="_blank">members of the MultiBit community</a> found that installing the Oracle Java 7 JVM
fixed the problem. To install Oracle's JDK do the following:</p>
<pre>
sudo add-apt-repository ppa:webupd8team/java
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ <h4>Technical details</h4>
<li>Check <a href="https://multibit.org/releases/multibit-hd/updates.xml">for updates</a></li>
<li>Present the update wizard as a background process</li>
<li>Download the latest update if the user gives permission</li>
<li>Verify the signature against the Bitcoin Solutions Ltd public key</li>
<li>Verify the signature against the KeepKey, LLC public key</li>
<li>Overwrite the existing version</li>
<li>Launch the new version</li>
</ol>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ <h4>The easy way (text only)</h4>

<p>We have implemented an encrypted issue reporting system that will securely provide us with a copy of your log files along with any additional
information you would like to add in the comment section. We will analyse these logs (usually in aggregate with others) and identify issues arising
from them. You can <a href="https://github.com/bitcoin-solutions/multibit-hd/issues" target="_blank">track them here</a>.</p>
from them. You can <a href="https://github.com/keepkey/multibit-hd/issues" target="_blank">track them here</a>.</p>

<p>The uploaded error report contains the following information:</p>
<ul>
Expand All @@ -34,7 +34,7 @@ <h4>Reporting an issue with screen shot</h4>

<p>Use the approach below to get the fastest response from the support team:</p>
<ol>
<li>Visit the <a href="https://github.com/bitcoin-solutions/multibit-hd/issues" target="_blank">MultiBit HD Issue reporting center</a></li>
<li>Visit the <a href="https://github.com/keepkey/multibit-hd/issues" target="_blank">MultiBit HD Issue reporting center</a></li>
<li>Click on the "New Issue" button.</li>
<li>Copy the following text:
<pre>
Expand Down
2 changes: 1 addition & 1 deletion mbhd-swing/src/main/resources/licence.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
The MIT License (MIT)

Copyright (c) 2016 Bitcoin Solutions Ltd
Copyright (c) 2016 KeepKey, LLC

Permission is hereby granted, free of charge, to any person obtaining a copy of
this software and associated documentation files (the "Software"), to deal in
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -434,7 +434,7 @@ public Boolean answer(InvocationOnMock invocation) throws Throwable {
/**
* <p>Configure for series of SIGN_TX messages for PIN, TX_INPUT, TX_OUTPUT, TX_META</p>
* <p>Fires low level messages that trigger state changes in the MultiBit Hardware FSM</p>
* <p>See <a href="https://github.com/bitcoin-solutions/multibit-hardware/wiki/Trezor-SignTx-Messages">MultiBit Hardware wiki</a> for more information</p>
* <p>See <a href="https://github.com/keepkey/multibit-hardware/wiki/Trezor-SignTx-Messages">MultiBit Hardware wiki</a> for more information</p>
*
* @param client The mock client
*/
Expand Down

0 comments on commit 952a592

Please sign in to comment.