Merge branch 'develop-upstream' into hot-fix/data-to-hex-string

JeneaVranceanu · JeneaVranceanu · commit afe86cf28fbc · 2022-11-02T13:50:57.000+02:00
# Conflicts:
#	Tests/web3swiftTests/remoteTests/ST20AndSecurityTokenTests.swift
diff --git a/Sources/Core/Utility/BigUInt+Extension.swift b/Sources/Core/Utility/BigUInt+Extension.swift
@@ -13,3 +13,9 @@ public extension BigUInt {
         self = value
     }
 }
+
+#if COCOAPODS
+extension BigUInt {
+    var isZero: Bool { self == 0 }
+}
+#endif
diff --git a/Sources/web3swift/Browser/BrowserViewController.swift b/Sources/web3swift/Browser/BrowserViewController.swift
diff --git a/Sources/web3swift/Web3/Web3.swift b/Sources/web3swift/Web3/Web3.swift
@@ -33,18 +33,21 @@ extension Web3 {
     }
 
     /// Initialized Web3 instance bound to Infura's rinkeby provider.
+    @available(*, deprecated, message: "This network support was deprecated by Infura")
     public static func InfuraRinkebyWeb3(accessToken: String? = nil) async -> Web3 {
         let infura = await InfuraProvider(Networks.Rinkeby, accessToken: accessToken)!
         return Web3(provider: infura)
     }
 
     /// Initialized Web3 instance bound to Infura's ropsten provider.
+    @available(*, deprecated, message: "This network support was deprecated by Infura")
     public static func InfuraRopstenWeb3(accessToken: String? = nil) async -> Web3 {
         let infura = await InfuraProvider(Networks.Ropsten, accessToken: accessToken)!
         return Web3(provider: infura)
     }
 
     /// Initialized Web3 instance bound to Infura's kovan provider.
+    @available(*, deprecated, message: "This network support was deprecated by Infura")
     public static func InfuraKovanWeb3(accessToken: String? = nil) async -> Web3 {
         let infura = await InfuraProvider(Networks.Kovan, accessToken: accessToken)!
         return Web3(provider: infura)
diff --git a/Tests/web3swiftTests/remoteTests/EIP1559Tests.swift b/Tests/web3swiftTests/remoteTests/EIP1559Tests.swift
@@ -0,0 +1,47 @@
+//
+//  EIP1559Tests.swift
+//  
+//
+//  Created by Jann Driessen on 01.11.22.
+//
+
+import XCTest
+import Core
+
+@testable import web3swift
+
+final class EIP1559Tests: XCTestCase {
+
+    func testEIP1159MainnetTransaction() async throws {
+        let web3 = await Web3.InfuraMainnetWeb3(accessToken: Constants.infuraToken)
+        var tx = CodableTransaction(
+            type: .eip1559,
+            to: EthereumAddress("0xb47292B7bBedA4447564B8336E4eD1f93735e7C7")!,
+            chainID: web3.provider.network!.chainID,
+            value: Utilities.parseToBigUInt("0.1", units: .eth)!,
+            gasLimit: 21_000
+        )
+        // Vitalik's address
+        tx.from = EthereumAddress("0xAb5801a7D398351b8bE11C439e05C5B3259aeC9B")!
+        // Should fail if there would be something wrong with the tx
+        let res = try await web3.eth.estimateGas(for: tx)
+        XCTAssertGreaterThan(res, 0)
+    }
+
+    func testEIP1159GoerliTransaction() async throws {
+        let web3 = await Web3.InfuraGoerliWeb3(accessToken: Constants.infuraToken)
+        var tx = CodableTransaction(
+            type: .eip1559,
+            to: EthereumAddress("0xeBec795c9c8bBD61FFc14A6662944748F299cAcf")!,
+            chainID: web3.provider.network!.chainID,
+            value: Utilities.parseToBigUInt("0.1", units: .eth)!,
+            gasLimit: 21_000
+        )
+        // Vitalik's address
+        tx.from = EthereumAddress("0xAb5801a7D398351b8bE11C439e05C5B3259aeC9B")!
+        // Should fail if there would be something wrong with the tx
+        let res = try await web3.eth.estimateGas(for: tx)
+        XCTAssertGreaterThan(res, 0)
+    }
+
+}
diff --git a/Tests/web3swiftTests/remoteTests/ST20AndSecurityTokenTests.swift b/Tests/web3swiftTests/remoteTests/ST20AndSecurityTokenTests.swift
@@ -15,6 +15,7 @@ import Core
 // MARK: Works only with network connection
 class ST20AndSecurityTokenTests: XCTestCase {
 
+<<<<<<< HEAD
     func testERC20TokenCreation() async throws {
         let web3 = await Web3.InfuraGoerliWeb3(accessToken: Constants.infuraToken)
         let w3sTokenAddress = EthereumAddress("0x33d191db2486e0d245b44fde3fae5ed667d5694b")!
@@ -24,6 +25,19 @@ class ST20AndSecurityTokenTests: XCTestCase {
         XCTAssertEqual(st20token.name(), "Mimi")
         XCTAssertEqual(st20token.decimals(), 18)
     }
+=======
+    // FIXME: Enable me back again
+    // Test fails because there's no such wallet on goerli chain as well as token.
+//    func testERC20TokenCreation() async throws {
+//        let web3 = await Web3.InfuraGoerliWeb3(accessToken: Constants.infuraToken)
+//        let w3sTokenAddress = EthereumAddress("0x2dD33957C90880bE4Ee9fd5F703110BDA2E579EC")!
+//        let st20token = ST20.init(web3: web3, provider: web3.provider, address: w3sTokenAddress)
+//        try await st20token.readProperties()
+//        XCTAssertEqual(st20token.symbol(), "MIMI")
+//        XCTAssertEqual(st20token.name(), "Mimi")
+//        XCTAssertEqual(st20token.decimals(), 18)
+//    }
+>>>>>>> develop-upstream
 
     func testST20tokenBalanceAndAllowance() async throws {
         let web3 = await Web3.InfuraGoerliWeb3(accessToken: Constants.infuraToken)
@@ -32,7 +46,7 @@ class ST20AndSecurityTokenTests: XCTestCase {
         let userAddress = EthereumAddress("0xe22b8979739D724343bd002F9f432F5990879901")!
         let balance = try await st20token.getBalance(account: userAddress)
         let allowance = try await st20token.getAllowance(originalOwner: userAddress, delegate: userAddress)
-        XCTAssertEqual(String(balance), "0")
+        XCTAssertEqual(balance, 0)
         XCTAssertEqual(allowance, 0)
     }
 
@@ -41,11 +55,11 @@ class ST20AndSecurityTokenTests: XCTestCase {
         let w3sTokenAddress = EthereumAddress("0x2dD33957C90880bE4Ee9fd5F703110BDA2E579EC")!
         let stoken = SecurityToken.init(web3: web3, provider: web3.provider, address: w3sTokenAddress)
         let investorsCount = try await stoken.investorCount()
-        let stringInvestorsCount = String(investorsCount)
-        XCTAssertEqual(stringInvestorsCount, "0")
+        XCTAssertEqual(investorsCount, 0)
     }
 
     // FIXME: Enable me back again
+    // Test fails because there's no such wallet on goerli chain as well as token.
 //    func testSecurityTokenGranularity() async throws {
 //        let web3 = await Web3.InfuraGoerliWeb3(accessToken: Constants.infuraToken)
 //        let w3sTokenAddress = EthereumAddress("0x2dD33957C90880bE4Ee9fd5F703110BDA2E579EC")!
diff --git a/Web3Core.podspec b/Web3Core.podspec
@@ -1,6 +1,8 @@
 Pod::Spec.new do |spec|
+    spec.compiler_flags = '-DCOCOAPODS'
+
     spec.name         = 'Web3Core'
-    spec.version      = '3.0.0'
+    spec.version      = '3.0.4'
     spec.module_name  = 'Core'
     spec.ios.deployment_target = "13.0"
     spec.osx.deployment_target = "10.15"
@@ -12,7 +14,7 @@ Pod::Spec.new do |spec|
     spec.swift_version = '5.5'
 
     spec.dependency 'secp256k1.c', '~> 0.1'
-    spec.dependency 'BigInt', '~> 5.2.0'
+    spec.dependency 'BigInt', '~> 5.2.0' # no newer version in pods.
     spec.dependency 'CryptoSwift', '~> 1.5.1'
     spec.source_files = "Sources/Core/**/*.swift"
 end
diff --git a/web3swift.podspec b/web3swift.podspec
@@ -1,4 +1,4 @@
-WEB3CORE_VERSION ||= '3.0.0'
+WEB3CORE_VERSION ||= '3.0.4'
 
 Pod::Spec.new do |spec|
     spec.name         = 'web3swift'
@@ -13,7 +13,7 @@ Pod::Spec.new do |spec|
     spec.swift_version = '5.5'
 
     # Make this line same as Web3Core sources
-    spec.source_files =  "Sources/web3swift/{Contract,Convenience,EthereumABI,HookedFunctions,EthereumAPICalls,Web3}/*.swift", "Sources/web3swift/{EthereumAPICalls,Tokens,Utils}/**/*.swift"
+    spec.source_files =  "Sources/web3swift/**/*.swift"
     spec.ios.source_files   = 'Sources/web3swift/Browser/*.swift'
     spec.resource_bundle = { "Browser" => "Sources/web3swift/Browser/*.js" }
     spec.frameworks = 'CoreImage'

Original file line number	Diff line number	Diff line change
`@@ -13,3 +13,9 @@ public extension BigUInt {`
`13`	`13`	`self = value`
`14`	`14`	`}`
`15`	`15`	`}`
	`16`	`+`
	`17`	`+#if COCOAPODS`
	`18`	`+extension BigUInt {`
	`19`	`+ var isZero: Bool { self == 0 }`
	`20`	`+}`
	`21`	`+#endif`
Original file line number	Diff line number	Diff line change
`@@ -33,18 +33,21 @@ extension Web3 {`
`33`	`33`	`}`
`34`	`34`
`35`	`35`	`/// Initialized Web3 instance bound to Infura's rinkeby provider.`
	`36`	`+ @available(*, deprecated, message: "This network support was deprecated by Infura")`
`36`	`37`	`public static func InfuraRinkebyWeb3(accessToken: String? = nil) async -> Web3 {`
`37`	`38`	`let infura = await InfuraProvider(Networks.Rinkeby, accessToken: accessToken)!`
`38`	`39`	`return Web3(provider: infura)`
`39`	`40`	`}`
`40`	`41`
`41`	`42`	`/// Initialized Web3 instance bound to Infura's ropsten provider.`
	`43`	`+ @available(*, deprecated, message: "This network support was deprecated by Infura")`
`42`	`44`	`public static func InfuraRopstenWeb3(accessToken: String? = nil) async -> Web3 {`
`43`	`45`	`let infura = await InfuraProvider(Networks.Ropsten, accessToken: accessToken)!`
`44`	`46`	`return Web3(provider: infura)`
`45`	`47`	`}`
`46`	`48`
`47`	`49`	`/// Initialized Web3 instance bound to Infura's kovan provider.`
	`50`	`+ @available(*, deprecated, message: "This network support was deprecated by Infura")`
`48`	`51`	`public static func InfuraKovanWeb3(accessToken: String? = nil) async -> Web3 {`
`49`	`52`	`let infura = await InfuraProvider(Networks.Kovan, accessToken: accessToken)!`
`50`	`53`	`return Web3(provider: infura)`