Skip to content

Commit

Permalink
yes lets goo
Browse files Browse the repository at this point in the history
  • Loading branch information
aaronmgdr committed Dec 17, 2024
1 parent 1705f80 commit 5572478
Show file tree
Hide file tree
Showing 18 changed files with 22 additions and 69 deletions.
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@
"tsconfig-paths": "^4.2.0",
"typedoc": "^0.27.5",
"typedoc-plugin-markdown": "^4.3.2",
"typescript": "5.7.2"
"typescript": "5.3.3"
},
"resolutions": {
"ganache": "npm:@celo/[email protected]",
Expand Down
2 changes: 0 additions & 2 deletions packages/cli/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -73,9 +73,7 @@
"ethers": "5",
"fs-extra": "^8.1.0",
"humanize-duration": "^3.32.1",
"path": "^0.12.7",
"prompts": "^2.0.1",
"randombytes": "^2.0.1",
"web3": "1.10.4",
"web3-utils": "^1.10.4"
},
Expand Down
2 changes: 1 addition & 1 deletion packages/cli/src/commands/governance/execute-l2.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import {
} from '@celo/dev-utils/lib/anvil-test'
import { timeTravel } from '@celo/dev-utils/lib/ganache-test'
import fs from 'fs'
import path from 'path'
import path from 'node:path'
import Web3 from 'web3'
import { stripAnsiCodesAndTxHashes, testLocallyWithWeb3Node } from '../../test-utils/cliUtils'
import Execute from './execute'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import {
withImpersonatedAccount,
} from '@celo/dev-utils/lib/anvil-test'
import fs from 'fs'
import path from 'path'
import path from 'node:path'
import Web3 from 'web3'
import { AbiItem, PROXY_ADMIN_ADDRESS } from '../../../../sdk/connect/lib'
import {
Expand Down
2 changes: 1 addition & 1 deletion packages/cli/src/commands/governance/hashhotfix-l2.test.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { PROXY_ADMIN_ADDRESS } from '@celo/connect'
import { setCode, testWithAnvilL2 } from '@celo/dev-utils/lib/anvil-test'
import fs from 'fs'
import path from 'path'
import path from 'node:path'
import Web3 from 'web3'
import { stripAnsiCodesAndTxHashes, testLocallyWithWeb3Node } from '../../test-utils/cliUtils'
import HashHotfix from './hashhotfix'
Expand Down
2 changes: 1 addition & 1 deletion packages/cli/src/commands/governance/show-l2.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import { Proposal } from '@celo/contractkit/lib/wrappers/Governance'
import { testWithAnvilL2 } from '@celo/dev-utils/lib/anvil-test'
import { timeTravel } from '@celo/dev-utils/lib/ganache-test'
import fs from 'fs'
import path from 'path'
import path from 'node:path'
import Web3 from 'web3'
import { stripAnsiCodesAndTxHashes, testLocallyWithWeb3Node } from '../../test-utils/cliUtils'
import Show from './show'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import { PROXY_ADMIN_ADDRESS } from '@celo/connect'
import { setCode, testWithAnvilL2 } from '@celo/dev-utils/lib/anvil-test'
import * as celoGovernance from '@celo/governance'
import fs from 'fs'
import path from 'path'
import path from 'node:path'
import Web3 from 'web3'
import { stripAnsiCodesAndTxHashes, testLocallyWithWeb3Node } from '../../test-utils/cliUtils'
import TestProposal from './test-proposal'
Expand Down
2 changes: 1 addition & 1 deletion packages/cli/src/test-utils/setup.global.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import baseSetup from '@celo/dev-utils/lib/ganache-setup'
import { shouldRunGanacheTests } from '@celo/dev-utils/lib/ganache-test'
// Has to import the matchers somewhere so that typescript knows the matchers have been made available
import _unused from '@celo/dev-utils/lib/matchers'
import * as path from 'path'
import * as path from 'node:path'

// Warning: There should be an unused import of '@celo/dev-utils/lib/matchers' above.
// If there is not, then your editor probably deleted it automatically.
Expand Down
2 changes: 1 addition & 1 deletion packages/cli/src/utils/config.test.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import * as fs from 'fs-extra'
import { join } from 'node:path'
import { tmpdir } from 'os'
import { join } from 'path'
import { CeloConfig, readConfig, writeConfig } from './config'

// NOTE: for some reason if I don't mock the whole module, jest fails
Expand Down
2 changes: 1 addition & 1 deletion packages/cli/src/utils/config.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { CELO_DERIVATION_PATH_BASE } from '@celo/base'
import * as fs from 'fs-extra'
import * as path from 'path'
import * as path from 'node:path'

export interface CeloConfig {
node: string
Expand Down
2 changes: 1 addition & 1 deletion packages/dev-utils/src/ganache-setup.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import * as fs from 'fs-extra'
import * as ganache from 'ganache'
import * as path from 'path'
import * as path from 'node:path'
import * as targz from 'targz'
import { TEST_BALANCE, TEST_GAS_LIMIT, TEST_GAS_PRICE, TEST_MNEMONIC } from './test-utils'

Expand Down
2 changes: 1 addition & 1 deletion packages/sdk/contractkit/src/test-utils/setup.global.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import { shouldRunGanacheTests } from '@celo/dev-utils/lib/ganache-test'
// Has to import the matchers somewhere so that typescript knows the matchers have been made available
import _very_important from '@celo/dev-utils/lib/matchers'
import { waitForPortOpen } from '@celo/dev-utils/lib/network'
import * as path from 'path'
import * as path from 'node:path'

// Warning: There should be an unused import of '@celo/dev-utils/lib/matchers' above.
// If there is not, then your editor probably deleted it automatically.
Expand Down
2 changes: 1 addition & 1 deletion packages/sdk/keystores/src/file-keystore.test.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { trimLeading0x } from '@celo/utils/lib/address'
import { mkdirSync, readdirSync, readFileSync, writeFileSync } from 'fs'
import path from 'path'
import path from 'node:path'
import { rimraf } from 'rimraf'
import { FileKeystore } from './file-keystore'
import { ADDRESS1, GETH_GEN_KEYSTORE1, KEYSTORE_NAME1, PASSPHRASE1, PK1 } from './test-constants'
Expand Down
4 changes: 2 additions & 2 deletions packages/sdk/keystores/src/file-keystore.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { mkdirSync, promises as fsPromises, readFileSync, unlinkSync, writeFileSync } from 'fs'
import path from 'path'
import { promises as fsPromises, mkdirSync, readFileSync, unlinkSync, writeFileSync } from 'fs'
import path from 'node:path'
import { KeystoreBase } from './keystore-base'

export class FileKeystore extends KeystoreBase {
Expand Down
2 changes: 1 addition & 1 deletion packages/sdk/network-utils/scripts/fetch_timezones.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import fs from 'fs'
import 'isomorphic-fetch'
import path from 'path'
import path from 'node:path'
import { Timezone } from '../src/utils/timezone'

const TZ_URL = 'https://data.iana.org/time-zones/tzdb/zone.tab'
Expand Down
3 changes: 3 additions & 0 deletions packages/sdk/wallets/wallet-base/src/signing-utils.ts
Original file line number Diff line number Diff line change
Expand Up @@ -411,6 +411,7 @@ export async function encodeTransaction(
if (rlpEncoded.type === 'eip1559' || rlpEncoded.type === 'cip64') {
tx = {
...tx,
// @ts-expect-error
maxFeePerGas: rlpEncoded.transaction.maxFeePerGas!.toString(),
maxPriorityFeePerGas: rlpEncoded.transaction.maxPriorityFeePerGas!.toString(),
accessList: parseAccessList(rlpEncoded.transaction.accessList || []),
Expand All @@ -419,12 +420,14 @@ export async function encodeTransaction(
if (rlpEncoded.type === 'cip64' || rlpEncoded.type === 'celo-legacy') {
tx = {
...tx,
// @ts-expect-error
feeCurrency: rlpEncoded.transaction.feeCurrency!.toString(),
}
}
if (rlpEncoded.type === 'ethereum-legacy') {
tx = {
...tx,
// @ts-expect-error
gasPrice: rlpEncoded.transaction.gasPrice!.toString(),
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ import * as ethUtil from '@ethereumjs/util'
import TransportNodeHid from '@ledgerhq/hw-transport-node-hid'
import { VerifyPublicKeyInput, createVerify } from 'crypto'
import { readFileSync } from 'fs'
import { dirname, join } from 'path'
import { dirname, join } from 'node:path'
import Web3 from 'web3'
import { legacyLedgerPublicKeyHex } from './data'
import { meetsVersionRequirements } from './ledger-utils'
Expand Down
54 changes: 3 additions & 51 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -1731,9 +1731,7 @@ __metadata:
humanize-duration: "npm:^3.32.1"
jest: "npm:^29.7.0"
oclif: "npm:^4.14.15"
path: "npm:^0.12.7"
prompts: "npm:^2.0.1"
randombytes: "npm:^2.0.1"
ts-jest: "npm:^29.1.5"
ts-node: "npm:^10.9.1"
typescript: "npm:5.3.3"
Expand Down Expand Up @@ -8309,7 +8307,7 @@ __metadata:
tsconfig-paths: "npm:^4.2.0"
typedoc: "npm:^0.27.5"
typedoc-plugin-markdown: "npm:^4.3.2"
typescript: "npm:5.7.2"
typescript: "npm:5.3.3"
languageName: unknown
linkType: soft

Expand Down Expand Up @@ -12119,13 +12117,6 @@ __metadata:
languageName: node
linkType: hard

"inherits@npm:2.0.3":
version: 2.0.3
resolution: "inherits@npm:2.0.3"
checksum: 8771303d66c51be433b564427c16011a8e3fbc3449f1f11ea50efb30a4369495f1d0e89f0fc12bdec0bd7e49102ced5d137e031d39ea09821cb3c717fcf21e69
languageName: node
linkType: hard

"ini@npm:^4.1.1":
version: 4.1.1
resolution: "ini@npm:4.1.1"
Expand Down Expand Up @@ -16044,16 +16035,6 @@ __metadata:
languageName: node
linkType: hard

"path@npm:^0.12.7":
version: 0.12.7
resolution: "path@npm:0.12.7"
dependencies:
process: "npm:^0.11.1"
util: "npm:^0.10.3"
checksum: d49d101f9596613cf4cd1d4ebc4e64ba9a9df5d9cd75a410cfe87a88ce4bf0e2617ff44b92025376f7ecb02e88a6308b27f7f39d810f2335a5126f762487adfb
languageName: node
linkType: hard

"pathe@npm:^1.1.2":
version: 1.1.2
resolution: "pathe@npm:1.1.2"
Expand Down Expand Up @@ -16279,7 +16260,7 @@ __metadata:
languageName: node
linkType: hard

"process@npm:^0.11.1, process@npm:^0.11.10":
"process@npm:^0.11.10":
version: 0.11.10
resolution: "process@npm:0.11.10"
checksum: dbaa7e8d1d5cf375c36963ff43116772a989ef2bb47c9bdee20f38fd8fc061119cf38140631cf90c781aca4d3f0f0d2c834711952b728953f04fd7d238f59f5b
Expand Down Expand Up @@ -16589,7 +16570,7 @@ __metadata:
languageName: node
linkType: hard

"randombytes@npm:^2.0.1, randombytes@npm:^2.1.0":
"randombytes@npm:^2.1.0":
version: 2.1.0
resolution: "randombytes@npm:2.1.0"
dependencies:
Expand Down Expand Up @@ -18927,16 +18908,6 @@ __metadata:
languageName: node
linkType: hard

"typescript@npm:5.7.2":
version: 5.7.2
resolution: "typescript@npm:5.7.2"
bin:
tsc: bin/tsc
tsserver: bin/tsserver
checksum: 4caa3904df69db9d4a8bedc31bafc1e19ffb7b24fbde2997a1633ae1398d0de5bdbf8daf602ccf3b23faddf1aeeb9b795223a2ed9c9a4fdcaf07bfde114a401a
languageName: node
linkType: hard

"typescript@patch:typescript@npm%3A5.3.3#optional!builtin<compat/typescript>":
version: 5.3.3
resolution: "typescript@patch:typescript@npm%3A5.3.3#optional!builtin<compat/typescript>::version=5.3.3&hash=e012d7"
Expand All @@ -18947,16 +18918,6 @@ __metadata:
languageName: node
linkType: hard

"typescript@patch:typescript@npm%3A5.7.2#optional!builtin<compat/typescript>":
version: 5.7.2
resolution: "typescript@patch:typescript@npm%3A5.7.2#optional!builtin<compat/typescript>::version=5.7.2&hash=e012d7"
bin:
tsc: bin/tsc
tsserver: bin/tsserver
checksum: ff27fc124bceb8969be722baa38af945b2505767cf794de3e2715e58f61b43780284060287d651fcbbdfb6f917f4653b20f4751991f17e0706db389b9bb3f75d
languageName: node
linkType: hard

"uc.micro@npm:^2.0.0, uc.micro@npm:^2.1.0":
version: 2.1.0
resolution: "uc.micro@npm:2.1.0"
Expand Down Expand Up @@ -19154,15 +19115,6 @@ __metadata:
languageName: node
linkType: hard

"util@npm:^0.10.3":
version: 0.10.4
resolution: "util@npm:0.10.4"
dependencies:
inherits: "npm:2.0.3"
checksum: 1200a1ca2b474758342b3a0c5261c56f14ef09ad7eeaec3e6f449f5776ecdfce09a153cad62652b823e74647cdcfd2918552eadd2434783dfb58dabc5061803a
languageName: node
linkType: hard

"util@npm:^0.12.4, util@npm:^0.12.5":
version: 0.12.5
resolution: "util@npm:0.12.5"
Expand Down

0 comments on commit 5572478

Please sign in to comment.