Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: update libs #1785

Merged
merged 2 commits into from
Jul 2, 2024
Merged
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
13 changes: 12 additions & 1 deletion .eslintrc.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,17 @@
"@typescript-eslint/no-inferrable-types": 0,
"@typescript-eslint/no-empty-function": "off",
"@typescript-eslint/no-explicit-any": "off",
"@typescript-eslint/no-floating-promises": 2
"@typescript-eslint/no-floating-promises": 2,
"@typescript-eslint/no-non-null-assertion": "off",
"@typescript-eslint/no-unused-vars": [
"warn",
{
"ignoreRestSiblings": true,
"argsIgnorePattern": "^_",
"varsIgnorePattern": "^_",
"caughtErrorsIgnorePattern": "^_"
}
]

}
}
4 changes: 2 additions & 2 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -56,9 +56,9 @@ jobs:
test-lambdas:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Use Node.js 18.x
uses: actions/setup-node@v3
uses: actions/setup-node@v4
with:
node-version: 18.x
cache: yarn
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/combine-prs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ jobs:

# Steps represent a sequence of tasks that will be executed as part of the job
steps:
- uses: actions/github-script@v6
- uses: actions/github-script@v7
id: create-combined-pr
name: Create Combined PR
with:
Expand Down
2 changes: 1 addition & 1 deletion .nvmrc
Original file line number Diff line number Diff line change
@@ -1 +1 @@
16.13.0
18
Empty file added content/blocks-cache-amoy.csv
Empty file.
Empty file.
6 changes: 3 additions & 3 deletions content/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,13 +21,13 @@
},
"dependencies": {
"@dcl/block-indexer": "^1.1.2",
"@dcl/catalyst-api-specs": "^3.2.5",
"@dcl/catalyst-api-specs": "^3.2.6",
"@dcl/catalyst-contracts": "^4.4.1",
"@dcl/catalyst-storage": "^4.2.0",
"@dcl/content-validator": "^5.2.0",
"@dcl/content-validator": "^5.3.0",
"@dcl/crypto": "^3.4.5",
"@dcl/hashing": "^3.0.4",
"@dcl/schemas": "^11.5.0",
"@dcl/schemas": "^11.10.2",
"@dcl/snapshots-fetcher": "^9.0.3",
"@dcl/urn-resolver": "^3.4.0",
"@well-known-components/env-config-provider": "^1.2.0",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,4 +18,4 @@ export async function up(pgm: MigrationBuilder): Promise<void> {
)
}

export async function down(pgm: MigrationBuilder): Promise<void> {}
export async function down(_pgm: MigrationBuilder): Promise<void> {}
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,4 @@ export async function up(pgm: MigrationBuilder): Promise<void> {
)
}

export async function down(pgm: MigrationBuilder): Promise<void> {}
export async function down(_pgm: MigrationBuilder): Promise<void> {}
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,4 @@ export async function up(pgm: MigrationBuilder): Promise<void> {
)
}

export async function down(pgm: MigrationBuilder): Promise<void> {}
export async function down(_pgm: MigrationBuilder): Promise<void> {}
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
import { MigrationBuilder } from 'node-pg-migrate'

export async function up(pgm: MigrationBuilder): Promise<void> {
export async function up(_pgm: MigrationBuilder): Promise<void> {
// pgm.dropTable('pointer_history')
}

export async function down(pgm: MigrationBuilder): Promise<void> {
export async function down(_pgm: MigrationBuilder): Promise<void> {
// pgm.createTable(
// 'pointer_history',
// {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
import { MigrationBuilder } from 'node-pg-migrate'

export async function up(pgm: MigrationBuilder): Promise<void> {
export async function up(_pgm: MigrationBuilder): Promise<void> {
// pgm.dropTable('last_deployed_pointers')
}

export async function down(pgm: MigrationBuilder): Promise<void> {
export async function down(_pgm: MigrationBuilder): Promise<void> {
// pgm.createTable(
// 'last_deployed_pointers',
// {
Expand Down
5 changes: 3 additions & 2 deletions content/src/service/validations/validator.ts
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,7 @@ export async function createOnChainValidator(
l2Provider: HTTPProvider
): Promise<ValidateFn> {
const { env, metrics, logs, externalCalls } = components
const logger = logs.getLogger('OnChainValidator')
const l1Network: 'mainnet' | 'sepolia' = env.getConfig(EnvironmentConfig.ETH_NETWORK)
const l2Network = l1Network === 'mainnet' ? 'polygon' : 'amoy'

Expand Down Expand Up @@ -119,9 +120,9 @@ export async function createOnChainValidator(
const file = `blocks-cache-${networkName}.csv`
try {
await loadTree(tree, file, converter)
console.log(`loading snapshot for ${networkName} took ${new Date().getTime() - start} ms.`)
logger.debug(`loading snapshot for ${networkName} took ${new Date().getTime() - start} ms.`)
} catch (e) {
console.log(`failed to load cache file ${file}`, e.toString())
logger.warn(`failed to load cache file ${file}`, e.toString())
}
}
await warmUpCache(l1BlockSearch.tree, l1Network)
Expand Down
4 changes: 2 additions & 2 deletions lambdas/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@
"test": "jest --runInBand --forceExit --coverage"
},
"dependencies": {
"@dcl/catalyst-api-specs": "^3.2.5",
"@dcl/catalyst-api-specs": "^3.2.6",
"@dcl/crypto": "^3.4.5",
"@dcl/schemas": "^11.5.0",
"@dcl/schemas": "^11.10.2",
"@dcl/urn-resolver": "^3.4.0",
"@well-known-components/env-config-provider": "^1.2.0",
"@well-known-components/fetch-component": "^2.0.2",
Expand Down
13 changes: 4 additions & 9 deletions lambdas/src/utils/SmartContentClient.ts
Original file line number Diff line number Diff line change
Expand Up @@ -123,23 +123,18 @@ export class SmartContentClient implements ContentClient {
return this.onlyKnownHeaders(response.headers as any)
}

deployEntity(deployData: DeploymentData, fix?: boolean, options?: RequestOptions): Promise<number> {
deployEntity(_deployData: DeploymentData, _fix?: boolean, _options?: RequestOptions): Promise<number> {
throw new Error('New deployments are currently not supported')
}

deploy(deployData: DeploymentData, options?: RequestOptions): Promise<unknown> {
deploy(_deployData: DeploymentData, _options?: RequestOptions): Promise<unknown> {
throw new Error('New deployments are currently not supported')
}

buildEntity({ type, pointers, files, metadata }: BuildEntityOptions): Promise<DeploymentPreparationData> {
buildEntity(_: BuildEntityOptions): Promise<DeploymentPreparationData> {
throw new Error('New deployments are currently not supported')
}
buildEntityWithoutNewFiles({
type,
pointers,
hashesByKey,
metadata
}: BuildEntityWithoutFilesOptions): Promise<DeploymentPreparationData> {
buildEntityWithoutNewFiles(_: BuildEntityWithoutFilesOptions): Promise<DeploymentPreparationData> {
throw new Error('New deployments are currently not supported')
}

Expand Down
26 changes: 18 additions & 8 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -321,10 +321,10 @@
"@well-known-components/metrics" "^2.0.1"
lru-cache "^7.14.0"

"@dcl/catalyst-api-specs@^3.2.5":
version "3.2.5"
resolved "https://registry.yarnpkg.com/@dcl/catalyst-api-specs/-/catalyst-api-specs-3.2.5.tgz#ce5cdc0c90d38108d64d9b8ea147cb3a02b29124"
integrity sha512-x6zFbYLOpcwxm+LI20aa9EB+IuLF8QYxOx5D86XgZVVGvIjHlyUVpZrkE+C/VAtQsOK3Ry80jGu7G1n0BHXw9w==
"@dcl/catalyst-api-specs@^3.2.6":
version "3.2.6"
resolved "https://registry.yarnpkg.com/@dcl/catalyst-api-specs/-/catalyst-api-specs-3.2.6.tgz#1d0d7e7803b38ed3d1de0eef83394444a825bc33"
integrity sha512-bm8bfmIsZV3QqhY3tolxYm3ljA1vxhC+lRRQkwEnjZJiXHP0aeyvkCeVZp2ZmNTskXm29LDPGo3mcCGb/qiztA==
dependencies:
yaml "^2.3.4"

Expand Down Expand Up @@ -355,10 +355,10 @@
dependencies:
ethers "^5.6.8"

"@dcl/content-validator@^5.2.0":
version "5.2.0"
resolved "https://registry.yarnpkg.com/@dcl/content-validator/-/content-validator-5.2.0.tgz#08ee420ebd45d11674800224d2c66d6abd3078e1"
integrity sha512-N4pri8wfWEGObo0P/F8TXl2xOoNMbhZRtbqodOTiCYDiVaw18ncbt/hyzMjYPscJtQsmRYFRuveTnzbUTsRYsg==
"@dcl/content-validator@^5.3.0":
version "5.3.0"
resolved "https://registry.yarnpkg.com/@dcl/content-validator/-/content-validator-5.3.0.tgz#8d95c96de542e409a87c7747bf5193e0385b1e18"
integrity sha512-0FugkhIy4bzWnmt7ro6Gjp+PtHhitA9HxbbaA4247A1u0et5BWn7Kp6+/kWrqTsD3X++wgONlpwGlR+Kg8YfdA==
dependencies:
"@dcl/block-indexer" "^1.1.1"
"@dcl/content-hash-tree" "^1.1.4"
Expand All @@ -385,6 +385,16 @@
resolved "https://registry.yarnpkg.com/@dcl/hashing/-/hashing-3.0.4.tgz#4df2a4cb3a8114765aed34cb57b91c93bf33bfb3"
integrity sha512-Cg+MoIOn+BYmQV2q8zSFnNYY+GldlnUazwBnfgrq3i66ZxOaZ65h01btd8OUtSAlfWG4VTNIOHDjtKqmuwJNBg==

"@dcl/schemas@^11.10.2":
version "11.10.2"
resolved "https://registry.yarnpkg.com/@dcl/schemas/-/schemas-11.10.2.tgz#9085c533e79d5b7a38da0345b80759e638bcee5e"
integrity sha512-BQlyueum4n8AFQZBu07mIpyEwSGjNaIJo3++1chuxrVSWRK9UpFHv5HX/2ClzF3fyKoc/FHOpSjUwn+T3qlLHQ==
dependencies:
ajv "^8.11.0"
ajv-errors "^3.0.0"
ajv-keywords "^5.1.0"
mitt "^3.0.1"

"@dcl/schemas@^11.5.0":
version "11.5.0"
resolved "https://registry.yarnpkg.com/@dcl/schemas/-/schemas-11.5.0.tgz#b07fe469523348eed4d4bfde1219123c38bdb3ee"
Expand Down
Loading