Skip to content

Commit

Permalink
Fixed linting errors.
Browse files Browse the repository at this point in the history
Upgraded build gradle to 3.3.2.
Added pingServer & getTransactions to electrum.js, main.js & electrumUtils.js.
Updated connectToRandomPeer in electrumUtils.js to account for and utilize peers acquired from the getPeers method.
Added updatePeersList to settings.js action.
Added peers object to settings reducer.
Added UPDATE_PEERS_LIST to settings.js & ProjectData.json.
Swapped out getVersion method for pingServer in electrumKeepAlive in utils/electrum.js.
coin is now passed to every method in electrum.js to prevent any lagging method from updating the current state with a previously selected coin's state.
Updated shim.js.
Added SweepPrivateKey.js component.
Added api.js to nodejs-project.
Removed createAddresses from electrum.js, main.js & electrumUtils.js.
Removed persist/REHYDRATE case in user reducer.
Updated dependencies in package.json and updated yarn.lock accordingly.
  • Loading branch information
coreyphillips committed Apr 29, 2019
1 parent 27fa969 commit fa42b60
Show file tree
Hide file tree
Showing 49 changed files with 3,111 additions and 1,501 deletions.
784 changes: 317 additions & 467 deletions App.js

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions ProjectData.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
"SEND_TRANSACTION_SUCCESS": "SEND_TRANSACTION_SUCCESS",
"SEND_TRANSACTION": "SEND_TRANSACTION",
"UPDATE_SETTINGS": "UPDATE_SETTINGS",
"UPDATE_PEERS_LIST": "UPDATE_PEERS_LIST",
"LOGOUT": "LOGOUT",
"DELETE_WALLET": "DELETE_WALLET",
"WIPE_DEVICE": "WIPE_DEVICE",
Expand Down
3 changes: 1 addition & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -45,9 +45,8 @@ Bitbip's Alpha is available for download here:
* Add support for UTXO blacklisting
* This will allow users to blacklist any utxo that they do not wish to include in their list of available utxo's when sending transactions. Blacklisting a utxo will also exclude it's amount from their total balance.
* Allow users to manually select which public Electrum servers to randomly use if not connecting to their own node
* Add support for p2sh & legacy addresses in settings
* Add support for additional currencies in the settings
* Support individual private key sweeping functionality
* Support individual private key sweeping functionality - *Complete (0.1.1)*
* UI Improvements/Redesign:
* Settings View
* SelectCoin View
Expand Down
10 changes: 5 additions & 5 deletions android/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -106,8 +106,8 @@ android {
applicationId "com.kisswallet"
minSdkVersion rootProject.ext.minSdkVersion
targetSdkVersion rootProject.ext.targetSdkVersion
versionCode 11
versionName "0.1"
versionCode 12
versionName "0.1.1"
multiDexEnabled true
}
splits {
Expand All @@ -119,7 +119,7 @@ android {
}
}

/*

signingConfigs {
release {
storeFile file(MYAPP_RELEASE_STORE_FILE)
Expand All @@ -128,7 +128,7 @@ android {
keyPassword new String(System.console().readPassword("\n\$ Enter keys password: "))
}
}
*/


buildTypes {
debug {
Expand All @@ -138,7 +138,7 @@ android {
manifestPlaceholders = [excludeSystemAlertWindowPermission: "true"]
minifyEnabled enableProguardInReleaseBuilds
proguardFiles getDefaultProguardFile("proguard-android.txt"), "proguard-rules.pro"
//signingConfig signingConfigs.release
signingConfig signingConfigs.release
}
}
// applicationVariants are e.g. debug, release
Expand Down
2 changes: 1 addition & 1 deletion android/app/src/main/java/com/bitbip/MainApplication.java
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ protected List<ReactPackage> getPackages() {
new SvgPackage(),
new LinearGradientPackage(),
new RandomBytesPackage(),
new KeychainPackage()
new KeychainPackage()
);
}

Expand Down
2 changes: 1 addition & 1 deletion android/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ buildscript {
jcenter()
}
dependencies {
classpath 'com.android.tools.build:gradle:3.3.0'
classpath 'com.android.tools.build:gradle:3.3.2'

// NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files
Expand Down
2 changes: 1 addition & 1 deletion babel.config.js
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
module.exports = {
presets: ["module:metro-react-native-babel-preset"]
}
};
4 changes: 2 additions & 2 deletions ios/bitbip/Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,11 @@
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
<string>0.1</string>
<string>0.1.1</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
<string>15</string>
<string>1</string>
<key>LSRequiresIPhoneOS</key>
<true/>
<key>NSAppTransportSecurity</key>
Expand Down
14 changes: 7 additions & 7 deletions metro.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,14 @@ const blacklist = require('metro-config/src/defaults/blacklist');

module.exports = {
transformer: {
getTransformOptions: async () => ({
transform: {
experimentalImportSupport: false,
inlineRequires: false,
},
}),
getTransformOptions: async () => ({
transform: {
experimentalImportSupport: false,
inlineRequires: false,
},
}),
},
resolver:{
resolver: {
blacklistRE: blacklist([
/nodejs-assets\/.*/,
/android\/.*/,
Expand Down
38 changes: 38 additions & 0 deletions nodejs-assets/nodejs-project/api.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
class API {
constructor() {
this.coin = "bitcoin";
this.mainClient = {
bitcoin: false,
litecoin: false,
bitcoinTestnet: false,
litecoinTestnet: false
};
this.peer = {
bitcoin: {},
litecoin: {},
bitcoinTestnet: {},
litecoinTestnet: {}
};
this.peers = {
bitcoin: [],
litecoin: [],
bitcoinTestnet: [],
litecoinTestnet: []
};
}

updateCoin(coin) {
this.coin = coin;
};

updateMainClient(mainClient) {
this.mainClient = mainClient;
}

updatePeer(peer) {
this.peer = peer;
}

}

module.exports = new API();
Loading

0 comments on commit fa42b60

Please sign in to comment.