Change Server to point to bitshares main net
This commit is contained in:
parent
61b50b1465
commit
6caa84481c
4 changed files with 10 additions and 6 deletions
|
@ -7,6 +7,7 @@ import java.util.HashMap;
|
||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
import java.util.concurrent.TimeUnit;
|
import java.util.concurrent.TimeUnit;
|
||||||
|
|
||||||
|
import io.reactivex.Observable;
|
||||||
import okhttp3.Interceptor;
|
import okhttp3.Interceptor;
|
||||||
import okhttp3.OkHttpClient;
|
import okhttp3.OkHttpClient;
|
||||||
import okhttp3.logging.HttpLoggingInterceptor;
|
import okhttp3.logging.HttpLoggingInterceptor;
|
||||||
|
@ -217,8 +218,9 @@ public abstract class BitsharesFaucetApiGenerator {
|
||||||
|
|
||||||
public interface IWebService {
|
public interface IWebService {
|
||||||
@Headers({"Content-Type: application/json"})
|
@Headers({"Content-Type: application/json"})
|
||||||
@POST("/api/v1/accounts")
|
@POST("/faucet/api/v1/accounts")
|
||||||
Call<RegisterAccountResponse> getReg(@Body Map<String, HashMap> params);
|
Call<RegisterAccountResponse> getReg(@Body Map<String, HashMap> params);
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public class RegisterAccountResponse {
|
public class RegisterAccountResponse {
|
||||||
|
|
|
@ -583,7 +583,7 @@ public abstract class GrapheneApiGenerator {
|
||||||
public void onError(BaseResponse.Error error) {
|
public void onError(BaseResponse.Error error) {
|
||||||
request.getListener().fail(request.getId());
|
request.getListener().fail(request.getId());
|
||||||
}
|
}
|
||||||
}), BitsharesConstant.EQUIVALENT_URL); //todo change equivalent url for current server url
|
}), CryptoNetManager.getURL(CryptoNet.BITSHARES)); //todo change equivalent url for current server url
|
||||||
thread.start();
|
thread.start();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -599,7 +599,7 @@ public abstract class GrapheneApiGenerator {
|
||||||
for (BitsharesAsset quoteAsset : quoteAssets) {
|
for (BitsharesAsset quoteAsset : quoteAssets) {
|
||||||
WebSocketThread thread = new WebSocketThread(new GetLimitOrders(baseAsset.getBitsharesId(),
|
WebSocketThread thread = new WebSocketThread(new GetLimitOrders(baseAsset.getBitsharesId(),
|
||||||
quoteAsset.getBitsharesId(), 10, new EquivalentValueListener(baseAsset,
|
quoteAsset.getBitsharesId(), 10, new EquivalentValueListener(baseAsset,
|
||||||
quoteAsset, context)), BitsharesConstant.EQUIVALENT_URL); //todo change equivalent url for current server url
|
quoteAsset, context)), CryptoNetManager.getURL(CryptoNet.BITSHARES)); //todo change equivalent url for current server url
|
||||||
thread.start();
|
thread.start();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -60,7 +60,7 @@ public class CrystalApplication extends Application {
|
||||||
SqlScoutServer.create(this, getPackageName());
|
SqlScoutServer.create(this, getPackageName());
|
||||||
|
|
||||||
//Using Bitshares Agorise Testnet
|
//Using Bitshares Agorise Testnet
|
||||||
CryptoNetManager.addCryptoNetURL(CryptoNet.BITSHARES,BITSHARES_TESTNET_URL);
|
//CryptoNetManager.addCryptoNetURL(CryptoNet.BITSHARES,BITSHARES_TESTNET_URL);
|
||||||
|
|
||||||
//This is for testing the equivalent values on the testnet TODO remove
|
//This is for testing the equivalent values on the testnet TODO remove
|
||||||
if(db.bitsharesAssetDao().getBitsharesAssetInfoById(bitEURAsset.getBitsharesId())== null){
|
if(db.bitsharesAssetDao().getBitsharesAssetInfoById(bitEURAsset.getBitsharesId())== null){
|
||||||
|
@ -91,7 +91,7 @@ public class CrystalApplication extends Application {
|
||||||
CryptoNetEvents.getInstance().addListener(crystalWalletNotifier);
|
CryptoNetEvents.getInstance().addListener(crystalWalletNotifier);
|
||||||
|
|
||||||
//Next line is for use the bitshares main net
|
//Next line is for use the bitshares main net
|
||||||
//CryptoNetManager.addCryptoNetURL(CryptoNet.BITSHARES,BITSHARES_URL);
|
CryptoNetManager.addCryptoNetURL(CryptoNet.BITSHARES,BITSHARES_URL);
|
||||||
|
|
||||||
GeneralSetting generalSettingPreferredLanguage = db.generalSettingDao().getSettingByName(GeneralSetting.SETTING_NAME_PREFERRED_LANGUAGE);
|
GeneralSetting generalSettingPreferredLanguage = db.generalSettingDao().getSettingByName(GeneralSetting.SETTING_NAME_PREFERRED_LANGUAGE);
|
||||||
|
|
||||||
|
|
|
@ -30,7 +30,9 @@ public abstract class BitsharesConstant {
|
||||||
"http://185.208.208.147:11012", // Openledger node
|
"http://185.208.208.147:11012", // Openledger node
|
||||||
};
|
};
|
||||||
|
|
||||||
public final static String FAUCET_URL = "http://185.208.208.147:5010";
|
//testnet faucet
|
||||||
|
//public final static String FAUCET_URL = "http://185.208.208.147:5010";
|
||||||
|
public final static String FAUCET_URL = "https://de.palmpay.io";
|
||||||
public final static String EQUIVALENT_URL = "wss://bitshares.openledger.info/ws";
|
public final static String EQUIVALENT_URL = "wss://bitshares.openledger.info/ws";
|
||||||
|
|
||||||
public final static BitsharesAsset[] SMARTCOINS = new BitsharesAsset[]{
|
public final static BitsharesAsset[] SMARTCOINS = new BitsharesAsset[]{
|
||||||
|
|
Loading…
Reference in a new issue