Unverified Commit 7d6a5177 authored by Alexey's avatar Alexey Committed by GitHub
Browse files

Double 0x fix in address (#170)

* Double 0x fix in address

* fix targetSdkVersion again

* project.pbxproj sync

* exclude  i386-apple-ios x86_64-apple-ios targets due to a ring issue https://github.com/briansmith/ring/issues/184
parent 3206a9d0
Pipeline #25098 passed with stage
in 16 minutes and 29 seconds
......@@ -99,9 +99,9 @@ android {
defaultConfig {
applicationId "io.parity.signer"
minSdkVersion 16
targetSdkVersion 22
versionCode 1
versionName "1.0"
targetSdkVersion 26
versionCode 2
versionName "2.0"
ndk {
abiFilters "armeabi-v7a", "x86"
}
......@@ -118,7 +118,6 @@ android {
}
buildTypes {
release {
signingConfig signingConfigs.release
}
}
splits {
......
......@@ -27,9 +27,9 @@
1F426F93208D332A00CA43DB /* libRCTAnimation.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5E9157331DD0AC6500FF2AA8 /* libRCTAnimation.a */; };
1F426F94208D333700CA43DB /* libRCTActionSheet.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 00C302AC1ABCB8CE00DB3ED1 /* libRCTActionSheet.a */; };
1F426F95208D334200CA43DB /* libReact.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 146834041AC3E56700842450 /* libReact.a */; };
1F426F96208D336400CA43DB /* libsigner.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 1F426F39208B7CC000CA43DB /* libsigner.a */; };
1F426F9C208D358500CA43DB /* EthkeyBridge.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1F426F99208D358500CA43DB /* EthkeyBridge.swift */; };
1F426F9D208D358500CA43DB /* String.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1F426F9A208D358500CA43DB /* String.swift */; };
1F73EE2721777A1D00706E91 /* libsigner.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 1F426F39208B7CC000CA43DB /* libsigner.a */; };
25585941EFBA436796B325D3 /* Feather.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 75EB071F2F264C599EB44A84 /* Feather.ttf */; };
2D0CDDA789254813913BC99F /* libRNSecureStorage.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 9C53E8F3556242B0954F1A1B /* libRNSecureStorage.a */; };
3C31DDCB4CD0465084344D5F /* Manifold-CF-Bold.otf in Resources */ = {isa = PBXBuildFile; fileRef = 624E6C0FF4A64A97A7D51BEF /* Manifold-CF-Bold.otf */; };
......@@ -415,7 +415,7 @@
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
1F426F96208D336400CA43DB /* libsigner.a in Frameworks */,
1F73EE2721777A1D00706E91 /* libsigner.a in Frameworks */,
1F426F95208D334200CA43DB /* libReact.a in Frameworks */,
1F426F94208D333700CA43DB /* libRCTActionSheet.a in Frameworks */,
1F426F93208D332A00CA43DB /* libRCTAnimation.a in Frameworks */,
......
NDK_STANDALONE = $(shell pwd)/../../NDK
ARCHS_IOS = i386-apple-ios x86_64-apple-ios armv7-apple-ios armv7s-apple-ios aarch64-apple-ios
ARCHS_IOS = armv7-apple-ios armv7s-apple-ios aarch64-apple-ios
ARCHS_ANDROID = aarch64-linux-android armv7-linux-androideabi i686-linux-android
LIB=libsigner.a
......
......@@ -26,9 +26,12 @@ const asString = x =>
.join('');
export const brainWalletAddress = seed =>
EthkeyBridge.brainWalletAddress(seed).then(address =>
keccak(asString(address)).then(hash => checksummedAddress(address, hash))
);
EthkeyBridge.brainWalletAddress(seed).then(address0x => {
const address = address0x.substring(2);
return keccak(asString(address)).then(hash =>
checksummedAddress(address, hash)
);
});
export const brainWalletSecret = seed => EthkeyBridge.brainWalletSecret(seed);
export const brainWalletSign = (seed, message) =>
EthkeyBridge.brainWalletSign(seed, message);
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment