Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .claude/scheduled_tasks.lock
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{"sessionId":"996f4d40-c459-4d03-9332-e542939dda5e","pid":80414,"acquiredAt":1775073709302}
5 changes: 0 additions & 5 deletions .mocharc.json

This file was deleted.

9 changes: 0 additions & 9 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,26 +21,20 @@
"@nomiclabs/hardhat-ethers": "^2.0.4",
"@offchainlabs/l1-l3-teleport-contracts": "1.0.1",
"@typechain/ethers-v5": "9.0.0",
"@types/chai": "^4.2.11",
"@types/mocha": "^9.0.0",
"@types/prompts": "^2.0.14",
"@types/yargs": "^17.0.9",
"@typescript-eslint/eslint-plugin": "^5.14.0",
"@typescript-eslint/eslint-plugin-tslint": "^5.27.1",
"@typescript-eslint/parser": "^5.14.0",
"audit-ci": "^6.6.1",
"axios": "^1.13.5",
"chai": "^4.2.0",
"chalk": "^4.1.0",
"dotenv": "^10.0.0",
"eslint": "^7.32.0",
"eslint-config-prettier": "^8.3.0",
"eslint-plugin-mocha": "^9.0.0",
"eslint-plugin-prettier": "^4.0.0",
"ethers": "^5.0.0",
"hardhat": "^2.24.0",
"mocha": "^9.2.1",
"nyc": "^15.1.0",
"prettier": "^2.3.2",
"prettier-plugin-solidity": "^1.0.0-beta.17",
"prompts": "^2.4.2",
Expand Down Expand Up @@ -69,13 +63,10 @@
"**/patch-package/cross-spawn": "6.0.6",
"**/eslint/cross-spawn": "7.0.5",
"**/foreground-child/cross-spawn": "7.0.5",
"**/istanbul-lib-processinfo/cross-spawn": "7.0.5",
"**/istanbul-lib-instrument/@babel/core/@babel/helpers": "7.26.10",
"**/hardhat/undici": "5.29.0",
"**/chokidar/braces": "3.0.3",
"**/sol2uml/axios": "0.30.2",
"**/brace-expansion": "1.1.12",
"**/mocha/minimatch/brace-expansion": "2.0.2",
"**/convert-svg-core/glob/minimatch/brace-expansion": "2.0.2",
"**/eslint/js-yaml": "3.14.2",
"**/eslint/@eslint/eslintrc/js-yaml": "3.14.2",
Expand Down
44 changes: 22 additions & 22 deletions packages/ethers-viem-compat/tests/compatibility.test.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { expect } from 'chai'
import { describe, it, expect } from 'vitest'
import { BigNumber, providers } from 'ethers'
import { createPublicClient, defineChain, http, TransactionReceipt } from 'viem'
import { arbitrumSepolia, mainnet } from 'viem/chains'
Expand Down Expand Up @@ -30,10 +30,10 @@ describe('viem compatibility', () => {
})

const provider = publicClientToProvider(publicClient)
expect(provider).to.be.instanceOf(providers.StaticJsonRpcProvider)
expect(provider.network.chainId).to.equal(testChain.id)
expect(provider.network.name).to.equal(testChain.name)
expect(provider.connection.url).to.equal('https://example.com')
expect(provider).toBeInstanceOf(providers.StaticJsonRpcProvider)
expect(provider.network.chainId).toBe(testChain.id)
expect(provider.network.name).toBe(testChain.name)
expect(provider.connection.url).toBe('https://example.com')
})

it('successfully converts PublicClient to Provider', () => {
Expand All @@ -44,9 +44,9 @@ describe('viem compatibility', () => {

const provider = publicClientToProvider(publicClient)

expect(provider.network.chainId).to.equal(publicClient.chain!.id)
expect(provider.network.name).to.equal(publicClient.chain!.name)
expect(provider.connection.url).to.equal(
expect(provider.network.chainId).toBe(publicClient.chain!.id)
expect(provider.network.name).toBe(publicClient.chain!.name)
expect(provider.connection.url).toBe(
'https://sepolia-rollup.arbitrum.io/rpc'
)
})
Expand All @@ -59,9 +59,9 @@ describe('viem compatibility', () => {

const provider = publicClientToProvider(publicClient)

expect(provider.network.chainId).to.equal(publicClient.chain!.id)
expect(provider.network.name).to.equal(publicClient.chain!.name)
expect(provider.connection.url).to.equal(
expect(provider.network.chainId).toBe(publicClient.chain!.id)
expect(provider.network.name).toBe(publicClient.chain!.name)
expect(provider.connection.url).toBe(
'https://arbitrum-sepolia.gateway.tenderly.co'
)
})
Expand All @@ -73,7 +73,7 @@ describe('viem compatibility', () => {
transport,
})

expect(() => publicClientToProvider(publicClient)).to.throw(
expect(() => publicClientToProvider(publicClient)).toThrow(
'[publicClientToProvider] "chain" is undefined'
)
})
Expand Down Expand Up @@ -113,15 +113,15 @@ describe('viem compatibility', () => {
const ethersReceipt =
viemTransactionReceiptToEthersTransactionReceipt(viemReceipt)

expect(ethersReceipt.to).to.equal('0x1234')
expect(ethersReceipt.from).to.equal('0x5678')
expect(ethersReceipt.contractAddress).to.equal('0xabcd')
expect(ethersReceipt.transactionIndex).to.equal(1)
expect(ethersReceipt.gasUsed.eq(BigNumber.from(21000))).to.equal(true)
expect(ethersReceipt.blockNumber).to.equal(123)
expect(ethersReceipt.status).to.equal(1)
expect(ethersReceipt.logs[0].address).to.equal('0xcontract')
expect(ethersReceipt.byzantium).to.equal(true)
expect(ethersReceipt.to).toBe('0x1234')
expect(ethersReceipt.from).toBe('0x5678')
expect(ethersReceipt.contractAddress).toBe('0xabcd')
expect(ethersReceipt.transactionIndex).toBe(1)
expect(ethersReceipt.gasUsed.eq(BigNumber.from(21000))).toBe(true)
expect(ethersReceipt.blockNumber).toBe(123)
expect(ethersReceipt.status).toBe(1)
expect(ethersReceipt.logs[0].address).toBe('0xcontract')
expect(ethersReceipt.byzantium).toBe(true)
})

it('handles failed transaction status', () => {
Expand All @@ -144,7 +144,7 @@ describe('viem compatibility', () => {

const ethersReceipt =
viemTransactionReceiptToEthersTransactionReceipt(viemReceipt)
expect(ethersReceipt.status).to.equal(0)
expect(ethersReceipt.status).toBe(0)
})
})
})
6 changes: 2 additions & 4 deletions packages/sdk/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -32,12 +32,10 @@
"prebuild": "yarn gen:abi",
"build": "rm -rf dist && tsc -p tsconfig.json",
"watch": "tsc --watch",
"test": "mocha",
"test:coverage": "nyc mocha",
"test": "vitest run --config ../../vitest.config.ts",
"test:fork": "SHOULD_FORK=1 hardhat test tests/fork/*.test.ts",
"test:integration": "mocha tests/integration/ --timeout 30000000 --bail",
"test:integration": "vitest run --config ../../vitest.config.ts tests/integration --test-timeout 30000000 --bail 1 --fileParallelism=false",
"test:unit": "vitest run --config ../../vitest.config.ts tests/unit",
"test:ci": "nyc --reporter=lcovonly mocha --reporter xunit",
"lint": "eslint .",
"format": "prettier './**/*.{js,json,md,ts,yml}' '!./src/lib/abi' --write && yarn run lint --fix",
"clean:compile": "ts-node scripts/cleanCompileContracts.ts",
Expand Down
16 changes: 8 additions & 8 deletions packages/sdk/tests/fork/inbox.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
/* eslint-env node */
'use strict'

import { expect } from 'chai'
import { describe, it, expect, beforeAll, beforeEach } from 'vitest'

import { BigNumber } from '@ethersproject/bignumber'
import { Logger, LogLevel } from '@ethersproject/logger'
Expand Down Expand Up @@ -90,7 +90,7 @@ describe('Inbox tools', () => {

let forkBlockNumber: number
let forkProviderUrl: string
before(async () => {
beforeAll(async () => {
const { l1Provider } = await setup()
forkBlockNumber = await l1Provider.getBlockNumber()
forkProviderUrl = 'http://localhost:8545'
Expand Down Expand Up @@ -132,12 +132,12 @@ describe('Inbox tools', () => {

const forceInclusionTx = await inboxTools.forceInclude()

expect(forceInclusionTx, 'Null force inclusion').to.not.be.null
expect(forceInclusionTx, 'Null force inclusion').not.toBeNull()
await forceInclusionTx!.wait()

const messagesReadAfter = await sequencerInbox.totalDelayedMessagesRead()

expect(messagesReadAfter.toNumber(), 'Message not read').to.eq(
expect(messagesReadAfter.toNumber(), 'Message not read').toBe(
startInboxLength.add(1).toNumber()
)
})
Expand Down Expand Up @@ -178,11 +178,11 @@ describe('Inbox tools', () => {
const inboxTools = new InboxTools(l1Signer, l2Network)
const forceInclusionTx = await inboxTools.forceInclude()

expect(forceInclusionTx, 'Null force inclusion').to.not.be.null
expect(forceInclusionTx, 'Null force inclusion').not.toBeNull()
await forceInclusionTx!.wait()

const messagesReadAfter = await sequencerInbox.totalDelayedMessagesRead()
expect(messagesReadAfter.toNumber(), 'Message not read').to.eq(
expect(messagesReadAfter.toNumber(), 'Message not read').toBe(
startInboxLength.add(2).toNumber()
)
})
Expand Down Expand Up @@ -229,7 +229,7 @@ describe('Inbox tools', () => {
await mineBlocks(6600, block.timestamp)

const event = await inboxTools.getForceIncludableEvent()
expect(event?.event.messageDataHash, 'Invalid message hash.').to.eq(
expect(event?.event.messageDataHash, 'Invalid message hash.').toBe(
messageDataHash
)
})
Expand All @@ -239,7 +239,7 @@ describe('Inbox tools', () => {
const inboxTools = new InboxTools(l1Signer, l2Network)

const event = await inboxTools.getForceIncludableEvent()
expect(event, 'Event not null').to.be.null
expect(event, 'Event not null').toBeNull()
})

const mineBlocks = async (
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
/* eslint-env node */
'use strict'

import { expect } from 'chai'
import { describe, it, beforeEach, expect } from 'vitest'

import {
fundParentSigner,
Expand Down Expand Up @@ -60,7 +60,7 @@ async function waitForL1BatchConfirmations(
}

describe('ArbProvider', () => {
beforeEach('skipIfMainnet', async function () {
beforeEach(async function () {
await skipIfMainnet(this)
})

Expand Down Expand Up @@ -109,7 +109,7 @@ describe('ArbProvider', () => {
60_000
)

expect(l1BatchConfirmations, 'missing confirmations').to.be.gt(0)
expect(l1BatchConfirmations, 'missing confirmations').toBeGreaterThan(0)

if (l1BatchConfirmations > 8) {
break
Expand Down
Loading
Loading