Skip to content

Commit

Permalink
Cleanup & use latest secp256k1_ios for now
Browse files Browse the repository at this point in the history
  • Loading branch information
Alex Vlasov committed Dec 21, 2017
1 parent 8485456 commit 1263d70
Show file tree
Hide file tree
Showing 10 changed files with 72 additions and 28 deletions.
2 changes: 1 addition & 1 deletion Podfile
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ target 'web3swift' do
pod 'CryptoSwift'
pod 'Sodium'
pod 'libsodium'
pod 'secp256k1_ios'
pod 'secp256k1_ios', :git => 'https://github.com/shamatar/secp256k1_ios.git'
target 'web3swiftTests' do
inherit! :search_paths
end
Expand Down
13 changes: 11 additions & 2 deletions Podfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -32,9 +32,18 @@ DEPENDENCIES:
- libsodium
- PromiseKit (~> 4.4)
- PromiseKit/Alamofire (~> 4.0)
- secp256k1_ios
- secp256k1_ios (from `https://github.com/shamatar/secp256k1_ios.git`)
- Sodium

EXTERNAL SOURCES:
secp256k1_ios:
:git: https://github.com/shamatar/secp256k1_ios.git

CHECKOUT OPTIONS:
secp256k1_ios:
:commit: 5485b37b8bf56ab7d24fb09a9d5d7089c5b355e3
:git: https://github.com/shamatar/secp256k1_ios.git

SPEC CHECKSUMS:
Alamofire: f41a599bd63041760b26d393ec1069d9d7b917f4
AwaitKit: daf1af84544413a8dfadb4fc25d8b0f9706e5c83
Expand All @@ -46,6 +55,6 @@ SPEC CHECKSUMS:
SipHash: c6e9e43e9c531b5bc6602545130c26194a6d31ce
Sodium: bf524b0a3d5ad6870dcf343205cca7e659c15ad5

PODFILE CHECKSUM: b7e3342b3886fb758c9969fb39a7970d47f8d515
PODFILE CHECKSUM: 93b5c3d81d1dade55ad25efc38f4ccd85f195d4f

COCOAPODS: 1.3.1
36 changes: 36 additions & 0 deletions Pods/Local Podspecs/secp256k1_ios.podspec.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

13 changes: 11 additions & 2 deletions Pods/Manifest.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 3 additions & 1 deletion Pods/secp256k1_ios/secp256k1_ios/libsecp256k1-config.h

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 0 additions & 2 deletions web3Swift-Demo/ViewController.swift
Original file line number Diff line number Diff line change
Expand Up @@ -100,8 +100,6 @@ class ViewController: UIViewController {
}
let res = try await((intermediateSend?.send(network: .Rinkeby))!)
print(res)


}
catch{
print(error)
Expand Down
24 changes: 10 additions & 14 deletions web3swift.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -743,7 +743,7 @@
CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
CLANG_CXX_LANGUAGE_STANDARD = "gnu++14";
CLANG_CXX_LIBRARY = "libc++";
CLANG_ENABLE_MODULES = YES;
CLANG_ENABLE_MODULES = NO;
CLANG_ENABLE_OBJC_ARC = YES;
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
CLANG_WARN_BOOL_CONVERSION = YES;
Expand Down Expand Up @@ -784,7 +784,7 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 11.1;
IPHONEOS_DEPLOYMENT_TARGET = 11.2;
MTL_ENABLE_DEBUG_INFO = YES;
ONLY_ACTIVE_ARCH = YES;
SDKROOT = iphoneos;
Expand All @@ -804,7 +804,7 @@
CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
CLANG_CXX_LANGUAGE_STANDARD = "gnu++14";
CLANG_CXX_LIBRARY = "libc++";
CLANG_ENABLE_MODULES = YES;
CLANG_ENABLE_MODULES = NO;
CLANG_ENABLE_OBJC_ARC = YES;
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
CLANG_WARN_BOOL_CONVERSION = YES;
Expand Down Expand Up @@ -839,7 +839,7 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 11.1;
IPHONEOS_DEPLOYMENT_TARGET = 11.2;
MTL_ENABLE_DEBUG_INFO = NO;
SDKROOT = iphoneos;
SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
Expand All @@ -857,16 +857,13 @@
CLANG_ALLOW_NON_MODULAR_INCLUDES_IN_FRAMEWORK_MODULES = NO;
CODE_SIGN_IDENTITY = "";
CODE_SIGN_STYLE = Automatic;
DEFINES_MODULE = YES;
DEFINES_MODULE = NO;
DEVELOPMENT_TEAM = "";
DYLIB_COMPATIBILITY_VERSION = 1;
DYLIB_CURRENT_VERSION = 1;
DYLIB_INSTALL_NAME_BASE = "@rpath";
ENABLE_BITCODE = YES;
FRAMEWORK_SEARCH_PATHS = (
"$(inherited)",
"$(PROJECT_DIR)/web3swift/secp256k1",
);
FRAMEWORK_SEARCH_PATHS = "$(inherited)";
HEADER_SEARCH_PATHS = "$(inherited)";
INFOPLIST_FILE = web3swift/Info.plist;
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
Expand Down Expand Up @@ -894,6 +891,7 @@
"-framework",
"\"libsodium\"",
);
PRECOMPS_INCLUDE_HEADERS_FROM_BUILT_PRODUCTS_DIR = YES;
PRODUCT_BUNDLE_IDENTIFIER = BF.web3swift;
PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
SKIP_INSTALL = NO;
Expand All @@ -913,16 +911,13 @@
CLANG_ALLOW_NON_MODULAR_INCLUDES_IN_FRAMEWORK_MODULES = NO;
CODE_SIGN_IDENTITY = "";
CODE_SIGN_STYLE = Automatic;
DEFINES_MODULE = YES;
DEFINES_MODULE = NO;
DEVELOPMENT_TEAM = "";
DYLIB_COMPATIBILITY_VERSION = 1;
DYLIB_CURRENT_VERSION = 1;
DYLIB_INSTALL_NAME_BASE = "@rpath";
ENABLE_BITCODE = YES;
FRAMEWORK_SEARCH_PATHS = (
"$(inherited)",
"$(PROJECT_DIR)/web3swift/secp256k1",
);
FRAMEWORK_SEARCH_PATHS = "$(inherited)";
HEADER_SEARCH_PATHS = "$(inherited)";
INFOPLIST_FILE = web3swift/Info.plist;
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
Expand Down Expand Up @@ -950,6 +945,7 @@
"-framework",
"\"libsodium\"",
);
PRECOMPS_INCLUDE_HEADERS_FROM_BUILT_PRODUCTS_DIR = YES;
PRODUCT_BUNDLE_IDENTIFIER = BF.web3swift;
PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
SKIP_INSTALL = NO;
Expand Down
2 changes: 0 additions & 2 deletions web3swift/ABI/Classes/ABIDecoder.swift
Original file line number Diff line number Diff line change
Expand Up @@ -144,8 +144,6 @@ extension ABIElement.ParameterType.DynamicType {
returnArray.append(value)
}
return (totalConsumed, returnArray)
default:
return (nil, nil)
}
return (nil, nil)
}
Expand Down
3 changes: 0 additions & 3 deletions web3swift/ABI/Classes/ABIRecordParser.swift
Original file line number Diff line number Diff line change
Expand Up @@ -61,10 +61,7 @@ fileprivate func parseToElement(from abiRecord: ABIRecord, type: ElementType) th
case .event:
let event = try parseEvent(abiRecord: abiRecord)
return ABIElement.event(event)
default:
throw ParsingError.elementTypeInvalid
}
throw ParsingError.elementTypeInvalid
}

fileprivate func parseFunction(abiRecord:ABIRecord) throws -> ABIElement.Function {
Expand Down
1 change: 0 additions & 1 deletion web3swift/web3swift.h
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
// Created by Petr Korolev on 06/12/2017.
// Copyright © 2017 Bankex Foundation. All rights reserved.
//

#import <UIKit/UIKit.h>
//! Project version number for web3swift.
FOUNDATION_EXPORT double web3swiftVersionNumber;
Expand Down

0 comments on commit 1263d70

Please sign in to comment.