Skip to content

Commit c013867

Browse files
DarthMikeDarthMike
authored
Merge pull request #356 from argentlabs/sepolia-migration
Sepolia migration
2 parents c7a0348 + 6661536 commit c013867

29 files changed

+493
-419
lines changed

‎.github/workflows/CI.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ jobs:
4545
runs-on: ubuntu-latest
4646

4747
container:
48-
image: swift:5.7-bionic
48+
image: swift:5.9-jammy
4949

5050
env:
5151
TESTS_PRIVATEKEY: ${{ secrets.TESTS_PRIVATEKEY }}

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ OR
5050

5151
`EthereumWebSocketClient`
5252
```swift
53-
guard let clientUrl = URL(string: "wss://goerli.infura.io/ws/v3//123") else { return }
53+
guard let clientUrl = URL(string: "wss://sepolia.infura.io/ws/v3//123") else { return }
5454
let client = EthereumWebSocketClient(url: clientUrl)
5555
```
5656

‎web3sTests/Client/EthereumClientTests.swift‎

Lines changed: 34 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ class EthereumClientTests: XCTestCase {
8080
func testNetVersion() async {
8181
do {
8282
let network = try await client?.net_version()
83-
XCTAssertEqual(network, EthereumNetwork.goerli, "Network incorrect")
83+
XCTAssertEqual(network, EthereumNetwork.sepolia, "Network incorrect")
8484
} catch {
8585
XCTFail("Expected network but failed \(error).")
8686
}
@@ -116,7 +116,7 @@ class EthereumClientTests: XCTestCase {
116116
func testEthSendRawTransaction() async {
117117
do {
118118
let gasPrice = try await client?.eth_gasPrice()
119-
let tx = EthereumTransaction(from: nil, to: "0x3c1bd6b420448cf16a389c8b0115ccb3660bb854", value: BigUInt(1), data: nil, nonce: 2, gasPrice: gasPrice ?? BigUInt(9000000), gasLimit: BigUInt(30000), chainId: EthereumNetwork.goerli.intValue)
119+
let tx = EthereumTransaction(from: nil, to: "0x3c1bd6b420448cf16a389c8b0115ccb3660bb854", value: BigUInt(1), data: nil, nonce: 2, gasPrice: gasPrice ?? BigUInt(9000000), gasLimit: BigUInt(30000), chainId: EthereumNetwork.sepolia.intValue)
120120

121121
let txHash = try await client?.eth_sendRawTransaction(tx, withAccount: account!)
122122
XCTAssertNotNil(txHash, "No tx hash, ensure key is valid in TestConfig.swift")
@@ -127,7 +127,7 @@ class EthereumClientTests: XCTestCase {
127127

128128
func testEthGetTransactionReceipt() async {
129129
do {
130-
let txHash = "0x706bbe6f2593235942b8e76c2f37af3824d47a64caf65f7ae5e0c5ee1e886132"
130+
let txHash = "0x058af59b2de40c8f745bc8baf403f54b1f7c3a502aff26d36ad3f174649ded1b"
131131
let receipt = try await client?.eth_getTransactionReceipt(txHash: txHash)
132132
XCTAssertNotNil(receipt, "Transaction receipt not available")
133133
} catch {
@@ -137,7 +137,7 @@ class EthereumClientTests: XCTestCase {
137137

138138
func testEthCall() async {
139139
do {
140-
let tx = EthereumTransaction(from: nil, to: "0x3c1bd6b420448cf16a389c8b0115ccb3660bb854", value: BigUInt(1800000), data: nil, nonce: 2, gasPrice: BigUInt(400000), gasLimit: BigUInt(50000), chainId: EthereumNetwork.goerli.intValue)
140+
let tx = EthereumTransaction(from: nil, to: "0x3c1bd6b420448cf16a389c8b0115ccb3660bb854", value: BigUInt(1800000), data: nil, nonce: 2, gasPrice: BigUInt(400000), gasLimit: BigUInt(50000), chainId: EthereumNetwork.sepolia.intValue)
141141
let txHash = try await client?.eth_call(tx, block: .Latest)
142142
XCTAssertNotNil(txHash, "Transaction hash not available")
143143
} catch {
@@ -156,8 +156,8 @@ class EthereumClientTests: XCTestCase {
156156

157157
func testOrTopicsEthGetLogs() async {
158158
do {
159-
let logs = try await client?.eth_getLogs(addresses: nil, orTopics: [["0x8c5be1e5ebec7d5bd14f71427d1e84f3dd0314c0f7b2291e5b200ac8c7c3b925", "0xddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef"], ["0x000000000000000000000000377f56d089c7e0b7e18865e6e3f0c14feb55bf36"]], fromBlock: .Number(8012709), toBlock: .Number(8012709))
160-
XCTAssertEqual(logs?.count, 15)
159+
let logs = try await client?.eth_getLogs(addresses: nil, orTopics: [["0x8c5be1e5ebec7d5bd14f71427d1e84f3dd0314c0f7b2291e5b200ac8c7c3b925", "0xddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef"], ["0x00000000000000000000000061CA935f8b7847C4a1275814d8D88CDa8d406CC9"]], fromBlock: .Number(4902849), toBlock: .Number(4902849))
160+
XCTAssertEqual(logs?.count, 1)
161161
XCTAssertNotNil(logs, "Logs not available")
162162
} catch {
163163
XCTFail("Expected logs but failed \(error).")
@@ -167,7 +167,7 @@ class EthereumClientTests: XCTestCase {
167167
func testGivenGenesisBlock_ThenReturnsByNumber() async {
168168
do {
169169
let block = try await client?.eth_getBlockByNumber(.Number(0))
170-
XCTAssertEqual(block?.timestamp.timeIntervalSince1970, 1548854791)
170+
XCTAssertEqual(block?.timestamp.timeIntervalSince1970, 1633267481)
171171
XCTAssertEqual(block?.transactions.count, 0)
172172
XCTAssertEqual(block?.number, .Number(0))
173173
} catch {
@@ -186,11 +186,11 @@ class EthereumClientTests: XCTestCase {
186186

187187
func testGivenExistingBlock_ThenGetsBlockByNumber() async {
188188
do {
189-
let block = try await client?.eth_getBlockByNumber(.Number(8006312))
190-
XCTAssertEqual(block?.number, .Number(8006312))
191-
XCTAssertEqual(block?.timestamp.timeIntervalSince1970, 1669224864)
192-
XCTAssertEqual(block?.transactions.count, 53)
193-
XCTAssertEqual(block?.transactions.first, "0xd6b8256322a91ea138afa16181c61040381ca713c56ca7046dcbbd832ed71386")
189+
let block = try await client?.eth_getBlockByNumber(.Number(4892410))
190+
XCTAssertEqual(block?.number, .Number(4892410))
191+
XCTAssertEqual(block?.timestamp.timeIntervalSince1970, 1702659468)
192+
XCTAssertEqual(block?.transactions.count, 155)
193+
XCTAssertEqual(block?.transactions.first, "0x3584af370197e447cd4d9163194dd41910741ded549550c47aace44eea6cf910")
194194
} catch {
195195
XCTFail("Expected block but failed \(error).")
196196
}
@@ -207,15 +207,15 @@ class EthereumClientTests: XCTestCase {
207207

208208
func testGivenMinedTransactionHash_ThenGetsTransactionByHash() async {
209209
do {
210-
let transaction = try await client?.eth_getTransaction(byHash: "0x706bbe6f2593235942b8e76c2f37af3824d47a64caf65f7ae5e0c5ee1e886132")
211-
XCTAssertEqual(transaction?.from, "0x64d0ea4fc60f27e74f1a70aa6f39d403bbe56793")
212-
XCTAssertEqual(transaction?.to, "0x1f9840a85d5af5bf1d1762f925bdaddc4201f984")
213-
XCTAssertEqual(transaction?.gas, "85773")
214-
XCTAssertEqual(transaction?.gasPrice, BigUInt(14300000000))
215-
XCTAssertEqual(transaction?.nonce, 23)
216-
XCTAssertEqual(transaction?.value, 0)
217-
XCTAssertEqual(transaction?.blockNumber, EthereumBlock.Number(8006312))
218-
XCTAssertEqual(transaction?.hash?.web3.hexString, "0x706bbe6f2593235942b8e76c2f37af3824d47a64caf65f7ae5e0c5ee1e886132")
210+
let transaction = try await client?.eth_getTransaction(byHash: "0x058af59b2de40c8f745bc8baf403f54b1f7c3a502aff26d36ad3f174649ded1b")
211+
XCTAssertEqual(transaction?.from, "0x1E2cD78882b12d3954a049Fd82FFD691565dC0A5")
212+
XCTAssertEqual(transaction?.to, "0x9b7E335088762aD8061C04D08C37902ABC8ACb87")
213+
XCTAssertEqual(transaction?.gas, "21000")
214+
XCTAssertEqual(transaction?.gasPrice, BigUInt(19635664880))
215+
XCTAssertEqual(transaction?.nonce, 181635)
216+
XCTAssertEqual(transaction?.value, 542261709133544904)
217+
XCTAssertEqual(transaction?.blockNumber, EthereumBlock.Number(4892410))
218+
XCTAssertEqual(transaction?.hash?.web3.hexString, "0x058af59b2de40c8f745bc8baf403f54b1f7c3a502aff26d36ad3f174649ded1b")
219219
} catch {
220220
XCTFail("Expected transaction but failed \(error).")
221221
}
@@ -241,8 +241,8 @@ class EthereumClientTests: XCTestCase {
241241
fromBlock: .Earliest,
242242
toBlock: .Latest,
243243
eventTypes: [ERC20Events.Transfer.self])
244-
XCTAssertEqual(eventsResult?.events.count, 3)
245244
XCTAssertEqual(eventsResult?.logs.count, 4)
245+
XCTAssertEqual(eventsResult?.events.count, 5)
246246
} catch {
247247
XCTFail("Expected events but failed \(error).")
248248
}
@@ -257,8 +257,8 @@ class EthereumClientTests: XCTestCase {
257257
fromBlock: .Earliest,
258258
toBlock: .Latest,
259259
eventTypes: [ERC20Events.Transfer.self, TransferMatchingSignatureEvent.self])
260-
XCTAssertEqual(eventsResult?.events.count, 6)
261260
XCTAssertEqual(eventsResult?.logs.count, 8)
261+
XCTAssertEqual(eventsResult?.events.count, 10)
262262
} catch {
263263
XCTFail("Expected events but failed \(error).")
264264
}
@@ -268,16 +268,16 @@ class EthereumClientTests: XCTestCase {
268268
do {
269269
let to = try! ABIEncoder.encodeRaw("0x162142f0508F557C02bEB7C473682D7C91Bcef41", forType: ABIRawType.FixedAddress)
270270
let filters = [
271-
EventFilter(type: ERC20Events.Transfer.self, allowedSenders: ["0x0C45dd4A3DEcb146F3ae0d82b1151AdEEEfA73cD"])
271+
EventFilter(type: ERC20Events.Transfer.self, allowedSenders: ["0xF31B086459C2cdaC006Feedd9080223964a9cDdB"])
272272
]
273273

274274
let eventsResult = try await client?.getEvents(addresses: nil,
275275
topics: [try! ERC20Events.Transfer.signature(), nil, to.hexString, nil],
276276
fromBlock: .Earliest,
277277
toBlock: .Latest,
278278
matching: filters)
279-
XCTAssertEqual(eventsResult?.events.count, 1)
280-
XCTAssertEqual(eventsResult?.logs.count, 6)
279+
XCTAssertEqual(eventsResult?.logs.count, 7)
280+
XCTAssertEqual(eventsResult?.events.count, 2)
281281
} catch {
282282
XCTFail("Expected events but failed \(error).")
283283
}
@@ -287,17 +287,17 @@ class EthereumClientTests: XCTestCase {
287287
do {
288288
let to = try! ABIEncoder.encode(EthereumAddress("0x64d0eA4FC60f27E74f1a70Aa6f39D403bBe56793"))
289289
let filters = [
290-
EventFilter(type: ERC20Events.Transfer.self, allowedSenders: ["0x0C45dd4A3DEcb146F3ae0d82b1151AdEEEfA73cD"]),
291-
EventFilter(type: TransferMatchingSignatureEvent.self, allowedSenders: ["0x162142f0508F557C02bEB7C473682D7C91Bcef41"])
290+
EventFilter(type: ERC20Events.Transfer.self, allowedSenders: ["0xF31B086459C2cdaC006Feedd9080223964a9cDdB"]),
291+
EventFilter(type: TransferMatchingSignatureEvent.self, allowedSenders: ["0xB2a6874c2F71fD4481674BaC945D5407A2318b3E"])
292292
]
293293

294294
let eventsResult = try await client?.getEvents(addresses: nil,
295295
topics: [try! ERC20Events.Transfer.signature(), nil, to.hexString, nil],
296296
fromBlock: .Earliest,
297297
toBlock: .Latest,
298298
matching: filters)
299-
XCTAssertEqual(eventsResult?.events.count, 1)
300-
XCTAssertEqual(eventsResult?.logs.count, 27)
299+
XCTAssertEqual(eventsResult?.logs.count, 16)
300+
XCTAssertEqual(eventsResult?.events.count, 6)
301301
} catch {
302302
XCTFail("Expected events but failed \(error).")
303303
}
@@ -366,8 +366,8 @@ class EthereumClientTests: XCTestCase {
366366

367367
struct GetDynamicArray: ABIFunction {
368368
static let name = "getDynamicArray"
369-
let contract: EthereumAddress = "0xD5017917007D588dD5f9Dd5d260a0d72E7C3Ee25"
370-
let from: EthereumAddress? = "0xD5017917007D588dD5f9Dd5d260a0d72E7C3Ee25"
369+
let contract: EthereumAddress = "0x47780bc6093413B52014777F26b2BBb401d85243"
370+
let from: EthereumAddress? = "0x47780bc6093413B52014777F26b2BBb401d85243"
371371
let gasPrice: BigUInt? = nil
372372
let gasLimit: BigUInt? = nil
373373

@@ -410,8 +410,8 @@ struct TransferToken: ABIFunction {
410410

411411
struct InvalidMethodA: ABIFunction {
412412
static let name = "invalidMethodCallBoolResponse"
413-
let contract: EthereumAddress = "0x72602FE1F2CaBAbCfFB51eb84741AFaE04AF10ca"
414-
let from: EthereumAddress? = "0x72602FE1F2CaBAbCfFB51eb84741AFaE04AF10ca"
413+
let contract: EthereumAddress = "0x47780bc6093413B52014777F26b2BBb401d85243"
414+
let from: EthereumAddress? = "0x47780bc6093413B52014777F26b2BBb401d85243"
415415
let gasPrice: BigUInt? = nil
416416
let gasLimit: BigUInt? = nil
417417

‎web3sTests/Contract/ABIEventTests.swift‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@ class ABIEventTests: XCTestCase {
2121

2222
let eventsResult = try await client.getEvents(addresses: nil,
2323
topics: [try? AddressAndData4Event.signature(), String(hexFromBytes: encodedAddress), nil],
24-
fromBlock: .Number(8017312 ),
25-
toBlock: .Number(8017312 ),
24+
fromBlock: .Number(4916814 ),
25+
toBlock: .Number(4916814 ),
2626
eventTypes: [AddressAndData4Event.self])
2727

2828
let eventFirst = eventsResult.events.first as? AddressAndData4Event
@@ -42,9 +42,9 @@ class ABIEventTests: XCTestCase {
4242
let eventsResult = try await client.getEvents(addresses: nil,
4343
topics: [try? AddressAndData32Event.signature()],
4444
fromBlock: .Number(
45-
8017318 ),
45+
4916812 ),
4646
toBlock: .Number(
47-
8017318 ),
47+
4916812 ),
4848
eventTypes: [AddressAndData32Event.self])
4949

5050
XCTAssertEqual(eventsResult.events.count, 1)

0 commit comments

Comments
 (0)