Skip to content

Commit 458cbec

Browse files
authored
Merge branch 'dev' into 2026-01-only712
2 parents 06d230e + 40d3495 commit 458cbec

File tree

14 files changed

+4915
-4293
lines changed

14 files changed

+4915
-4293
lines changed

.github/workflows/ci.canary.yml

Lines changed: 0 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -273,41 +273,3 @@ jobs:
273273
s3_uri: ${{ format('{0}sdk-redux@dev', secrets.SITE_DEPLOYER_AWS_S3_DOCS_URI) }}
274274
cloudfront_distribution_id: E3JEO5R14CT8IH
275275

276-
upgrade-contracts:
277-
name: Upgrade ethereum-contracts on canary testnet (protocol release version "canary")
278-
279-
if: false # disable this for now
280-
281-
needs: [all-packages-tested]
282-
283-
runs-on: ubuntu-22.04
284-
285-
strategy:
286-
fail-fast: false
287-
matrix:
288-
network: [optimism-sepolia]
289-
290-
defaults:
291-
run:
292-
shell: nix develop .#ci-default -c bash -xe {0}
293-
294-
steps:
295-
- uses: actions/checkout@v4
296-
297-
- uses: DeterminateSystems/nix-installer-action@v13
298-
299-
- name: Build
300-
run: |
301-
yarn install --frozen-lockfile
302-
yarn build
303-
304-
- name: Deploy to ${{ matrix.network }}
305-
run: |
306-
cd packages/ethereum-contracts
307-
npx truffle exec --network ${{ matrix.network }} ops-scripts/deploy-test-environment.js
308-
npx truffle exec --network ${{ matrix.network }} ops-scripts/info-print-contract-addresses.js : addresses.vars
309-
tasks/etherscan-verify-framework.sh ${{ matrix.network }} addresses.vars
310-
env:
311-
RELEASE_VERSION: canary
312-
OPTIMISM_SEPOLIA_MNEMONIC: ${{ secrets.BUILD_AGENT_MNEMONIC }}
313-
OPTIMISM_SEPOLIA_PROVIDER_URL: ${{ secrets.OPTIMISM_SEPOLIA_PROVIDER_URL }}

.syncpackrc.yml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,3 +21,11 @@ versionGroups:
2121
dependencies:
2222
- "stack-trace"
2323
pinVersion: "0.0.10"
24+
- label: Pin hardhat due to a bug during deployment of contracts
25+
dependencies:
26+
- "hardhat"
27+
pinVersion: "2.27.2"
28+
- label: Pin hardhat-ethers due to it will require hardhat@^2.28.x
29+
dependencies:
30+
- "@nomicfoundation/hardhat-ethers"
31+
pinVersion: "3.1.2"

package.json

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -4,44 +4,44 @@
44
"version": "0.0.0",
55
"devDependencies": {
66
"@nomicfoundation/hardhat-chai-matchers": "^1.0.6",
7-
"@nomicfoundation/hardhat-ethers": "^3.1.0",
8-
"@nomicfoundation/hardhat-verify": "^2.1.1",
9-
"@nomiclabs/hardhat-web3": "^2.1.0",
7+
"@nomicfoundation/hardhat-ethers": "3.1.2",
8+
"@nomicfoundation/hardhat-verify": "^2.1.3",
9+
"@nomiclabs/hardhat-web3": "^2.1.2",
1010
"@openzeppelin/test-helpers": "^0.5.16",
1111
"@truffle/hdwallet-provider": "^2.1.15",
1212
"@typechain/ethers-v5": "^11.1.2",
1313
"@typechain/hardhat": "^9.1.0",
14-
"@types/lodash": "^4.17.7",
15-
"@types/mocha": "^10.0.7",
16-
"@typescript-eslint/eslint-plugin": "^8.3.0",
17-
"@typescript-eslint/parser": "^8.3.0",
14+
"@types/lodash": "^4.17.23",
15+
"@types/mocha": "^10.0.10",
16+
"@typescript-eslint/eslint-plugin": "^8.54.0",
17+
"@typescript-eslint/parser": "^8.54.0",
1818
"cloc": "^2.11.0",
1919
"copyfiles": "^2.4.1",
20-
"dotenv": "^16.4.5",
21-
"eslint": "^8.57.0",
22-
"eslint-config-prettier": "^9.1.0",
20+
"dotenv": "^16.6.1",
21+
"eslint": "^8.57.1",
22+
"eslint-config-prettier": "^9.1.2",
2323
"eslint-plugin-eslint-comments": "^3.2.0",
24-
"eslint-plugin-import": "^2.29.1",
25-
"eslint-plugin-prettier": "^5.2.1",
26-
"hardhat": "^2.26.1",
24+
"eslint-plugin-import": "^2.32.0",
25+
"eslint-plugin-prettier": "^5.5.5",
26+
"hardhat": "2.27.2",
2727
"hardhat-deploy": "^1.0.4",
28-
"husky": "^9.1.5",
29-
"lerna": "^8.1.8",
30-
"node-jq": "^6.0.1",
31-
"nodemon": "^3.1.4",
28+
"husky": "^9.1.7",
29+
"lerna": "^8.2.4",
30+
"node-jq": "^6.3.1",
31+
"nodemon": "^3.1.11",
3232
"npm-run-all": "^4.1.5",
33-
"nyc": "^17.0.0",
34-
"prettier": "^3.3.3",
35-
"prettier-eslint": "^16.3.0",
36-
"solhint": "^6.0.2",
37-
"syncpack": "^13.0.0",
33+
"nyc": "^17.1.0",
34+
"prettier": "^3.8.1",
35+
"prettier-eslint": "^16.4.2",
36+
"solhint": "^6.0.3",
37+
"syncpack": "^13.0.4",
3838
"truffle": "^5.11.5",
3939
"ts-node": "^10.9.2",
4040
"typechain": "^8.3.2",
41-
"typedoc": "^0.26.6",
42-
"typescript": "^5.5.4",
41+
"typedoc": "^0.28.16",
42+
"typescript": "^5.9.3",
4343
"web3": "^1.10.4",
44-
"graphql": "^16.9.0"
44+
"graphql": "^16.12.0"
4545
},
4646
"license": "MIT",
4747
"npmClient": "yarn",

packages/ethereum-contracts/CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm
1414

1515
- EVM target changed from _shanghai_ to _cancun_.
1616
- Update solhint to v6.
17+
- Updated to "hardhat@2.27.2".
1718

1819
## [v1.14.1]
1920

packages/ethereum-contracts/default.nix

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@
2121
./hardhat.config.ts
2222
./foundry.toml
2323
./tsconfig.json
24-
./tsconfig.scripts.json
2524
];
2625
};
2726
}

packages/ethereum-contracts/package.json

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,20 +9,20 @@
99
"@truffle/contract": "4.6.31",
1010
"ethereumjs-tx": "2.1.2",
1111
"ethereumjs-util": "7.1.5",
12-
"hardhat": "2.26.1"
12+
"hardhat": "2.27.2"
1313
},
1414
"devDependencies": {
1515
"@d10r/truffle-plugin-verify": "^0.7.2",
16-
"@nomiclabs/hardhat-truffle5": "^2.1.0",
16+
"@nomiclabs/hardhat-truffle5": "^2.1.2",
1717
"@safe-global/safe-core-sdk": "^3.3.5",
1818
"@safe-global/safe-service-client": "^2.0.3",
1919
"@safe-global/safe-web3-lib": "^1.9.4",
2020
"@superfluid-finance/js-sdk": "^0.6.3",
2121
"@superfluid-finance/metadata": "^1.6.2",
2222
"async": "^3.2.6",
2323
"csv-writer": "^1.6.0",
24-
"ethers": "^5.7.2",
25-
"mochawesome": "^7.1.3",
24+
"ethers": "^5.8.0",
25+
"mochawesome": "^7.1.4",
2626
"readline": "^1.3.0",
2727
"solidity-coverage": "^0.8.17",
2828
"solidity-docgen": "^0.6.0-beta.36",
@@ -73,7 +73,6 @@
7373
"build:contracts:foundry": "yarn run-foundry build",
7474
"build:post-contracts": "run-p -l build:post-contracts:*",
7575
"build:post-contracts:abi-bundle": "tasks/build-bundled-abi.sh",
76-
"build:post-contracts:dev-scripts-typings": "rm -rf dev-scripts/*.d.ts dev-scripts/*.d.ts.map; tsc -p tsconfig.scripts.json",
7776
"build:post-contracts:contracts-size": "forge build --sizes --skip test --skip script > build/contracts-sizes.txt",
7877
"verify-framework": "tasks/etherscan-verify-framework.sh",
7978
"testenv:start": "test/testenv-ctl.sh start",

packages/ethereum-contracts/tsconfig.scripts.json

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

packages/js-sdk/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@
1414
},
1515
"devDependencies": {
1616
"@superfluid-finance/ethereum-contracts": "^1.14.1",
17-
"chai-as-promised": "^8.0.0",
18-
"webpack": "^5.94.0",
17+
"chai-as-promised": "^8.0.2",
18+
"webpack": "^5.104.1",
1919
"webpack-bundle-analyzer": "^4.10.2",
2020
"webpack-cli": "^5.1.4"
2121
},

packages/sdk-core/package.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,18 +7,18 @@
77
"@superfluid-finance/ethereum-contracts": "1.14.1",
88
"@superfluid-finance/metadata": "^1.6.2",
99
"graphql-request": "6.1.0",
10-
"lodash": "4.17.21",
10+
"lodash": "4.17.23",
1111
"tsify": "5.0.4"
1212
},
1313
"devDependencies": {
14-
"@graphql-codegen/cli": "^5.0.2",
15-
"@graphql-codegen/near-operation-file-preset": "^3.0.0",
14+
"@graphql-codegen/cli": "^5.0.7",
15+
"@graphql-codegen/near-operation-file-preset": "^3.1.0",
1616
"@graphql-typed-document-node/core": "^3.2.0",
1717
"ajv": "^8.17.1",
1818
"browserify": "^17.0.1",
19-
"ethers": "^5.7.2",
19+
"ethers": "^5.8.0",
2020
"get-graphql-schema": "^2.1.2",
21-
"mocha": "^10.7.3"
21+
"mocha": "^10.8.2"
2222
},
2323
"engines": {
2424
"node": ">=12"

0 commit comments

Comments
 (0)