From 083b7232dfb97cc8590c855a8c8c366e6938b406 Mon Sep 17 00:00:00 2001 From: Didi Date: Tue, 23 Jan 2024 00:40:12 +0100 Subject: [PATCH] [METADATA] again (#1800) * update scroll-mainnet gov, don't allow invalid json anymore * bump version --- packages/automation-contracts/autowrap/package.json | 2 +- packages/automation-contracts/scheduler/package.json | 2 +- packages/ethereum-contracts/package.json | 2 +- packages/js-sdk/package.json | 2 +- packages/metadata/CHANGELOG.md | 6 ++++++ packages/metadata/main/networks/list.cjs | 4 ++-- packages/metadata/module/networks/list.js | 4 ++-- packages/metadata/networks.json | 4 ++-- packages/metadata/package.json | 3 ++- packages/metadata/tasks/compare-committed-against-build.sh | 3 +++ packages/sdk-core/package.json | 2 +- packages/subgraph/package.json | 2 +- 12 files changed, 23 insertions(+), 13 deletions(-) diff --git a/packages/automation-contracts/autowrap/package.json b/packages/automation-contracts/autowrap/package.json index 941203beae..d85d7ba7a6 100644 --- a/packages/automation-contracts/autowrap/package.json +++ b/packages/automation-contracts/autowrap/package.json @@ -15,6 +15,6 @@ "dependencies": { "@openzeppelin/contracts": "4.9.3", "@superfluid-finance/ethereum-contracts": "1.9.0", - "@superfluid-finance/metadata": "1.1.24" + "@superfluid-finance/metadata": "1.1.25" } } diff --git a/packages/automation-contracts/scheduler/package.json b/packages/automation-contracts/scheduler/package.json index ea993aa149..23675e29f8 100644 --- a/packages/automation-contracts/scheduler/package.json +++ b/packages/automation-contracts/scheduler/package.json @@ -15,6 +15,6 @@ "dependencies": { "@openzeppelin/contracts": "4.9.3", "@superfluid-finance/ethereum-contracts": "1.9.0", - "@superfluid-finance/metadata": "1.1.24" + "@superfluid-finance/metadata": "1.1.25" } } diff --git a/packages/ethereum-contracts/package.json b/packages/ethereum-contracts/package.json index eb098783dd..cc3a6ace49 100644 --- a/packages/ethereum-contracts/package.json +++ b/packages/ethereum-contracts/package.json @@ -91,7 +91,7 @@ "@safe-global/safe-service-client": "^2.0.3", "@safe-global/safe-web3-lib": "^1.9.4", "@superfluid-finance/js-sdk": "0.6.3", - "@superfluid-finance/metadata": "1.1.24", + "@superfluid-finance/metadata": "1.1.25", "async": "^3.2.5", "csv-writer": "^1.6.0", "ethers": "^5.7.2", diff --git a/packages/js-sdk/package.json b/packages/js-sdk/package.json index f897e2aa18..9337a53145 100644 --- a/packages/js-sdk/package.json +++ b/packages/js-sdk/package.json @@ -43,7 +43,7 @@ "cloc": "sh tasks/cloc.sh" }, "dependencies": { - "@superfluid-finance/metadata": "1.1.24", + "@superfluid-finance/metadata": "1.1.25", "@truffle/contract": "4.6.29", "auto-bind": "4.0.0", "node-fetch": "2.7.0" diff --git a/packages/metadata/CHANGELOG.md b/packages/metadata/CHANGELOG.md index f2c270b127..e0f73d246d 100644 --- a/packages/metadata/CHANGELOG.md +++ b/packages/metadata/CHANGELOG.md @@ -3,6 +3,12 @@ All notable changes to the metadata will be documented in this file. This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). +## [v1.1.25] +### Changed +- updated gov contract of scroll-mainnet +### Fixed +- invalid networks.json + ## [v1.1.24] ### Changed - added forwarder addresses for scroll-sepolia, scroll-mainnet diff --git a/packages/metadata/main/networks/list.cjs b/packages/metadata/main/networks/list.cjs index 17b4e7c31f..ec06d1aa18 100644 --- a/packages/metadata/main/networks/list.cjs +++ b/packages/metadata/main/networks/list.cjs @@ -938,7 +938,7 @@ module.exports = "contractsV1": { "resolver": "0xb25a19c0e7d10c8D37E5b63Ed3213b67f7ebfF80", "host": "0x0F86a21F6216c061B222c224e315d9FC34520bb7", - "governance": "0x43A636A202203e52ea99b6515a191b888ccc57AC", + "governance": "0xC2C9a709A6744816b3712D520BD314fe610AEa33", "cfaV1": "0x9d146055738BD4D258c99927A3188C94dCf4cd18", "cfaV1Forwarder": "0xcfA132E353cB4E398080B9700609bb008eceB125", "idaV1": "0xC537033813fA474e5f9588114ef2EfBB0564e080", @@ -947,7 +947,7 @@ module.exports = "constantOutflowNFT": "0x0de05fe0fF8F5eA9475CA8425e2D05Dd38ccED84", "constantInflowNFT": "0x8c24Fc82c8fDd763F08E654212fc27e577EbD934", "superfluidLoader": "0x7613030429E95cDFC76FE70f9573037068B51815", - "superTokenFactory": "0xacFBED2bC9344C158DD3dC229b84Bd7220e7c673", + "superTokenFactory": "0xacFBED2bC9344C158DD3dC229b84Bd7220e7c673" }, "startBlockV1": 2575000, "logsQueryRange": 50000, diff --git a/packages/metadata/module/networks/list.js b/packages/metadata/module/networks/list.js index 66facf3cdc..ae5d0499bd 100644 --- a/packages/metadata/module/networks/list.js +++ b/packages/metadata/module/networks/list.js @@ -938,7 +938,7 @@ export default "contractsV1": { "resolver": "0xb25a19c0e7d10c8D37E5b63Ed3213b67f7ebfF80", "host": "0x0F86a21F6216c061B222c224e315d9FC34520bb7", - "governance": "0x43A636A202203e52ea99b6515a191b888ccc57AC", + "governance": "0xC2C9a709A6744816b3712D520BD314fe610AEa33", "cfaV1": "0x9d146055738BD4D258c99927A3188C94dCf4cd18", "cfaV1Forwarder": "0xcfA132E353cB4E398080B9700609bb008eceB125", "idaV1": "0xC537033813fA474e5f9588114ef2EfBB0564e080", @@ -947,7 +947,7 @@ export default "constantOutflowNFT": "0x0de05fe0fF8F5eA9475CA8425e2D05Dd38ccED84", "constantInflowNFT": "0x8c24Fc82c8fDd763F08E654212fc27e577EbD934", "superfluidLoader": "0x7613030429E95cDFC76FE70f9573037068B51815", - "superTokenFactory": "0xacFBED2bC9344C158DD3dC229b84Bd7220e7c673", + "superTokenFactory": "0xacFBED2bC9344C158DD3dC229b84Bd7220e7c673" }, "startBlockV1": 2575000, "logsQueryRange": 50000, diff --git a/packages/metadata/networks.json b/packages/metadata/networks.json index bb32596c48..e1fa38eece 100644 --- a/packages/metadata/networks.json +++ b/packages/metadata/networks.json @@ -936,7 +936,7 @@ "contractsV1": { "resolver": "0xb25a19c0e7d10c8D37E5b63Ed3213b67f7ebfF80", "host": "0x0F86a21F6216c061B222c224e315d9FC34520bb7", - "governance": "0x43A636A202203e52ea99b6515a191b888ccc57AC", + "governance": "0xC2C9a709A6744816b3712D520BD314fe610AEa33", "cfaV1": "0x9d146055738BD4D258c99927A3188C94dCf4cd18", "cfaV1Forwarder": "0xcfA132E353cB4E398080B9700609bb008eceB125", "idaV1": "0xC537033813fA474e5f9588114ef2EfBB0564e080", @@ -945,7 +945,7 @@ "constantOutflowNFT": "0x0de05fe0fF8F5eA9475CA8425e2D05Dd38ccED84", "constantInflowNFT": "0x8c24Fc82c8fDd763F08E654212fc27e577EbD934", "superfluidLoader": "0x7613030429E95cDFC76FE70f9573037068B51815", - "superTokenFactory": "0xacFBED2bC9344C158DD3dC229b84Bd7220e7c673", + "superTokenFactory": "0xacFBED2bC9344C158DD3dC229b84Bd7220e7c673" }, "startBlockV1": 2575000, "logsQueryRange": 50000, diff --git a/packages/metadata/package.json b/packages/metadata/package.json index ab7f9e3370..7f466e9a8f 100644 --- a/packages/metadata/package.json +++ b/packages/metadata/package.json @@ -1,6 +1,6 @@ { "name": "@superfluid-finance/metadata", - "version": "1.1.24", + "version": "1.1.25", "description": "Superfluid Metadata", "main": "main/index.cjs", "module": "module/index.js", @@ -22,6 +22,7 @@ "pre-commit:check": "./tasks/compare-committed-against-build.sh", "lint": "run-s lint:*", "lint:js-eslint": "eslint . --max-warnings=0 --report-unused-disable-directives && echo '✔ Your .js files look good.'", + "lint:consistency": "./tasks/compare-committed-against-build.sh", "fix": "run-s fix:*", "fix:eslint": "yarn lint:js-eslint --fix", "check-updates": "ncu --target minor" diff --git a/packages/metadata/tasks/compare-committed-against-build.sh b/packages/metadata/tasks/compare-committed-against-build.sh index 2048bde312..25b11313a9 100755 --- a/packages/metadata/tasks/compare-committed-against-build.sh +++ b/packages/metadata/tasks/compare-committed-against-build.sh @@ -10,6 +10,9 @@ function hashFiles() { sha256sum "$1" | cut -d ' ' -f 1 } +# first of all, ensure that we have valid json +jq empty networks.json + # Hash the commited files main_list_committed_hash=$(hashFiles ./main/networks/list.cjs) module_list_committed_hash=$(hashFiles ./module/networks/list.js) diff --git a/packages/sdk-core/package.json b/packages/sdk-core/package.json index 7cee8eeebd..c5d83cb0e7 100644 --- a/packages/sdk-core/package.json +++ b/packages/sdk-core/package.json @@ -57,7 +57,7 @@ }, "dependencies": { "@superfluid-finance/ethereum-contracts": "1.9.0", - "@superfluid-finance/metadata": "1.1.24", + "@superfluid-finance/metadata": "1.1.25", "browserify": "^17.0.0", "graphql-request": "^6.1.0", "lodash": "^4.17.21", diff --git a/packages/subgraph/package.json b/packages/subgraph/package.json index 46997fff5e..b519567030 100644 --- a/packages/subgraph/package.json +++ b/packages/subgraph/package.json @@ -56,7 +56,7 @@ "mustache": "^4.2.0" }, "devDependencies": { - "@superfluid-finance/metadata": "1.1.24", + "@superfluid-finance/metadata": "1.1.25", "coingecko-api": "^1.0.10", "graphql": "^16.8.1", "graphql-request": "^6.1.0",