Skip to content
Draft
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
5 changes: 1 addition & 4 deletions packages/sdk/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -49,10 +49,7 @@
"bridgeStandardToken": "ts-node scripts/deployStandard.ts"
},
"dependencies": {
"@ethersproject/address": "^5.0.8",
"@ethersproject/bignumber": "^5.1.1",
"@ethersproject/bytes": "^5.0.8",
"async-mutex": "^0.4.0",
"ethers": "^5.1.0"
"ethers": "^5.8.0"
}
}
4 changes: 3 additions & 1 deletion packages/sdk/src/lib/dataEntities/address.ts
Original file line number Diff line number Diff line change
@@ -1,8 +1,10 @@
import { getAddress } from '@ethersproject/address'
import { utils } from 'ethers'

import { ADDRESS_ALIAS_OFFSET } from './constants'
import { ArbSdkError } from './errors'

const { getAddress } = utils

/**
* Ethereum/Arbitrum address class
*/
Expand Down
2 changes: 1 addition & 1 deletion packages/sdk/src/lib/dataEntities/message.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { BigNumber } from '@ethersproject/bignumber'
import { BigNumber } from 'ethers'

/**
* The components of a submit retryable message. Can be parsed from the
Expand Down
3 changes: 1 addition & 2 deletions packages/sdk/src/lib/message/ChildToParentMessage.ts
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,9 @@

import { Provider } from '@ethersproject/abstract-provider'
import { Signer } from '@ethersproject/abstract-signer'
import { BigNumber } from '@ethersproject/bignumber'
import { BlockTag } from '@ethersproject/abstract-provider'

import { ContractTransaction, Overrides } from 'ethers'
import { ContractTransaction, Overrides, BigNumber } from 'ethers'
import {
SignerProviderUtils,
SignerOrProvider,
Expand Down
3 changes: 1 addition & 2 deletions packages/sdk/src/lib/message/ChildToParentMessageClassic.ts
Original file line number Diff line number Diff line change
Expand Up @@ -22,15 +22,14 @@ import {
} from '../dataEntities/constants'
import { Provider } from '@ethersproject/abstract-provider'
import { Signer } from '@ethersproject/abstract-signer'
import { BigNumber } from '@ethersproject/bignumber'
import { BlockTag } from '@ethersproject/abstract-provider'

import { ArbSys__factory } from '../abi/factories/ArbSys__factory'
import { Outbox__factory } from '../abi/classic/factories/Outbox__factory'

import { NodeInterface__factory } from '../abi/factories/NodeInterface__factory'
import { L2ToL1TransactionEvent as ChildToParentTransactionEvent } from '../abi/ArbSys'
import { ContractTransaction, Overrides } from 'ethers'
import { ContractTransaction, Overrides, BigNumber } from 'ethers'
import { EventFetcher } from '../utils/eventFetcher'
import {
SignerProviderUtils,
Expand Down
3 changes: 1 addition & 2 deletions packages/sdk/src/lib/message/ChildToParentMessageNitro.ts
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@ import {
} from '../dataEntities/constants'
import { Provider } from '@ethersproject/abstract-provider'
import { Signer } from '@ethersproject/abstract-signer'
import { BigNumber } from '@ethersproject/bignumber'
import { BlockTag } from '@ethersproject/abstract-provider'
import { ErrorCode, Logger } from '@ethersproject/logger'

Expand All @@ -33,7 +32,7 @@ import { Outbox__factory } from '../abi/factories/Outbox__factory'
import { NodeInterface__factory } from '../abi/factories/NodeInterface__factory'

import { L2ToL1TxEvent as ChildToParentTxEvent } from '../abi/ArbSys'
import { ContractTransaction, Overrides } from 'ethers'
import { ContractTransaction, Overrides, BigNumber } from 'ethers'
import { Mutex } from 'async-mutex'
import { EventFetcher, FetchedEvent } from '../utils/eventFetcher'
import { ArbSdkError } from '../dataEntities/errors'
Expand Down
3 changes: 1 addition & 2 deletions packages/sdk/src/lib/message/ChildTransaction.ts
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,8 @@
'use strict'

import { TransactionReceipt } from '@ethersproject/providers'
import { BigNumber } from '@ethersproject/bignumber'
import { Log } from '@ethersproject/abstract-provider'
import { ContractTransaction, providers } from 'ethers'
import { ContractTransaction, providers, BigNumber } from 'ethers'
import {
SignerProviderUtils,
SignerOrProvider,
Expand Down
7 changes: 3 additions & 4 deletions packages/sdk/src/lib/message/ParentToChildMessage.ts
Original file line number Diff line number Diff line change
Expand Up @@ -16,13 +16,11 @@
/* eslint-env node */
'use strict'

import { ethers, utils, Overrides, BigNumber } from 'ethers'
import { TransactionReceipt } from '@ethersproject/providers'
import { Provider } from '@ethersproject/abstract-provider'
import { Signer } from '@ethersproject/abstract-signer'
import { ContractTransaction } from '@ethersproject/contracts'
import { BigNumber } from '@ethersproject/bignumber'
import { concat, zeroPad } from '@ethersproject/bytes'
import { getAddress } from '@ethersproject/address'
import { keccak256 } from '@ethersproject/keccak256'

import { ArbRetryableTx__factory } from '../abi/factories/ArbRetryableTx__factory'
Expand All @@ -36,14 +34,15 @@ import {
SignerOrProvider,
} from '../dataEntities/signerOrProvider'
import { ArbSdkError } from '../dataEntities/errors'
import { ethers, Overrides } from 'ethers'
import { ChildTransactionReceipt, RedeemTransaction } from './ChildTransaction'
import { RetryableMessageParams } from '../dataEntities/message'
import { getTransactionReceipt, isDefined } from '../utils/lib'
import { EventFetcher } from '../utils/eventFetcher'
import { ErrorCode, Logger } from '@ethersproject/logger'
import { getArbitrumNetwork } from '../dataEntities/networks'

const { getAddress, concat, zeroPad } = utils

export enum ParentToChildMessageStatus {
/**
* The retryable ticket has yet to be created
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
import { Provider } from '@ethersproject/abstract-provider'
import { BigNumber, BigNumberish } from '@ethersproject/bignumber'
import { BytesLike, constants, utils } from 'ethers'
import { BytesLike, constants, utils, BigNumber, BigNumberish } from 'ethers'
import { Inbox__factory } from '../abi/factories/Inbox__factory'
import { NodeInterface__factory } from '../abi/factories/NodeInterface__factory'
import { NODE_INTERFACE_ADDRESS } from '../dataEntities/constants'
Expand Down
2 changes: 1 addition & 1 deletion packages/sdk/src/lib/message/ParentTransaction.ts
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,10 @@
/* eslint-env node */
'use strict'

import { BigNumber } from 'ethers'
import { TransactionReceipt } from '@ethersproject/providers'
import { Log, Provider } from '@ethersproject/abstract-provider'
import { ContractTransaction } from '@ethersproject/contracts'
import { BigNumber } from '@ethersproject/bignumber'
import {
ParentToChildMessage,
ParentToChildMessageReaderOrWriter,
Expand Down
6 changes: 3 additions & 3 deletions packages/sdk/src/lib/message/messageDataParser.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { getAddress } from '@ethersproject/address'
import { BigNumber, utils } from 'ethers'
import { defaultAbiCoder } from '@ethersproject/abi'
import { BigNumber } from '@ethersproject/bignumber'
import { hexZeroPad } from '@ethersproject/bytes'

const { getAddress, hexZeroPad } = utils

export class SubmitRetryableMessageDataParser {
/**
Expand Down
8 changes: 4 additions & 4 deletions packages/sdk/src/lib/utils/byte_serialize_params.ts
Original file line number Diff line number Diff line change
Expand Up @@ -46,11 +46,9 @@ Arbitrum SDK includes methods for [serializing parameters](https://developer.off
* @module Byte-Serialization
*/

import { BigNumber, utils } from 'ethers'
import { Provider } from '@ethersproject/abstract-provider'
import { Signer } from '@ethersproject/abstract-signer'
import { isAddress as _isAddress } from '@ethersproject/address'
import { concat, hexZeroPad } from '@ethersproject/bytes'
import { BigNumber } from '@ethersproject/bignumber'

import { ArbAddressTable__factory } from '../abi/factories/ArbAddressTable__factory'
import { ArbAddressTable } from '../abi/ArbAddressTable'
Expand All @@ -66,6 +64,8 @@ interface AddressIndexMemo {
[address: string]: number
}

const { isAddress: _isAddress, concat, hexZeroPad } = utils

export const getAddressIndex = (() => {
const addressToIndexMemo: AddressIndexMemo = {}
let arbAddressTable: ArbAddressTable | undefined
Expand Down Expand Up @@ -93,7 +93,7 @@ export const getAddressIndex = (() => {

/**
to use:

```js
const mySerializeParamsFunction = argSerializerConstructor("rpcurl")
mySerializeParamsFunction(["4","5", "6"])
Expand Down
9 changes: 4 additions & 5 deletions packages/sdk/tests/fork/inbox.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,10 @@
/* eslint-env node */
'use strict'

import { BigNumber, utils, ContractTransaction, Signer } from 'ethers'
import { ethers, network } from 'hardhat'
import { expect } from 'chai'

import { BigNumber } from '@ethersproject/bignumber'
import { Logger, LogLevel } from '@ethersproject/logger'
Logger.setLogLevel(LogLevel.ERROR)

Expand All @@ -28,14 +29,12 @@ import { SequencerInbox__factory } from '../../src/lib/abi/factories/SequencerIn

import { InboxTools } from '../../src'

import { ethers, network } from 'hardhat'
import { hexZeroPad } from '@ethersproject/bytes'
import {
ArbitrumNetwork,
getArbitrumNetwork,
} from '../../src/lib/dataEntities/networks'
import { solidityKeccak256 } from 'ethers/lib/utils'
import { ContractTransaction, Signer } from 'ethers'

const { solidityKeccak256, hexZeroPad } = utils

const submitL2Tx = async (
tx: {
Expand Down
3 changes: 1 addition & 2 deletions packages/sdk/tests/integration/customerc20.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,7 @@
'use strict'

import { expect } from 'chai'
import { Signer, Wallet, constants, utils } from 'ethers'
import { BigNumber } from '@ethersproject/bignumber'
import { Signer, Wallet, constants, utils, BigNumber } from 'ethers'
import { Logger, LogLevel } from '@ethersproject/logger'
Logger.setLogLevel(LogLevel.ERROR)
import { L1CustomGateway__factory } from '../../src/lib/abi/factories/L1CustomGateway__factory'
Expand Down
10 changes: 6 additions & 4 deletions packages/sdk/tests/integration/retryableData.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -17,14 +17,14 @@
'use strict'

import { assert, expect } from 'chai'
import { BigNumber } from '@ethersproject/bignumber'
import { hexlify } from '@ethersproject/bytes'
import { Wallet, BigNumber, utils } from 'ethers'

import { TestERC20__factory } from '../../src/lib/abi/factories/TestERC20__factory'
import { fundParentSigner, skipIfMainnet } from './testHelpers'
import { RetryableDataTools } from '../../src'
import { Wallet } from 'ethers'

import { testSetup } from '../testSetup'
import { parseEther, randomBytes } from 'ethers/lib/utils'

import { Inbox__factory } from '../../src/lib/abi/factories/Inbox__factory'
import { GasOverrides } from '../../src/lib/message/ParentToChildMessageGasEstimator'
const depositAmount = BigNumber.from(100)
Expand All @@ -35,6 +35,8 @@ import {
scaleFrom18DecimalsToNativeTokenDecimals,
} from '../../src/lib/utils/lib'

const { hexlify, parseEther, randomBytes } = utils

describe('RevertData', () => {
beforeEach('skipIfMainnet', async function () {
await skipIfMainnet(this)
Expand Down
3 changes: 1 addition & 2 deletions packages/sdk/tests/integration/standarderc20.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,7 @@
'use strict'

import { expect } from 'chai'
import { Wallet, utils, constants } from 'ethers'
import { BigNumber } from '@ethersproject/bignumber'
import { Wallet, utils, constants, BigNumber } from 'ethers'
import { TestERC20__factory } from '../../src/lib/abi/factories/TestERC20__factory'
import {
fundParentSigner,
Expand Down
3 changes: 1 addition & 2 deletions packages/sdk/tests/integration/testHelpers.ts
Original file line number Diff line number Diff line change
Expand Up @@ -19,13 +19,12 @@
import { expect } from 'chai'
import chalk from 'chalk'

import { BigNumber } from '@ethersproject/bignumber'
import { JsonRpcProvider } from '@ethersproject/providers'
import { parseEther } from 'ethers/lib/utils'

import { config, getSigner, testSetup } from '../testSetup'

import { Signer, Wallet } from 'ethers'
import { Signer, Wallet, BigNumber } from 'ethers'
import { Erc20Bridger, ChildToParentMessageStatus } from '../../src'
import { ParentToChildMessageStatus } from '../../src/lib/message/ParentToChildMessage'
import {
Expand Down
7 changes: 4 additions & 3 deletions packages/sdk/tests/unit/addressAlias.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -16,16 +16,17 @@
/* eslint-env node */
'use strict'

import { utils, BigNumber } from 'ethers'
import { expect } from 'chai'

import { Address } from '../../src/lib/dataEntities/address'
import { BigNumber } from 'ethers'
import { ADDRESS_ALIAS_OFFSET } from '../../src/lib/dataEntities/constants'
import { hexZeroPad } from '@ethersproject/bytes'
import { getAddress } from '@ethersproject/address'

const offset = BigNumber.from(ADDRESS_ALIAS_OFFSET)
const maxAddr = BigNumber.from('0xffffffffffffffffffffffffffffffffffffffff')

const { getAddress, hexZeroPad } = utils

describe('Address', () => {
const testApplyUndo = (
addr: string,
Expand Down
Loading
Loading