Merge pull request #253 from matter-labs/develop

2.2.2

.gitignore

@@ -45,7 +45,8 @@ playground.xcworkspace
 # you should judge for yourself, the pros and cons are mentioned at:
 # https://guides.cocoapods.org/using/using-cocoapods.html#should-i-check-the-pods-directory-into-source-control
 #
-#Pods/
+# Pods/
+# Example/web3swiftBrowser/Pods
 
 # Carthage
 #

.travis.yml

@@ -4,11 +4,11 @@ cache: bundler
 xcode_project: web3swift.xcworkspace
 xcode_scheme: web3swift-iOS
 xcode_destination: platform=iOS Simulator, OS=12.2, name=iPhone X
-before_install:
-  - brew install carthage || true
-  - brew outdated carthage || brew upgrade carthage
-before_script:
-  - carthage bootstrap --platform iOS --no-use-binaries --cache-builds
+#before_install:
+#  - brew install carthage || true
+#  - brew outdated carthage || brew upgrade carthage
+#before_script:
+#  - carthage bootstrap --platform iOS --no-use-binaries --cache-builds
 script:
   - xcodebuild -scheme web3swift -project web3swift.xcodeproj -sdk iphonesimulator build test
 after_success:

Cartfile

@@ -1,4 +1,5 @@
-github "mxcl/PromiseKit" ~> 6.8.4
-github "attaswift/BigInt" ~> 4.0
-github "daltoniam/Starscream" ~> 3.1.0
-github "krzyzanowskim/CryptoSwift" ~> 1.0.0
+github "attaswift/BigInt" == 4.0
+github "attaswift/SipHash" == 1.2.2
+github "daltoniam/Starscream" == 3.1.0
+github "krzyzanowskim/CryptoSwift" == 1.0.0
+github "mxcl/PromiseKit" == 6.8.4

Cartfile.resolved

@@ -1,4 +1,4 @@
-github "attaswift/BigInt" "v3.1.0"
+github "attaswift/BigInt" "v4.0.0"
 github "attaswift/SipHash" "v1.2.2"
 github "daltoniam/Starscream" "3.1.0"
 github "krzyzanowskim/CryptoSwift" "1.0.0"

Carthage/Checkouts/BigInt/.codecov.yml

@@ -1,5 +1,5 @@
 ignore:
-- "/tests/*"
+- "/Tests/*"
 comment:
   layout: "header, diff"
   behavior: default
@@ -11,4 +11,4 @@ coverage:
         target: auto
         threshold: null
         base: auto
-        paths: "sources/*"
+        paths: "Sources/*"

Carthage/Checkouts/BigInt/.gitmodules

@@ -1,3 +0,0 @@
-[submodule "Carthage/Checkouts/SipHash"]
-	path = Carthage/Checkouts/SipHash
-	url = https://github.com/attaswift/SipHash.git

Carthage/Checkouts/BigInt/.swift-version

@@ -1 +1 @@
-4.0
+5.0

Carthage/Checkouts/BigInt/.travis.yml

@@ -1,5 +1,5 @@
 language: objective-c
-osx_image: xcode9.3
+osx_image: xcode10.2
 script:
 - swift build
 - swift test

Carthage/Checkouts/BigInt/BigInt.podspec

@@ -1,7 +1,7 @@
 
 Pod::Spec.new do |spec|
     spec.name         = 'BigInt'
-    spec.version      = '3.1.0'
+    spec.version      = '4.0.0'
     spec.ios.deployment_target = "8.0"
     spec.osx.deployment_target = "10.9"
     spec.tvos.deployment_target = "9.0"
@@ -14,5 +14,4 @@ Pod::Spec.new do |spec|
     spec.source_files = 'sources/*.swift'
     spec.social_media_url = 'https://twitter.com/lorentey'
     spec.documentation_url = 'http://attaswift.github.io/BigInt/'
-    spec.dependency 'SipHash', '~> 1.2'
 end

Carthage/Checkouts/BigInt/BigInt.xcodeproj/project.pbxproj

@@ -74,14 +74,6 @@
 		BB241CA61DDB71920067F917 /* Random.swift in Sources */ = {isa = PBXBuildFile; fileRef = BB241C3B1DDB70600067F917 /* Random.swift */; };
 		BB241CBB1DDB71A50067F917 /* ProfileTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = BB241C5A1DDB70690067F917 /* ProfileTests.swift */; };
 		BB241CC51DDB71A60067F917 /* ProfileTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = BB241C5A1DDB70690067F917 /* ProfileTests.swift */; };
-		BB241CCD1DDB71DB0067F917 /* SipHash.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = BB241CCC1DDB71DB0067F917 /* SipHash.framework */; };
-		BB241CCF1DDB71E30067F917 /* SipHash.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = BB241CCE1DDB71E30067F917 /* SipHash.framework */; };
-		BB241CD11DDB71EA0067F917 /* SipHash.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = BB241CD01DDB71EA0067F917 /* SipHash.framework */; };
-		BB241CD31DDB71F20067F917 /* SipHash.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = BB241CD21DDB71F20067F917 /* SipHash.framework */; };
-		BB241CD41DDB78920067F917 /* SipHash.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = BB241CCE1DDB71E30067F917 /* SipHash.framework */; };
-		BB241CD61DDB789D0067F917 /* SipHash.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = BB241CD51DDB789D0067F917 /* SipHash.framework */; };
-		BB241CD81DDB78A30067F917 /* SipHash.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = BB241CD71DDB78A30067F917 /* SipHash.framework */; };
-		BB241CD91DDB78AA0067F917 /* SipHash.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = BB241CCE1DDB71E30067F917 /* SipHash.framework */; };
 		BB241CDC1DDB79E20067F917 /* BigUIntTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = BB241C571DDB70690067F917 /* BigUIntTests.swift */; };
 		BB241CE41DDB79E30067F917 /* BigUIntTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = BB241C571DDB70690067F917 /* BigUIntTests.swift */; };
 		BB4273F61F24AFCC00065766 /* Tools.swift in Sources */ = {isa = PBXBuildFile; fileRef = BB4273F41F24AFC800065766 /* Tools.swift */; };
@@ -180,16 +172,9 @@
 		BB241C571DDB70690067F917 /* BigUIntTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = BigUIntTests.swift; sourceTree = "<group>"; };
 		BB241C5A1DDB70690067F917 /* ProfileTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ProfileTests.swift; sourceTree = "<group>"; };
 		BB241C6A1DDB70B00067F917 /* BigInt Benchmark.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = "BigInt Benchmark.xctest"; sourceTree = BUILT_PRODUCTS_DIR; };
-		BB241CCC1DDB71DB0067F917 /* SipHash.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SipHash.framework; path = "Carthage/Checkouts/SipHash/build/Debug-iphoneos/SipHash.framework"; sourceTree = "<group>"; };
-		BB241CCE1DDB71E30067F917 /* SipHash.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SipHash.framework; path = "../../Library/Developer/Xcode/DerivedData/BigInt-aibydghxjcolwocpvmpgshvylvps/Build/Products/Debug/SipHash.framework"; sourceTree = "<group>"; };
-		BB241CD01DDB71EA0067F917 /* SipHash.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SipHash.framework; path = "Carthage/Checkouts/SipHash/build/Debug-watchos/SipHash.framework"; sourceTree = "<group>"; };
-		BB241CD21DDB71F20067F917 /* SipHash.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SipHash.framework; path = "Carthage/Checkouts/SipHash/build/Debug-appletvos/SipHash.framework"; sourceTree = "<group>"; };
-		BB241CD51DDB789D0067F917 /* SipHash.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SipHash.framework; path = "Carthage/Checkouts/SipHash/build/Debug-iphoneos/SipHash.framework"; sourceTree = "<group>"; };
-		BB241CD71DDB78A30067F917 /* SipHash.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SipHash.framework; path = "Carthage/Checkouts/SipHash/build/Debug-appletvos/SipHash.framework"; sourceTree = "<group>"; };
 		BB241CE81DDB7B620067F917 /* CHANGELOG.md */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = net.daringfireball.markdown; path = CHANGELOG.md; sourceTree = "<group>"; };
 		BB241CE91DDB7B620067F917 /* Demo.playground */ = {isa = PBXFileReference; lastKnownFileType = file.playground; path = Demo.playground; sourceTree = "<group>"; };
 		BB241CEA1DDB7B620067F917 /* generate-docs.sh */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.sh; path = "generate-docs.sh"; sourceTree = "<group>"; };
-		BB241CEB1DDB7B620067F917 /* Cartfile */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = Cartfile; sourceTree = "<group>"; };
 		BB241CF01DDB84210067F917 /* .codecov.yml */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = .codecov.yml; sourceTree = "<group>"; };
 		BB4273F41F24AFC800065766 /* Tools.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Tools.swift; sourceTree = "<group>"; };
 		BB9889A41F3E5C3100014740 /* Strideable.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Strideable.swift; sourceTree = "<group>"; };
@@ -218,7 +203,6 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				BB241CD91DDB78AA0067F917 /* SipHash.framework in Frameworks */,
 				BB241C651DDB70B00067F917 /* BigInt.framework in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
@@ -227,15 +211,13 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				BB241CCD1DDB71DB0067F917 /* SipHash.framework in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
 		BBB55AB91C8F80020050DDA9 /* Frameworks */ = {
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				BB241CD61DDB789D0067F917 /* SipHash.framework in Frameworks */,
 				BBB55ABD1C8F80020050DDA9 /* BigInt.framework in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
@@ -244,15 +226,13 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				BB241CCF1DDB71E30067F917 /* SipHash.framework in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
 		BBB55ADA1C8F88F20050DDA9 /* Frameworks */ = {
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				BB241CD41DDB78920067F917 /* SipHash.framework in Frameworks */,
 				BBB55ADE1C8F88F20050DDA9 /* BigInt.framework in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
@@ -261,23 +241,20 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				BB241CD11DDB71EA0067F917 /* SipHash.framework in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
 		BBB55AFA1C8F8CBB0050DDA9 /* Frameworks */ = {
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				BB241CD31DDB71F20067F917 /* SipHash.framework in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
 		BBB55B041C8F8CBB0050DDA9 /* Frameworks */ = {
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				BB241CD81DDB78A30067F917 /* SipHash.framework in Frameworks */,
 				BBB55B081C8F8CBC0050DDA9 /* BigInt.framework in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
@@ -288,12 +265,6 @@
 		BB241CCB1DDB71DB0067F917 /* Frameworks */ = {
 			isa = PBXGroup;
 			children = (
-				BB241CD71DDB78A30067F917 /* SipHash.framework */,
-				BB241CD51DDB789D0067F917 /* SipHash.framework */,
-				BB241CD21DDB71F20067F917 /* SipHash.framework */,
-				BB241CD01DDB71EA0067F917 /* SipHash.framework */,
-				BB241CCE1DDB71E30067F917 /* SipHash.framework */,
-				BB241CCC1DDB71DB0067F917 /* SipHash.framework */,
 			);
 			name = Frameworks;
 			sourceTree = "<group>";
@@ -306,7 +277,6 @@
 				BB241CE81DDB7B620067F917 /* CHANGELOG.md */,
 				BB241BC51DD9F6490067F917 /* Package.swift */,
 				BB241BC71DD9F7D60067F917 /* BigInt.podspec */,
-				BB241CEB1DDB7B620067F917 /* Cartfile */,
 				BBB55B1C1C8F90F60050DDA9 /* .travis.yml */,
 				BB241CF01DDB84210067F917 /* .codecov.yml */,
 				BBB55ACC1C8F80660050DDA9 /* version.xcconfig */,
@@ -361,8 +331,7 @@
 				BB241C3B1DDB70600067F917 /* Random.swift */,
 				BBB55AB71C8F80020050DDA9 /* Info.plist */,
 			);
-			name = Sources;
-			path = sources;
+			path = Sources;
 			sourceTree = "<group>";
 		};
 		BBB55AC01C8F80020050DDA9 /* Tests */ = {
@@ -376,7 +345,7 @@
 				BBB55AC31C8F80020050DDA9 /* Info.plist */,
 			);
 			name = Tests;
-			path = tests/BigIntTests;
+			path = Tests/BigIntTests;
 			sourceTree = "<group>";
 		};
 /* End PBXGroup section */
@@ -564,7 +533,7 @@
 			isa = PBXProject;
 			attributes = {
 				LastSwiftUpdateCheck = 0730;
-				LastUpgradeCheck = 0900;
+				LastUpgradeCheck = 1020;
 				ORGANIZATIONNAME = "Károly Lőrentey";
 				TargetAttributes = {
 					BBB55AB11C8F80020050DDA9 = {
@@ -577,14 +546,15 @@
 					};
 					BBB55AD31C8F88F20050DDA9 = {
 						CreatedOnToolsVersion = 7.3;
-						LastSwiftMigration = 0900;
+						LastSwiftMigration = 1020;
 					};
 					BBB55ADC1C8F88F20050DDA9 = {
 						CreatedOnToolsVersion = 7.3;
-						LastSwiftMigration = 0900;
+						LastSwiftMigration = 1020;
 					};
 					BBB55AF01C8F8BE00050DDA9 = {
 						CreatedOnToolsVersion = 7.3;
+						LastSwiftMigration = 1020;
 					};
 					BBB55AFD1C8F8CBB0050DDA9 = {
 						CreatedOnToolsVersion = 7.3;
@@ -596,10 +566,11 @@
 			};
 			buildConfigurationList = BBB55AAC1C8F80020050DDA9 /* Build configuration list for PBXProject "BigInt" */;
 			compatibilityVersion = "Xcode 8.0";
-			developmentRegion = English;
+			developmentRegion = en;
 			hasScannedForEncodings = 0;
 			knownRegions = (
 				en,
+				Base,
 			);
 			mainGroup = BBB55AA81C8F80020050DDA9;
 			productRefGroup = BBB55AB31C8F80020050DDA9 /* Products */;
@@ -897,6 +868,7 @@
 			baseConfigurationReference = BBB55ACC1C8F80660050DDA9 /* version.xcconfig */;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
+				CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
 				CLANG_ANALYZER_NONNULL = YES;
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
 				CLANG_CXX_LIBRARY = "libc++";
@@ -906,12 +878,14 @@
 				CLANG_WARN_BOOL_CONVERSION = YES;
 				CLANG_WARN_COMMA = YES;
 				CLANG_WARN_CONSTANT_CONVERSION = YES;
+				CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
 				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
 				CLANG_WARN_EMPTY_BODY = YES;
 				CLANG_WARN_ENUM_CONVERSION = YES;
 				CLANG_WARN_INFINITE_RECURSION = YES;
 				CLANG_WARN_INT_CONVERSION = YES;
 				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
+				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
 				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
 				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
@@ -955,6 +929,7 @@
 			baseConfigurationReference = BBB55ACC1C8F80660050DDA9 /* version.xcconfig */;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
+				CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
 				CLANG_ANALYZER_NONNULL = YES;
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
 				CLANG_CXX_LIBRARY = "libc++";
@@ -964,12 +939,14 @@
 				CLANG_WARN_BOOL_CONVERSION = YES;
 				CLANG_WARN_COMMA = YES;
 				CLANG_WARN_CONSTANT_CONVERSION = YES;
+				CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
 				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
 				CLANG_WARN_EMPTY_BODY = YES;
 				CLANG_WARN_ENUM_CONVERSION = YES;
 				CLANG_WARN_INFINITE_RECURSION = YES;
 				CLANG_WARN_INT_CONVERSION = YES;
 				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
+				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
 				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
 				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
@@ -1147,6 +1124,7 @@
 				SDKROOT = watchos;
 				SKIP_INSTALL = YES;
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
+				SWIFT_VERSION = 5.0;
 				TARGETED_DEVICE_FAMILY = 4;
 			};
 			name = Debug;
@@ -1165,6 +1143,7 @@
 				PRODUCT_NAME = "$(PROJECT_NAME)";
 				SDKROOT = watchos;
 				SKIP_INSTALL = YES;
+				SWIFT_VERSION = 5.0;
 				TARGETED_DEVICE_FAMILY = 4;
 			};
 			name = Release;

Carthage/Checkouts/BigInt/BigInt.xcodeproj/xcshareddata/xcschemes/BigInt Benchmark.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0900"
+   LastUpgradeVersion = "1020"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -11,7 +11,6 @@
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
       disableMainThreadChecker = "YES"
-      language = ""
       shouldUseLaunchSchemeArgsEnv = "YES">
       <Testables>
          <TestableReference
@@ -32,7 +31,6 @@
       buildConfiguration = "Release"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      language = ""
       launchStyle = "0"
       useCustomWorkingDirectory = "NO"
       ignoresPersistentStateOnLaunch = "NO"

Carthage/Checkouts/BigInt/BigInt.xcodeproj/xcshareddata/xcschemes/BigInt-iOS.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0900"
+   LastUpgradeVersion = "1020"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -26,9 +26,8 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      language = ""
-      shouldUseLaunchSchemeArgsEnv = "YES"
-      codeCoverageEnabled = "YES">
+      codeCoverageEnabled = "YES"
+      shouldUseLaunchSchemeArgsEnv = "YES">
       <Testables>
          <TestableReference
             skipped = "NO">
@@ -57,7 +56,6 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      language = ""
       launchStyle = "0"
       useCustomWorkingDirectory = "NO"
       ignoresPersistentStateOnLaunch = "NO"