Merge pull request #205 from blockchain/development

Development

Author: riaanjvos

README.md

@@ -27,5 +27,5 @@ gradle clean build
 
 Security issues can be reported to us in the following venues:
  * Email: security@blockchain.info
- * Bug Bounty: https://www.crowdcurity.com/blockchain-info
+ * Bug Bounty: https://hackerone.com/blockchain
 

build.gradle

@@ -1,3 +1,13 @@
+buildscript {
+    ext.kotlin_version = '1.2.21'
+    repositories {
+        mavenCentral()
+    }
+    dependencies {
+        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
+    }
+}
+
 plugins {
     id 'java'
     id 'maven'
@@ -10,6 +20,7 @@ group = 'info.blockchain'
 version = PROJECT_VERSION
 
 apply from: "integTest.gradle"
+apply plugin: 'kotlin'
 
 sourceCompatibility = 1.7
 targetCompatibility = 1.7
@@ -67,17 +78,18 @@ task javadocJar(type: Jar, dependsOn: javadoc) {
 }
 
 dependencies {
-    compile files('libs/api-client-0.1.15-SNAPSHOT.jar')
+    compile files('libs/bitcoinj-core-0.15-SNAPSHOT.jar')
+    compile files('libs/api-client-0.1.16-SNAPSHOT.jar')
     // TODO: Switch this back once the client is published
 //    compile group: 'info.blockchain', name: 'api-client', version: '0.1.15-SNAPSHOT'
-    compile group: 'org.bitcoinj', name: 'bitcoinj-core', version: '0.14.4'
+//    compile group: 'org.bitcoinj', name: 'bitcoinj-core', version: '0.14.4'
     compile 'com.madgag.spongycastle:prov:1.53.0.0'
     compile ('org.web3j:core-android:2.2.1')
     compile group: 'org.slf4j', name: 'slf4j-api', version: '1.7.21'
     compile group: 'org.slf4j', name: 'slf4j-jdk14', version: '1.7.5'
     compile group: 'commons-io', name: 'commons-io', version: '2.4'
     compile group: 'commons-cli', name: 'commons-cli', version: '1.3'
-    compile group: 'commons-codec', name: 'commons-codec', version: '1.4'
+    compile group: 'commons-codec', name: 'commons-codec', version: '1.3'
     compile group: 'org.apache.commons', name: 'commons-lang3', version: '3.5'
     compile group: 'io.mikael', name: 'urlbuilder', version: '2.0.8'
     compile group: 'org.json', name: 'json', version: '20160810'
@@ -89,12 +101,29 @@ dependencies {
     compile group: 'io.jsonwebtoken', name: 'jjwt', version: '0.7.0'
     compile group: 'com.squareup.okio', name: 'okio', version: '1.11.0'
     compile group: 'org.mockito', name: 'mockito-all', version: '1.9.5'
+
+    //bitcoinj dependencies
+    compile group: 'com.google.protobuf', name: 'protobuf-java', version:'2.6.1'
+    compile group: 'com.google.code.findbugs', name: 'jsr305', version:'2.0.1'
+    compile group: 'com.google.guava', name: 'guava', version: '23.5-android'
+
     testCompile group: 'junit', name: 'junit', version: '4.12'
+    compile "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
 }
 
 jacocoTestReport {
     reports {
         xml.enabled = true // coveralls plugin depends on xml format report
         html.enabled = true
     }
+}
+compileKotlin {
+    kotlinOptions {
+        jvmTarget = "1.6"
+    }
+}
+compileTestKotlin {
+    kotlinOptions {
+        jvmTarget = "1.6"
+    }
 }

…s/api-client-0.1.15-SNAPSHOT-sources.jar …s/api-client-0.1.16-SNAPSHOT-sources.jarlibs/api-client-0.1.15-SNAPSHOT-sources.jar renamed to libs/api-client-0.1.16-SNAPSHOT-sources.jar libs/api-client-0.1.15-SNAPSHOT-sources.jar renamed to libs/api-client-0.1.16-SNAPSHOT-sources.jar

@@ -2,9 +2,11 @@
 
 import info.blockchain.wallet.api.Environment;
 import info.blockchain.wallet.api.PersistentUrls;
+import info.blockchain.wallet.shapeshift.ShapeShiftUrls;
 
-import org.bitcoinj.params.AbstractBitcoinNetParams;
-import org.bitcoinj.params.MainNetParams;
+import org.bitcoinj.core.NetworkParameters;
+import org.bitcoinj.params.BitcoinCashMainNetParams;
+import org.bitcoinj.params.BitcoinMainNetParams;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.BeforeClass;
@@ -16,7 +18,6 @@
 import io.reactivex.internal.schedulers.TrampolineScheduler;
 import io.reactivex.plugins.RxJavaPlugins;
 import okhttp3.OkHttpClient;
-import okhttp3.logging.HttpLoggingInterceptor;
 import retrofit2.Retrofit;
 import retrofit2.adapter.rxjava2.RxJava2CallAdapterFactory;
 import retrofit2.converter.jackson.JacksonConverterFactory;
@@ -39,19 +40,29 @@ public Retrofit getRetrofitExplorerInstance() {
                 return getRetrofit(PersistentUrls.EXPLORER_URL, getOkHttpClient());
             }
 
+            @Override
+            public Retrofit getRetrofitShapeShiftInstance() {
+                return getRetrofit(ShapeShiftUrls.SHAPESHIFT_URL, getOkHttpClient());
+            }
+
             @Override
             public Environment getEnvironment() {
                 return Environment.PRODUCTION;
             }
 
             @Override
-            public AbstractBitcoinNetParams getNetworkParameters() {
-                return MainNetParams.get();
+            public NetworkParameters getBitcoinParams() {
+                return BitcoinMainNetParams.get();
+            }
+
+            @Override
+            public NetworkParameters getBitcoinCashParams() {
+                return BitcoinCashMainNetParams.get();
             }
 
             @Override
             public String getApiCode() {
-                return null;
+                return "Android-Integration-test";
             }
 
             @Override
@@ -95,13 +106,13 @@ public void tearDownRxCalls() {
         RxJavaPlugins.reset();
     }
 
-    private static OkHttpClient getOkHttpClient() {
+    public static OkHttpClient getOkHttpClient() {
         return new OkHttpClient.Builder()
             .addInterceptor(new ApiInterceptor())//Extensive logging
                 .build();
     }
 
-    private static Retrofit getRetrofit(String url, OkHttpClient client) {
+    public static Retrofit getRetrofit(String url, OkHttpClient client) {
         return new Retrofit.Builder()
                 .baseUrl(url)
                 .client(client)

libs/api-client-0.1.15-SNAPSHOT.jar libs/api-client-0.1.16-SNAPSHOT.jarlibs/api-client-0.1.15-SNAPSHOT.jar renamed to libs/api-client-0.1.16-SNAPSHOT.jar

@@ -2,15 +2,12 @@
 
 import info.blockchain.wallet.BaseIntegTest;
 import info.blockchain.wallet.api.data.FeeList;
-import info.blockchain.wallet.api.data.Merchant;
 import info.blockchain.wallet.api.data.Status;
 
-import org.json.JSONObject;
 import org.junit.Test;
 import org.spongycastle.util.encoders.Hex;
 
 import java.security.SecureRandom;
-import java.util.List;
 
 import io.reactivex.observers.TestObserver;
 import okhttp3.ResponseBody;
@@ -30,16 +27,6 @@ public class WalletApiIntegTest extends BaseIntegTest {
     private String sharedKey = "b4ff6bf5-17a9-4905-b54b-a526816aa100";
     private WalletApi walletApi = new WalletApi();
 
-    @Test
-    public void getDynamicFee() throws Exception {
-        final TestObserver<FeeList> testObserver = walletApi.getDynamicFee().test();
-
-        testObserver.assertComplete();
-        testObserver.assertNoErrors();
-        assertNotNull(testObserver.values().get(0));
-        assertNotNull(testObserver.values().get(0).toJson());
-    }
-
     @Test
     public void getRandomBytesCall() throws Exception {
         Response<ResponseBody> call = walletApi.getRandomBytesCall().execute();

libs/bitcoinj-core-0.15-SNAPSHOT.jar

@@ -36,7 +36,7 @@ public class ContactsIntegTest extends BaseIntegTest{
     private HDWallet getWallet() throws Exception {
 
         return HDWalletFactory
-            .restoreWallet(PersistentUrls.getInstance().getCurrentNetworkParams(), Language.US,
+            .restoreWallet(PersistentUrls.getInstance().getBitcoinParams(), Language.US,
                 "15e23aa73d25994f1921a1256f93f72c", "", 1);
     }
 
@@ -96,15 +96,15 @@ public void testSharedMetadataIntegration() throws Exception {
         /*
         Create wallets
          */
-        HDWallet a_wallet = HDWalletFactory.createWallet(PersistentUrls.getInstance().getCurrentNetworkParams(), Language.US, 12, "", 1);
+        HDWallet a_wallet = HDWalletFactory.createWallet(PersistentUrls.getInstance().getBitcoinParams(), Language.US, 12, "", 1);
         DeterministicKey sharedMetaDataHDNode = MetadataUtil
             .deriveSharedMetadataNode(a_wallet.getMasterKey());
         DeterministicKey metaDataHDNode = MetadataUtil.deriveMetadataNode(a_wallet.getMasterKey());
         Contacts a_contacts = new Contacts(metaDataHDNode, sharedMetaDataHDNode);
         a_contacts.publishXpub();
         a_contacts.fetch();
 
-        HDWallet b_wallet = HDWalletFactory.createWallet(PersistentUrls.getInstance().getCurrentNetworkParams(), Language.US,12, "", 1);
+        HDWallet b_wallet = HDWalletFactory.createWallet(PersistentUrls.getInstance().getBitcoinParams(), Language.US,12, "", 1);
         sharedMetaDataHDNode = MetadataUtil.deriveSharedMetadataNode(b_wallet.getMasterKey());
         metaDataHDNode = MetadataUtil.deriveMetadataNode(b_wallet.getMasterKey());
         Contacts b_contacts = new Contacts(metaDataHDNode, sharedMetaDataHDNode);

src/integTest/java/info/blockchain/wallet/BaseIntegTest.java

@@ -15,7 +15,7 @@ public class MetadataIntegTest extends BaseIntegTest {
     private HDWallet getWallet() throws Exception {
 
         return HDWalletFactory
-            .restoreWallet(PersistentUrls.getInstance().getCurrentNetworkParams(), Language.US,
+            .restoreWallet(PersistentUrls.getInstance().getBitcoinParams(), Language.US,
                 "15e23aa73d25994f1921a1256f93f72c",
                 "",
                 1);

src/integTest/java/info/blockchain/wallet/api/WalletApiIntegTest.java

@@ -5,11 +5,7 @@
 import info.blockchain.wallet.bip44.HDWallet;
 import info.blockchain.wallet.bip44.HDWalletFactory;
 import info.blockchain.wallet.bip44.HDWalletFactory.Language;
-import info.blockchain.wallet.contacts.data.PublicContactDetails;
-import info.blockchain.wallet.util.MetadataUtil;
-import org.bitcoinj.crypto.DeterministicKey;
 import org.junit.Assert;
-import org.junit.Before;
 import org.junit.Test;
 
 public class MetadataNodeFactoryIntegTest extends BaseIntegTest {
@@ -18,7 +14,7 @@ public class MetadataNodeFactoryIntegTest extends BaseIntegTest {
 
     private HDWallet getWallet() throws Exception {
         return HDWalletFactory
-            .restoreWallet(PersistentUrls.getInstance().getCurrentNetworkParams(), Language.US,
+            .restoreWallet(PersistentUrls.getInstance().getBitcoinParams(), Language.US,
                 "15e23aa73d25994f1921a1256f93f72c",
                 "",
                 1);