Skip to content

Commit e9dbcb0

Browse files
committed
Merge branch 'develop' into add-cre-automation-contracts
2 parents b0b3031 + 3b5a6de commit e9dbcb0

33 files changed

Lines changed: 1395 additions & 1323 deletions

.github/CODEOWNERS

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,8 @@
6666

6767
# At the end, match any files missed by the patterns above
6868
/contracts/scripts/native_solc_compile_all_events_mock @smartcontractkit/dev-services
69+
# Remove ownership of these files as they are auto generated and already asserted to be correct.
70+
/**/generated-wrapper-dependency-versions-do-not-edit.txt
6971

7072
# CI/CD
7173
/.github/** @smartcontractkit/devex-cicd @smartcontractkit/devex-tooling @smartcontractkit/core @smartcontractkit/core-solidity

.github/workflows/solidity.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -157,8 +157,6 @@ jobs:
157157
persist-credentials: false
158158
- name: Setup NodeJS
159159
uses: ./.github/actions/setup-nodejs
160-
- name: Run pnpm lint
161-
run: pnpm lint
162160
- name: Run solhint
163161
run: pnpm solhint
164162
- name: Run solhint on tests

contracts/.prettierrc.js

Lines changed: 0 additions & 8 deletions
This file was deleted.

contracts/cre/gobindings/go.mod

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,9 +38,9 @@ require (
3838
github.com/tyler-smith/go-bip39 v1.1.0 // indirect
3939
github.com/zksync-sdk/zksync2-go v1.1.0 // indirect
4040
go.opentelemetry.io/auto/sdk v1.2.1 // indirect
41-
go.opentelemetry.io/otel v1.44.0 // indirect
42-
go.opentelemetry.io/otel/metric v1.44.0 // indirect
43-
go.opentelemetry.io/otel/trace v1.44.0 // indirect
41+
go.opentelemetry.io/otel v1.41.0 // indirect
42+
go.opentelemetry.io/otel/metric v1.41.0 // indirect
43+
go.opentelemetry.io/otel/trace v1.41.0 // indirect
4444
go.uber.org/multierr v1.11.0 // indirect
4545
golang.org/x/crypto v0.48.0 // indirect
4646
golang.org/x/sync v0.19.0 // indirect

contracts/cre/gobindings/go.sum

Lines changed: 6 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

contracts/cre/package.json

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -29,15 +29,9 @@
2929
"@openzeppelin/contracts": "4.9.6"
3030
}
3131
},
32-
"engines": {
33-
"node": ">=22",
34-
"pnpm": ">=10"
35-
},
32+
3633
"devDependencies": {
37-
"@changesets/cli": "^2.29.8",
38-
"@changesets/get-github-info": "^0.7.0",
3934
"solhint": "^6.0.2",
40-
"semver": "^7.7.3",
4135
"solhint-plugin-chainlink-solidity": "github:smartcontractkit/chainlink-solhint-rules#v1.2.1"
4236
},
4337
"dependencies": {
@@ -46,5 +40,9 @@
4640
"@openzeppelin/contracts-5.1.0": "npm:@openzeppelin/contracts@5.1.0",
4741
"@chainlink/contracts": "1.5.0"
4842
},
43+
"engines": {
44+
"node": ">=22",
45+
"pnpm": ">=10"
46+
},
4947
"type": "module"
5048
}

contracts/cre/pnpm-lock.yaml

Lines changed: 17 additions & 36 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

contracts/eslint.config.cjs

Lines changed: 0 additions & 86 deletions
This file was deleted.

0 commit comments

Comments
 (0)