Skip to content

Commit abdb745

Browse files
smartcontractssmartcontracts
authored
Merge branch 'develop' into dependabot/npm_and_yarn/hosted-git-info-2.8.9
2 parents 1d716b1 + 71349a4 commit abdb745

File tree

80 files changed

+1852
-330
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

80 files changed

+1852
-330
lines changed

‎.changeset/brown-boxes-compete.md‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
'@eth-optimism/data-transport-layer': patch
3+
---
4+
5+
Adds additional code into the DTL to defend against situations where an RPC provider might be missing an event.

‎.changeset/calm-fans-travel.md‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
'@eth-optimism/contracts': patch
3+
---
4+
5+
Migrated from tslint to eslint. The preference for lint exceptions is as follows: line level, block level, file level, package level.

‎.changeset/nice-terms-walk.md‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
'@eth-optimism/smock': patch
3+
---
4+
5+
Minor smock patch to add support for hardhat 2.4.0 and up

‎.changeset/olive-planets-clean.md‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
'@eth-optimism/batch-submitter': patch
3+
---
4+
5+
Add failure metrics to batch submitter

‎.changeset/sour-adults-worry.md‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
---
2+
'@eth-optimism/batch-submitter': patch
3+
'@eth-optimism/common-ts': patch
4+
'@eth-optimism/data-transport-layer': patch
5+
---
6+
7+
Move the metric prefix string to a label #1047

‎.eslintrc.js‎

Lines changed: 186 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,186 @@
1+
module.exports = {
2+
"env": {
3+
"browser": true,
4+
"es6": true
5+
},
6+
"extends": [
7+
"prettier",
8+
],
9+
"ignorePatterns": ["dist/**/*.ts"],
10+
"parser": "@typescript-eslint/parser",
11+
"parserOptions": {
12+
"project": "tsconfig.json",
13+
"sourceType": "module"
14+
},
15+
"plugins": [
16+
"eslint-plugin-import",
17+
"eslint-plugin-unicorn",
18+
"eslint-plugin-jsdoc",
19+
"eslint-plugin-prefer-arrow",
20+
"eslint-plugin-react",
21+
"@typescript-eslint",
22+
],
23+
"rules": {
24+
"@typescript-eslint/adjacent-overload-signatures": "error",
25+
"@typescript-eslint/array-type": "off",
26+
"@typescript-eslint/ban-types": "off",
27+
"@typescript-eslint/consistent-type-assertions": "error",
28+
"@typescript-eslint/dot-notation": "off",
29+
"@typescript-eslint/indent": "off",
30+
"@typescript-eslint/member-delimiter-style": [
31+
"off",
32+
{
33+
"multiline": {
34+
"delimiter": "none",
35+
"requireLast": true
36+
},
37+
"singleline": {
38+
"delimiter": "semi",
39+
"requireLast": false
40+
}
41+
}
42+
],
43+
"@typescript-eslint/member-ordering": "off",
44+
"@typescript-eslint/naming-convention": "off",
45+
"@typescript-eslint/no-empty-function": "error",
46+
"@typescript-eslint/no-empty-interface": "off",
47+
"@typescript-eslint/no-explicit-any": "off",
48+
"@typescript-eslint/no-misused-new": "error",
49+
"@typescript-eslint/no-namespace": "error",
50+
"@typescript-eslint/no-parameter-properties": "off",
51+
"@typescript-eslint/no-shadow": [
52+
"error",
53+
{
54+
"hoist": "all"
55+
}
56+
],
57+
"@typescript-eslint/no-this-alias": "error",
58+
"@typescript-eslint/no-unused-expressions": "off",
59+
"@typescript-eslint/no-use-before-define": "off",
60+
"@typescript-eslint/no-var-requires": "error",
61+
"@typescript-eslint/prefer-for-of": "error",
62+
"@typescript-eslint/prefer-function-type": "error",
63+
"@typescript-eslint/prefer-namespace-keyword": "error",
64+
"@typescript-eslint/quotes": "off",
65+
"@typescript-eslint/semi": [
66+
"off",
67+
null
68+
],
69+
"@typescript-eslint/triple-slash-reference": [
70+
"error",
71+
{
72+
"path": "always",
73+
"types": "prefer-import",
74+
"lib": "always"
75+
}
76+
],
77+
"@typescript-eslint/type-annotation-spacing": "off",
78+
"@typescript-eslint/unified-signatures": "error",
79+
"arrow-parens": [
80+
"off",
81+
"always"
82+
],
83+
"brace-style": [
84+
"off",
85+
"off"
86+
],
87+
"comma-dangle": "off",
88+
"complexity": "off",
89+
"constructor-super": "error",
90+
"curly": "error",
91+
"dot-notation": "off",
92+
"eol-last": "off",
93+
"eqeqeq": [
94+
"error",
95+
"smart"
96+
],
97+
"guard-for-in": "error",
98+
"id-blacklist": "off",
99+
"id-match": "off",
100+
"import/no-extraneous-dependencies": [
101+
"error"
102+
],
103+
"import/no-internal-modules": "off",
104+
"import/order": "off",
105+
"indent": "off",
106+
"jsdoc/check-alignment": "error",
107+
"jsdoc/check-indentation": "error",
108+
"jsdoc/newline-after-description": "error",
109+
"linebreak-style": "off",
110+
"max-classes-per-file": "off",
111+
"max-len": "off",
112+
"new-parens": "off",
113+
"newline-per-chained-call": "off",
114+
"no-bitwise": "off",
115+
"no-caller": "error",
116+
"no-cond-assign": "error",
117+
"no-console": "off",
118+
"no-debugger": "error",
119+
"no-duplicate-case": "error",
120+
"no-duplicate-imports": "error",
121+
"no-empty": "error",
122+
"no-eval": "error",
123+
"no-extra-bind": "error",
124+
"no-extra-semi": "off",
125+
"no-fallthrough": "off",
126+
"no-invalid-this": "off",
127+
"no-irregular-whitespace": "off",
128+
"no-multiple-empty-lines": "off",
129+
"no-new-func": "error",
130+
"no-new-wrappers": "error",
131+
"no-redeclare": "error",
132+
"no-return-await": "error",
133+
"no-sequences": "error",
134+
"no-sparse-arrays": "error",
135+
"no-template-curly-in-string": "error",
136+
"no-throw-literal": "error",
137+
"no-trailing-spaces": "off",
138+
"no-undef-init": "error",
139+
"no-underscore-dangle": "off",
140+
"no-unsafe-finally": "error",
141+
"no-unused-expressions": "off",
142+
"no-unused-labels": "error",
143+
"no-use-before-define": "off",
144+
"no-var": "error",
145+
"object-shorthand": "error",
146+
"one-var": [
147+
"error",
148+
"never"
149+
],
150+
"padded-blocks": [
151+
"off",
152+
{
153+
"blocks": "never"
154+
},
155+
{
156+
"allowSingleLineBlocks": true
157+
}
158+
],
159+
"prefer-arrow/prefer-arrow-functions": "error",
160+
"prefer-const": "error",
161+
"prefer-object-spread": "error",
162+
"quote-props": "off",
163+
"quotes": "off",
164+
"radix": "error",
165+
"react/jsx-curly-spacing": "off",
166+
"react/jsx-equals-spacing": "off",
167+
"react/jsx-tag-spacing": [
168+
"off",
169+
{
170+
"afterOpening": "allow",
171+
"closingSlash": "allow"
172+
}
173+
],
174+
"react/jsx-wrap-multilines": "off",
175+
"semi": "off",
176+
"space-before-blocks": "error",
177+
"space-before-function-paren": "off",
178+
"space-in-parens": [
179+
"off",
180+
"never"
181+
],
182+
"unicorn/prefer-ternary": "off",
183+
"use-isnan": "error",
184+
"valid-typeof": "off"
185+
}
186+
};

‎.github/workflows/sync-tests.yml‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,3 +42,21 @@ jobs:
4242
run: |
4343
yarn
4444
yarn test:sync
45+
46+
- name: Collect docker logs on failure
47+
if: failure()
48+
uses: jwalton/gh-docker-logs@v1
49+
with:
50+
images: 'ethereumoptimism/builder,ethereumoptimism/hardhat,ethereumoptimism/deployer,ethereumoptimism/data-transport-layer,ethereumoptimism/l2geth,ethereumoptimism/message-relayer,ethereumoptimism/batch-submitter,ethereumoptimism/l2geth'
51+
dest: './logs'
52+
53+
- name: Tar logs
54+
if: failure()
55+
run: tar cvzf ./logs.tgz ./logs
56+
57+
- name: Upload logs to GitHub
58+
if: failure()
59+
uses: actions/upload-artifact@master
60+
with:
61+
name: logs.tgz
62+
path: ./logs.tgz

0 commit comments

Comments
 (0)