Skip to content

Commit 68cb9a3

Browse files
yaroslavyaroslavyaroslavyaroslav
committed
Toggle on tests for Transactions. Almost all passes.
1 parent 531db2e commit 68cb9a3

File tree

3 files changed

+17
-26
lines changed

3 files changed

+17
-26
lines changed

‎Sources/Core/Transaction/EncodableTransaction.swift

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,10 @@ public struct EncodableTransaction {
2222
// MARK: - Properties that always sends to a Node
2323

2424
/// the address of the sender of the transaction recovered from the signature
25-
public var sender: EthereumAddress? { envelope.sender }
25+
public var sender: EthereumAddress? {
26+
guard let publicKey = self.recoverPublicKey() else { return nil }
27+
return Utilities.publicToAddress(publicKey)
28+
}
2629

2730
public var from: EthereumAddress?
2831

‎Tests/web3swiftTests/localTests/LocalTestCase.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import web3swift
99
// while this class does show up in the navigator, it has no associated tests
1010
class LocalTestCase: XCTestCase {
1111

12-
static let url = URL(string: "http://127.0.0.1:8545")!
12+
static let url = URL(string: "http://localhost.proxyman.io:8545")!
1313

1414
override func setUp() async throws {
1515
let web3 = try! await Web3.new(LocalTestCase.url)

‎Tests/web3swiftTests/localTests/TransactionsTests.swift

Lines changed: 12 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -331,8 +331,7 @@ class TransactionsTests: XCTestCase {
331331
// check the hash, if they match everything was parsed, and re-encoded correctly
332332
XCTAssertEqual(jsonTxn.hash!.toHexString().addHexPrefix(), vector.hash, "Transaction Hash Mismatch")
333333
// check that we recovered the address correctly
334-
// FIXME: Return this
335-
// XCTAssertEqual(jsonTxn.sender!.address, expectedAddress.address, "Recovered Address Mismatch")
334+
XCTAssertEqual(jsonTxn.sender!.address, expectedAddress.address, "Recovered Address Mismatch")
336335
} catch {
337336
print(error)
338337
return XCTFail(String(describing: error))
@@ -354,8 +353,7 @@ class TransactionsTests: XCTestCase {
354353
// check the hash, if they match everything was parsed, and re-encoded correctly
355354
XCTAssertEqual(rlpTxn.hash!.toHexString().addHexPrefix(), vector.hash, "Transaction Hash Mismatch")
356355
// check that we recovered the address correctly
357-
// FIXME: return me back
358-
// XCTAssertEqual(rlpTxn.sender!.address, expectedAddress.address, "Recovered Address Mismatch")
356+
XCTAssertEqual(rlpTxn.sender!.address, expectedAddress.address, "Recovered Address Mismatch")
359357
}
360358

361359
// test signing a EIP-2930 transaction (without accessList)
@@ -381,8 +379,7 @@ class TransactionsTests: XCTestCase {
381379
// check the hash, if they match everything was parsed, and re-encoded correctly
382380
XCTAssertEqual(jsonTxn.hash!.toHexString().addHexPrefix(), vector.hash, "Transaction Hash Mismatch")
383381
// check that we recovered the address correctly
384-
// FIXME: return me back
385-
// XCTAssertEqual(jsonTxn.sender!.address, expectedAddress.address, "Recovered Address Mismatch")
382+
XCTAssertEqual(jsonTxn.sender!.address, expectedAddress.address, "Recovered Address Mismatch")
386383
} catch {
387384
print(error)
388385
return XCTFail(String(describing: error))
@@ -403,8 +400,7 @@ class TransactionsTests: XCTestCase {
403400
// check the hash, if they match everything was parsed, and re-encoded correctly
404401
XCTAssertEqual(jsonTxn.hash!.toHexString().addHexPrefix(), vector.hash, "Transaction Hash Mismatch")
405402
// check that we recovered the address correctly
406-
// FIXME: return me back
407-
// XCTAssertEqual(jsonTxn.sender!.address, expectedAddress.address, "Recovered Address Mismatch")
403+
XCTAssertEqual(jsonTxn.sender!.address, expectedAddress.address, "Recovered Address Mismatch")
408404
} catch {
409405
print(error)
410406
return XCTFail(String(describing: error))
@@ -426,8 +422,7 @@ class TransactionsTests: XCTestCase {
426422
// check the hash, if they match everything was parsed, and re-encoded correctly
427423
XCTAssertEqual(rlpTxn.hash!.toHexString().addHexPrefix(), vector.hash, "Transaction Hash Mismatch")
428424
// check that we recovered the address correctly
429-
// FIXME: return me back
430-
// XCTAssertEqual(rlpTxn.sender!.address, expectedAddress.address, "Recovered Address Mismatch")
425+
XCTAssertEqual(rlpTxn.sender!.address, expectedAddress.address, "Recovered Address Mismatch")
431426
}
432427

433428
// test signing a EIP-2930 transaction (with accessList)
@@ -453,8 +448,7 @@ class TransactionsTests: XCTestCase {
453448
// check the hash, if they match everything was parsed, and re-encoded correctly
454449
XCTAssertEqual(jsonTxn.hash!.toHexString().addHexPrefix(), vector.hash, "Transaction Hash Mismatch")
455450
// check that we recovered the address correctly
456-
// FIXME: return me back
457-
// XCTAssertEqual(jsonTxn.sender!.address, expectedAddress.address, "Recovered Address Mismatch")
451+
XCTAssertEqual(jsonTxn.sender!.address, expectedAddress.address, "Recovered Address Mismatch")
458452
} catch {
459453
print(error)
460454
return XCTFail(String(describing: error))
@@ -475,8 +469,7 @@ class TransactionsTests: XCTestCase {
475469
// check the hash, if they match everything was parsed, and re-encoded correctly
476470
XCTAssertEqual(jsonTxn.hash!.toHexString().addHexPrefix(), vector.hash, "Transaction Hash Mismatch")
477471
// check that we recovered the address correctly
478-
// FIXME: return me back
479-
// XCTAssertEqual(jsonTxn.sender!.address, expectedAddress.address, "Recovered Address Mismatch")
472+
XCTAssertEqual(jsonTxn.sender!.address, expectedAddress.address, "Recovered Address Mismatch")
480473
} catch {
481474
print(error)
482475
return XCTFail(String(describing: error))
@@ -498,8 +491,7 @@ class TransactionsTests: XCTestCase {
498491
// check the hash, if they match everything was parsed, and re-encoded correctly
499492
XCTAssertEqual(rlpTxn.hash!.toHexString().addHexPrefix(), vector.hash, "Transaction Hash Mismatch")
500493
// check that we recovered the address correctly
501-
// FIXME: return me back
502-
// XCTAssertEqual(rlpTxn.sender!.address, expectedAddress.address, "Recovered Address Mismatch")
494+
XCTAssertEqual(rlpTxn.sender!.address, expectedAddress.address, "Recovered Address Mismatch")
503495
}
504496

505497
// test signing a EIP-1559 transaction (without accessList)
@@ -525,8 +517,7 @@ class TransactionsTests: XCTestCase {
525517
// check the hash, if they match everything was parsed, and re-encoded correctly
526518
XCTAssertEqual(jsonTxn.hash!.toHexString().addHexPrefix(), vector.hash, "Transaction Hash Mismatch")
527519
// check that we recovered the address correctly
528-
// FIXME: return me back
529-
// XCTAssertEqual(jsonTxn.sender!.address, expectedAddress.address, "Recovered Address Mismatch")
520+
XCTAssertEqual(jsonTxn.sender!.address, expectedAddress.address, "Recovered Address Mismatch")
530521
} catch {
531522
print(error)
532523
return XCTFail(String(describing: error))
@@ -547,8 +538,7 @@ class TransactionsTests: XCTestCase {
547538
// check the hash, if they match everything was parsed, and re-encoded correctly
548539
XCTAssertEqual(jsonTxn.hash!.toHexString().addHexPrefix(), vector.hash, "Transaction Hash Mismatch")
549540
// check that we recovered the address correctly
550-
// FIXME: return me back
551-
// XCTAssertEqual(jsonTxn.sender!.address, expectedAddress.address, "Recovered Address Mismatch")
541+
XCTAssertEqual(jsonTxn.sender!.address, expectedAddress.address, "Recovered Address Mismatch")
552542
} catch {
553543
print(error)
554544
return XCTFail(String(describing: error))
@@ -570,8 +560,7 @@ class TransactionsTests: XCTestCase {
570560
// check the hash, if they match everything was parsed, and re-encoded correctly
571561
XCTAssertEqual(rlpTxn.hash!.toHexString().addHexPrefix(), vector.hash, "Transaction Hash Mismatch")
572562
// check that we recovered the address correctly
573-
// FIXME: return me back
574-
// XCTAssertEqual(rlpTxn.sender!.address, expectedAddress.address, "Recovered Address Mismatch")
563+
XCTAssertEqual(rlpTxn.sender!.address, expectedAddress.address, "Recovered Address Mismatch")
575564
}
576565

577566
// test signing a EIP-1559 transaction (with accessList)
@@ -597,8 +586,7 @@ class TransactionsTests: XCTestCase {
597586
// check the hash, if they match everything was parsed, and re-encoded correctly
598587
XCTAssertEqual(jsonTxn.hash!.toHexString().addHexPrefix(), vector.hash, "Transaction Hash Mismatch")
599588
// check that we recovered the address correctly
600-
// FIXME: return me back
601-
// XCTAssertEqual(jsonTxn.sender!.address, expectedAddress.address, "Recovered Address Mismatch")
589+
XCTAssertEqual(jsonTxn.sender!.address, expectedAddress.address, "Recovered Address Mismatch")
602590
} catch {
603591
print(error)
604592
return XCTFail(String(describing: error))

0 commit comments

Comments
 (0)