Skip to content

Commit

Permalink
Merge branch 'develop' into wsdt/deploy-teleportation
Browse files Browse the repository at this point in the history
  • Loading branch information
wsdt authored Jul 10, 2023
2 parents 32deac5 + aa7a959 commit e5e5a85
Show file tree
Hide file tree
Showing 21 changed files with 60 additions and 73 deletions.
1 change: 0 additions & 1 deletion .eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,6 @@ module.exports = {
indent: 'off',
'jsdoc/check-alignment': 'error',
'jsdoc/check-indentation': 'error',
'jsdoc/newline-after-description': 'error',
'linebreak-style': 'off',
'max-classes-per-file': 'off',
'max-len': 'off',
Expand Down
2 changes: 1 addition & 1 deletion integration-tests/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@
"eslint": "^7.27.0",
"eslint-config-prettier": "^8.3.0",
"eslint-plugin-import": "^2.23.4",
"eslint-plugin-jsdoc": "^35.1.2",
"eslint-plugin-jsdoc": "^46.2.6",
"eslint-plugin-prefer-arrow": "^1.2.3",
"eslint-plugin-prettier": "^3.4.0",
"eslint-plugin-react": "^7.24.0",
Expand Down
2 changes: 1 addition & 1 deletion ops/docker/Dockerfile.aa_deployer
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
FROM bobanetwork/builder AS builder
FROM node:14-alpine
FROM node:16-alpine

RUN apk add --no-cache git curl bash jq
WORKDIR /opt/optimism/
Expand Down
2 changes: 1 addition & 1 deletion ops/docker/Dockerfile.boba_deployer
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
FROM bobanetwork/builder AS builder
FROM node:14-alpine
FROM node:16-alpine

RUN apk add --no-cache git curl bash jq
WORKDIR /opt/optimism/
Expand Down
2 changes: 1 addition & 1 deletion ops/docker/Dockerfile.boba_gas-price-oracle
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
FROM bobanetwork/builder AS builder
FROM node:14-alpine
FROM node:16-alpine

RUN apk add --no-cache git curl bash jq
WORKDIR /opt/optimism/
Expand Down
2 changes: 1 addition & 1 deletion ops/docker/Dockerfile.bobalink
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
FROM bobanetwork/builder AS builder

FROM node:14-alpine
FROM node:16-alpine

RUN apk add --no-cache curl bash jq

Expand Down
2 changes: 1 addition & 1 deletion ops/docker/Dockerfile.data-transport-layer
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
FROM bobanetwork/builder AS builder

FROM node:14-alpine
FROM node:16-alpine

RUN apk add --no-cache curl bash jq

Expand Down
2 changes: 1 addition & 1 deletion ops/docker/Dockerfile.deployer
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
FROM bobanetwork/builder AS builder

FROM node:14-alpine
FROM node:16-alpine

RUN apk add --no-cache git curl python3 bash jq

Expand Down
2 changes: 1 addition & 1 deletion ops/docker/Dockerfile.message-relayer
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
FROM bobanetwork/builder AS builder

FROM node:14-alpine
FROM node:16-alpine

RUN apk add --no-cache curl bash jq

Expand Down
2 changes: 1 addition & 1 deletion ops/docker/Dockerfile.monitor
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM --platform=linux/amd64 node:14-buster
FROM --platform=linux/amd64 node:16-buster

RUN apt-get update && apt-get install -y bash git python build-essential

Expand Down
2 changes: 1 addition & 1 deletion ops/docker/Dockerfile.replica-healthcheck
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
FROM bobanetwork/builder AS builder

FROM node:14-alpine
FROM node:16-alpine

WORKDIR /opt/optimism

Expand Down
2 changes: 1 addition & 1 deletion ops/docker/Dockerfile.teleportation
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
FROM bobanetwork/builder AS builder

FROM node:14-alpine
FROM node:16-alpine

RUN apk add --no-cache curl bash jq

Expand Down
2 changes: 1 addition & 1 deletion ops/docker/hardhat/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM node:14-alpine
FROM node:16-alpine

# bring in the config files for installing deps
COPY [ \
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@
"eslint-config-prettier": "^8.3.0",
"eslint-config-standard": "^16.0.3",
"eslint-plugin-import": "^2.26.0",
"eslint-plugin-jsdoc": "^35.1.2",
"eslint-plugin-jsdoc": "^46.2.6",
"eslint-plugin-node": "^11.1.0",
"eslint-plugin-prefer-arrow": "^1.2.3",
"eslint-plugin-prettier": "^4.0.0",
Expand Down
2 changes: 1 addition & 1 deletion packages/boba/contracts/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@
"@typescript-eslint/eslint-plugin": "^5.45.1",
"@typescript-eslint/parser": "^5.45.1",
"eslint-config-prettier": "^8.3.0",
"eslint-plugin-jsdoc": "^35.1.2",
"eslint-plugin-jsdoc": "^46.2.6",
"eslint-plugin-prefer-arrow": "^1.2.3",
"eslint-plugin-import": "^2.26.0",
"eslint-plugin-prettier": "^3.4.0",
Expand Down
2 changes: 1 addition & 1 deletion packages/boba/gateway/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@
"audit-ci": "^3.1.1",
"eslint-config-prettier": "^8.3.0",
"eslint-plugin-import": "^2.26.0",
"eslint-plugin-jsdoc": "^35.1.2",
"eslint-plugin-jsdoc": "^46.2.6",
"eslint-plugin-prefer-arrow": "^1.2.3",
"eslint-plugin-prettier": "^3.4.0",
"eslint-plugin-react": "^7.24.0",
Expand Down
2 changes: 1 addition & 1 deletion packages/contracts/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@
"@typescript-eslint/eslint-plugin": "^5.45.1",
"@typescript-eslint/parser": "^5.45.1",
"eslint-config-prettier": "^8.3.0",
"eslint-plugin-jsdoc": "^35.1.2",
"eslint-plugin-jsdoc": "^46.2.6",
"eslint-plugin-prefer-arrow": "^1.2.3",
"eslint-plugin-import": "^2.26.0",
"eslint-plugin-prettier": "^3.4.0",
Expand Down
2 changes: 1 addition & 1 deletion packages/data-transport-layer/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@
"eslint": "^7.27.0",
"eslint-config-prettier": "^8.3.0",
"eslint-plugin-import": "^2.23.4",
"eslint-plugin-jsdoc": "^35.1.2",
"eslint-plugin-jsdoc": "^46.2.6",
"eslint-plugin-prefer-arrow": "^1.2.3",
"eslint-plugin-prettier": "^3.4.0",
"eslint-plugin-react": "^7.24.0",
Expand Down
2 changes: 1 addition & 1 deletion packages/message-relayer/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@
"eslint": "^7.27.0",
"eslint-config-prettier": "^8.3.0",
"eslint-plugin-import": "^2.23.4",
"eslint-plugin-jsdoc": "^35.1.2",
"eslint-plugin-jsdoc": "^46.2.6",
"eslint-plugin-prefer-arrow": "^1.2.3",
"eslint-plugin-prettier": "^3.4.0",
"eslint-plugin-react": "^7.24.0",
Expand Down
2 changes: 1 addition & 1 deletion packages/sdk/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@
"@typescript-eslint/eslint-plugin": "^5.45.1",
"@typescript-eslint/parser": "^5.45.1",
"eslint-config-prettier": "^8.3.0",
"eslint-plugin-jsdoc": "^35.1.2",
"eslint-plugin-jsdoc": "^46.2.6",
"eslint-plugin-prefer-arrow": "^1.2.3",
"eslint-plugin-import": "^2.26.0",
"eslint-plugin-prettier": "^3.4.0",
Expand Down
94 changes: 41 additions & 53 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -2996,14 +2996,14 @@
resolved "https://registry.npmjs.org/@ensdomains/resolver/-/resolver-0.2.4.tgz"
integrity sha512-bvaTH34PMCbv6anRa9I/0zjLJgY4EuznbEMgbV77JBCQ9KNC46rzi0avuxpOfu+xDjPEtSFGqVEOr5GlUSGudA==

"@es-joy/jsdoccomment@0.9.0-alpha.1":
version "0.9.0-alpha.1"
resolved "https://registry.npmjs.org/@es-joy/jsdoccomment/-/jsdoccomment-0.9.0-alpha.1.tgz"
integrity sha512-Clxxc0PwpISoYYBibA+1L2qFJ7gvFVhI2Hos87S06K+Q0cXdOhZQJNKWuaQGPAeHjZEuUB/YoWOfwjuF2wirqA==
"@es-joy/jsdoccomment@~0.39.4":
version "0.39.4"
resolved "https://registry.yarnpkg.com/@es-joy/jsdoccomment/-/jsdoccomment-0.39.4.tgz#6b8a62e9b3077027837728818d3c4389a898b392"
integrity sha512-Jvw915fjqQct445+yron7Dufix9A+m9j1fCJYlCo1FWlRvTxa3pjJelxdSTdaLWcTwRU6vbL+NYjO4YuNIS5Qg==
dependencies:
comment-parser "1.1.6-beta.0"
esquery "^1.4.0"
jsdoc-type-pratt-parser "1.0.4"
comment-parser "1.3.1"
esquery "^1.5.0"
jsdoc-type-pratt-parser "~4.0.0"

"@esbuild/android-arm64@0.17.19":
version "0.17.19"
Expand Down Expand Up @@ -10065,6 +10065,11 @@ archy@^1.0.0:
resolved "https://registry.npmjs.org/archy/-/archy-1.0.0.tgz"
integrity sha512-Xg+9RwCg/0p32teKdGMPTPnVXKD0w3DfHnFTficozsAgsvq2XenPJq/MYpzzQ/v8zrOyJn6Ds39VA4JIDwFfqw==

are-docs-informative@^0.0.2:
version "0.0.2"
resolved "https://registry.yarnpkg.com/are-docs-informative/-/are-docs-informative-0.0.2.tgz#387f0e93f5d45280373d387a59d34c96db321963"
integrity sha512-ixiS0nLNNG5jNQzgZJNoUpBKdo9yTYZMGJ+QgT2jmjR7G7+QHRCc4v6LQ3NgE7EBJq+o0ams3waJwkrlBom8Ig==

are-we-there-yet@^2.0.0:
version "2.0.0"
resolved "https://registry.yarnpkg.com/are-we-there-yet/-/are-we-there-yet-2.0.0.tgz#372e0e7bd279d8e94c653aaa1f67200884bf3e1c"
Expand Down Expand Up @@ -12863,10 +12868,10 @@ commander@^9.0.0, commander@^9.4.0, commander@^9.4.1:
resolved "https://registry.npmjs.org/commander/-/commander-9.5.0.tgz"
integrity sha512-KRs7WVDKg86PWiuAqhDrAQnTXZKraVcCc6vFdL14qrZ/DcWwuRo7VoiYXalXO7S5GKpqYiVEwCbgFDfxNHKJBQ==

comment-parser@1.1.6-beta.0:
version "1.1.6-beta.0"
resolved "https://registry.npmjs.org/comment-parser/-/comment-parser-1.1.6-beta.0.tgz"
integrity sha512-q3cA8TSMyqW7wcPSYWzbO/rMahnXgzs4SLG/UIWXdEsnXTFPZkEkWAdNgPiHig2OzxgpPLOh4WwsmClDxndwHw==
comment-parser@1.3.1:
version "1.3.1"
resolved "https://registry.yarnpkg.com/comment-parser/-/comment-parser-1.3.1.tgz#3d7ea3adaf9345594aedee6563f422348f165c1b"
integrity sha512-B52sN2VNghyq5ofvUsqZjmk6YkihBX5vMSChmSK9v4ShjKf3Vk5Xcmgpw4o+iIgtrnM/u5FiMpz9VKb8lpBveA==

common-path-prefix@^3.0.0:
version "3.0.0"
Expand Down Expand Up @@ -15113,19 +15118,19 @@ eslint-plugin-jest@^25.3.0:
dependencies:
"@typescript-eslint/experimental-utils" "^5.0.0"

eslint-plugin-jsdoc@^35.1.2:
version "35.5.1"
resolved "https://registry.npmjs.org/eslint-plugin-jsdoc/-/eslint-plugin-jsdoc-35.5.1.tgz"
integrity sha512-pPYPWtsykwVEue1tYEyoppBj4dgF7XicF67tLLLraY6RQYBq7qMKjUHji19+hfiTtYKKBD0YfeK8hgjPAE5viw==
eslint-plugin-jsdoc@^46.2.6:
version "46.2.6"
resolved "https://registry.yarnpkg.com/eslint-plugin-jsdoc/-/eslint-plugin-jsdoc-46.2.6.tgz#f25590d371859f20691d65b5dcd4cbe370d65564"
integrity sha512-zIaK3zbSrKuH12bP+SPybPgcHSM6MFzh3HFeaODzmsF1N8C1l8dzJ22cW1aq4g0+nayU1VMjmNf7hg0dpShLrA==
dependencies:
"@es-joy/jsdoccomment" "0.9.0-alpha.1"
comment-parser "1.1.6-beta.0"
debug "^4.3.2"
esquery "^1.4.0"
jsdoc-type-pratt-parser "^1.0.4"
lodash "^4.17.21"
regextras "^0.8.0"
semver "^7.3.5"
"@es-joy/jsdoccomment" "~0.39.4"
are-docs-informative "^0.0.2"
comment-parser "1.3.1"
debug "^4.3.4"
escape-string-regexp "^4.0.0"
esquery "^1.5.0"
is-builtin-module "^3.2.1"
semver "^7.5.1"
spdx-expression-parse "^3.0.1"

eslint-plugin-jsx-a11y@^6.5.1:
Expand Down Expand Up @@ -15594,14 +15599,7 @@ esprima@^4.0.0, esprima@^4.0.1, esprima@~4.0.0:
resolved "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz"
integrity sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==

esquery@^1.0.1, esquery@^1.3.1, esquery@^1.4.0:
version "1.4.0"
resolved "https://registry.npmjs.org/esquery/-/esquery-1.4.0.tgz"
integrity sha512-cCDispWt5vHHtwMY2YrAQ4ibFkAL8RbH5YGBnZBc90MolvvfkkQcJro/aZiAQUlQ3qgrYS6D6v8Gc5G5CQsc9w==
dependencies:
estraverse "^5.1.0"

esquery@^1.4.2:
esquery@^1.0.1, esquery@^1.3.1, esquery@^1.4.0, esquery@^1.4.2, esquery@^1.5.0:
version "1.5.0"
resolved "https://registry.yarnpkg.com/esquery/-/esquery-1.5.0.tgz#6ce17738de8577694edd7361c57182ac8cb0db0b"
integrity sha512-YQLXUplAwJgCydQ78IMJywZCceoqk1oH01OERdSAJc/7U2AylwjhSCLDEtqwg811idIS/9fIU5GjG73IgjKMVg==
Expand Down Expand Up @@ -18895,10 +18893,10 @@ is-buffer@^2.0.0, is-buffer@^2.0.5, is-buffer@~2.0.3:
resolved "https://registry.npmjs.org/is-buffer/-/is-buffer-2.0.5.tgz"
integrity sha512-i2R6zNFDwgEHJyQUtJEk0XFi1i0dPFn/oqjK3/vPCcDeJvW5NQ83V8QbicfF1SupOaB0h8ntgBC2YiE7dfyctQ==

is-builtin-module@^3.1.0:
version "3.2.0"
resolved "https://registry.npmjs.org/is-builtin-module/-/is-builtin-module-3.2.0.tgz"
integrity sha512-phDA4oSGt7vl1n5tJvTWooWWAsXLY+2xCnxNqvKhGEzujg+A43wPlPOyDg3C8XQHN+6k/JTQWJ/j0dQh/qr+Hw==
is-builtin-module@^3.1.0, is-builtin-module@^3.2.1:
version "3.2.1"
resolved "https://registry.yarnpkg.com/is-builtin-module/-/is-builtin-module-3.2.1.tgz#f03271717d8654cfcaf07ab0463faa3571581169"
integrity sha512-BSLE3HnV2syZ0FK0iMA/yUGplUeMmNz4AW5fnTunbCIqZi4vG3WjJT9FHMy5D69xmAYBHXQhJdALdpwVxV501A==
dependencies:
builtin-modules "^3.3.0"

Expand Down Expand Up @@ -20184,15 +20182,10 @@ jscodeshift@^0.14.0:
temp "^0.8.4"
write-file-atomic "^2.3.0"

jsdoc-type-pratt-parser@1.0.4:
version "1.0.4"
resolved "https://registry.npmjs.org/jsdoc-type-pratt-parser/-/jsdoc-type-pratt-parser-1.0.4.tgz"
integrity sha512-jzmW9gokeq9+bHPDR1nCeidMyFUikdZlbOhKzh9+/nJqB75XhpNKec1/UuxW5c4+O+Pi31Gc/dCboyfSm/pSpQ==

jsdoc-type-pratt-parser@^1.0.4:
version "1.2.0"
resolved "https://registry.npmjs.org/jsdoc-type-pratt-parser/-/jsdoc-type-pratt-parser-1.2.0.tgz"
integrity sha512-4STjeF14jp4bqha44nKMY1OUI6d2/g6uclHWUCZ7B4DoLzaB5bmpTkQrpqU+vSVzMD0LsKAOskcnI3I3VfIpmg==
jsdoc-type-pratt-parser@~4.0.0:
version "4.0.0"
resolved "https://registry.yarnpkg.com/jsdoc-type-pratt-parser/-/jsdoc-type-pratt-parser-4.0.0.tgz#136f0571a99c184d84ec84662c45c29ceff71114"
integrity sha512-YtOli5Cmzy3q4dP26GraSOeAhqecewG04hoO8DY56CH4KJ9Fvv5qKWUCCo3HZob7esJQHCv6/+bnTy72xZZaVQ==

jsdom@^16.6.0:
version "16.7.0"
Expand Down Expand Up @@ -26478,11 +26471,6 @@ regexpu-core@^5.3.1:
unicode-match-property-ecmascript "^2.0.0"
unicode-match-property-value-ecmascript "^2.1.0"

regextras@^0.8.0:
version "0.8.0"
resolved "https://registry.npmjs.org/regextras/-/regextras-0.8.0.tgz"
integrity sha512-k519uI04Z3SaY0fLX843MRXnDeG2+vHOFsyhiPZvNLe7r8rD2YNRjq4BQLZZ0oAr2NrtvZlICsXysGNFPGa3CQ==

registry-auth-token@3.3.2:
version "3.3.2"
resolved "https://registry.npmjs.org/registry-auth-token/-/registry-auth-token-3.3.2.tgz"
Expand Down Expand Up @@ -27259,10 +27247,10 @@ semver@^6.0.0, semver@^6.1.0, semver@^6.1.1, semver@^6.1.2, semver@^6.3.0:
resolved "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz"
integrity sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==

semver@^7.0.0, semver@^7.1.1, semver@^7.1.3, semver@^7.2.1, semver@^7.3.2, semver@^7.3.4, semver@^7.3.5, semver@^7.3.7, semver@^7.3.8:
version "7.3.8"
resolved "https://registry.npmjs.org/semver/-/semver-7.3.8.tgz"
integrity sha512-NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A==
semver@^7.0.0, semver@^7.1.1, semver@^7.1.3, semver@^7.2.1, semver@^7.3.2, semver@^7.3.4, semver@^7.3.5, semver@^7.3.7, semver@^7.3.8, semver@^7.5.1:
version "7.5.1"
resolved "https://registry.yarnpkg.com/semver/-/semver-7.5.1.tgz#c90c4d631cf74720e46b21c1d37ea07edfab91ec"
integrity sha512-Wvss5ivl8TMRZXXESstBA4uR5iXgEN/VC5/sOcuXdVLzcdkz4HWetIoRfG5gb5X+ij/G9rw9YoGn3QoQ8OCSpw==
dependencies:
lru-cache "^6.0.0"

Expand Down

0 comments on commit e5e5a85

Please sign in to comment.