Skip to content

Commit

Permalink
[NETWORK] added optimism-sepolia, scroll-sepolia, scroll-mainnet (#1787)
Browse files Browse the repository at this point in the history
* apply diff

* updated changelog

* [ETHEREUM-CONTRACTS] add scroll-mainnet and scroll-sepolia (#1790)

* add scroll networks

* add scroll sepolia to metadata

* add scroll mainnet to metadata

---------

Co-authored-by: isabelle <[email protected]>

* added metadata, updated changelog

* added subgraph metadata

* undo flake.lock change

---------

Co-authored-by: isabelle <[email protected]>
  • Loading branch information
d10r and isabelle authored Jan 19, 2024
1 parent d01ac84 commit f8ac96f
Show file tree
Hide file tree
Showing 14 changed files with 356 additions and 10 deletions.
2 changes: 1 addition & 1 deletion packages/automation-contracts/autowrap/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,6 @@
"dependencies": {
"@openzeppelin/contracts": "4.9.3",
"@superfluid-finance/ethereum-contracts": "1.9.0",
"@superfluid-finance/metadata": "1.1.22"
"@superfluid-finance/metadata": "1.1.23"
}
}
2 changes: 1 addition & 1 deletion packages/automation-contracts/scheduler/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,6 @@
"dependencies": {
"@openzeppelin/contracts": "4.9.3",
"@superfluid-finance/ethereum-contracts": "1.9.0",
"@superfluid-finance/metadata": "1.1.22"
"@superfluid-finance/metadata": "1.1.23"
}
}
11 changes: 11 additions & 0 deletions packages/ethereum-contracts/hardhat.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,9 @@ const chainIds = {

"celo-mainnet": 42220,

"scroll-sepolia": 534351,
"scroll-mainnet": 534352,

localhost: 31337,
hardhat: 31337,
};
Expand Down Expand Up @@ -163,6 +166,14 @@ const config: HardhatUserConfig = {
...createNetworkConfig("base-goerli"),
url: process.env.BASE_GOERLI_PROVIDER_URL || "",
},
"scroll-sepolia": {
...createNetworkConfig("scroll-sepolia"),
url: process.env.SCROLL_SEPOLIA_PROVIDER_URL || "",
},
"scroll-mainnet": {
...createNetworkConfig("scroll-mainnet"),
url: process.env.SCROLL_MAINNET_PROVIDER_URL || "",
},
hardhat: {
// Fixing an issue that parallel coverage test is not working for unkown reason.
// Ref: https://github.com/NomicFoundation/hardhat/issues/4310
Expand Down
2 changes: 1 addition & 1 deletion packages/ethereum-contracts/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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.22",
"@superfluid-finance/metadata": "1.1.23",
"async": "^3.2.5",
"csv-writer": "^1.6.0",
"ethers": "^5.7.2",
Expand Down
24 changes: 23 additions & 1 deletion packages/ethereum-contracts/truffle-config.js
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,7 @@ const ALIASES = {

"optimism-mainnet": ["opmainnet"],
"optimism-goerli": ["opgoerli"],
"optimism-sepolia": ["opsepolia"],

"arbitrum-one": ["arbone"],
"arbitrum-goerli": ["arbgoerli"],
Expand All @@ -82,10 +83,13 @@ const ALIASES = {

"base-mainnet": ["base"],

"scroll-sepolia": ["scrsepolia"],
"scroll-mainnet": ["scroll"],

// wildcard for any network
"any": ["any"],

// currently unsupported
// currently unsupported or deprecated networks
//
"optimism-kovan": ["opkovan"],

Expand Down Expand Up @@ -242,6 +246,11 @@ const E = (module.exports = {
network_id: 420,
},

"optimism-sepolia": {
...createNetworkDefaultConfiguration("optimism-sepolia"),
network_id: 11155420,
},

//
// Arbitrum: https://developer.offchainlabs.com
//
Expand Down Expand Up @@ -302,6 +311,18 @@ const E = (module.exports = {
network_id: 84531,
},

//
// Scroll: https://docs.scroll.xyz/en/getting-started/overview/
//
"scroll-mainnet": {
...createNetworkDefaultConfiguration("scroll-mainnet"),
network_id: 534352,
},
"scroll-sepolia": {
...createNetworkDefaultConfiguration("scroll-sepolia"),
network_id: 534351,
},

//
// Wildcard
//
Expand Down Expand Up @@ -420,6 +441,7 @@ const E = (module.exports = {
celoscan: process.env.CELOSCAN_API_KEY,
basescan: process.env.BASESCAN_API_KEY,
zkevm_polygonscan: process.env.ZKEVM_POLYGONSCAN_API_KEY,
scrollscan: process.env.SCROLLSCAN_API_KEY,
},
});

Expand Down
2 changes: 1 addition & 1 deletion packages/js-sdk/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
"cloc": "sh tasks/cloc.sh"
},
"dependencies": {
"@superfluid-finance/metadata": "1.1.22",
"@superfluid-finance/metadata": "1.1.23",
"@truffle/contract": "4.6.29",
"auto-bind": "4.0.0",
"node-fetch": "2.7.0"
Expand Down
4 changes: 4 additions & 0 deletions packages/metadata/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,10 @@ 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.23]
### Added
- new networks: optimism-sepolia, scroll-sepolia, scroll-mainnet

## [v1.1.22]
### Added
- `cliName` for `base-testnet`
Expand Down
103 changes: 103 additions & 0 deletions packages/metadata/main/networks/list.cjs
Original file line number Diff line number Diff line change
Expand Up @@ -371,6 +371,76 @@ module.exports =
"0xd8253782c45a12053594b9deB72d8e8aB2Fca54c"
]
},
{
"name": "optimism-sepolia",
"isTestnet": true,
"networkId": 11155420,
"chainId": 11155420,
"sfId": 109,
"shortName": "opsepolia",
"uppercaseName": "OPTIMISM_SEPOLIA",
"humanReadableName": "Optimism Sepolia",
"nativeTokenSymbol": "ETH",
"nativeTokenWrapper": "0x0043d7c85C8b96a49A72A92C0B48CdC4720437d7",
"contractsV1": {
"resolver": "0x554c06487bEc8c890A0345eb05a5292C1b1017Bd",
"host": "0xd399e2Fb5f4cf3722a11F65b88FAB6B2B8621005",
"cfaV1": "0x8a3170AdbC67233196371226141736E4151e7C26",
"cfaV1Forwarder": "0xcfA132E353cB4E398080B9700609bb008eceB125",
"idaV1": "0x51BDA2C5F627d456E282257710F4A4b6Eb094A52",
"gdaV1": "0xd453d38A001B47271488886532f1CCeAbf0c7eF3",
"gdaV1Forwarder": "0x6DA13Bde224A05a288748d857b9e7DDEffd1dE08",
"superTokenFactory": "0xfcF0489488397332579f35b0F711BE570Da0E8f5",
"constantOutflowNFT": "0xda6db863cb2EE39b196edB8159c38A1ed5c55344",
"constantInflowNFT": "0x87E00Dced5670e01BEe33a9a724B1dac790937eF",
"superfluidLoader": "0x109412E3C84f0539b43d39dB691B08c90f58dC7c"
},
"startBlockV1": 6886559,
"logsQueryRange": 50000,
"explorer": "https://sepolia-optimism.etherscan.io",
"subgraphV1": {
"cliName": "optimism-sepolia",
"name": "protocol-v1-optimism-sepolia",
"hostedEndpoint": "https://api.thegraph.com/subgraphs/name/superfluid-finance/protocol-v1-optimism-sepolia"
},
"publicRPCs": [
"https://sepolia.optimism.io"
],
"trustedForwarders": []
},
{
"name": "scroll-sepolia",
"isTestnet": true,
"networkId": 534351,
"chainId": 534351,
"sfId": 110,
"shortName": "scrsepolia",
"uppercaseName": "SCROLL_SEPOLIA",
"humanReadableName": "Scroll Sepolia",
"nativeTokenSymbol": "ETH",
"nativeTokenWrapper": "0x58f0A7c6c143074f5D824c2f27a85f6dA311A6FB",
"contractsV1": {
"resolver": "0xB62446a3006d86f6e9eAa36da773c311E7B8AF91",
"host": "0x42b05a6016B9eED232E13fd56a8F0725693DBF8e",
"governance": "0x59282c3ae5480F360429c0344A13e37cE9B13487",
"cfaV1": "0x09168F566EFF50Af1EB21D9BC45C9662fB6e08F1",
"idaV1": "0xD5F7350ad4ae4dA26714Cc95564D9Da31F2830e5",
"gdaV1": "0x7671c9059E085A14935d84E0fdE0df577D893a41",
"constantOutflowNFT": "0xEdB0A24DDb09cFeffF0C5348EB5d6D1C439d36bf",
"constantInflowNFT": "0x1DA4e4F848Cd4D0f528c2D0F19F41226BacB5489",
"superfluidLoader": "0xe25603df330027d91A0BAcc3e80a7f9e84930FC6",
"superTokenFactory": "0x87560833d59Be057aFc63cFFa3fc531589Ba428F",
},
"startBlockV1": 2823800,
"logsQueryRange": 50000,
"explorer": "https://sepolia.scrollscan.com/",
"subgraphV1": {
"cliName": "scroll-sepolia",
"name": "protocol-v1-scroll-sepolia",
"hostedEndpoint": "https://api.thegraph.com/subgraphs/name/superfluid-finance/protocol-v1-scroll-sepolia"
},
"publicRPCs": ["https://sepolia-rpc.scroll.io"]
},
{
"name": "xdai-mainnet",
"isTestnet": false,
Expand Down Expand Up @@ -851,5 +921,38 @@ module.exports =
},
"publicRPCs": ["https://developer-access-mainnet.base.org"],
"coinGeckoId": "base"
},
{
"name": "scroll-mainnet",
"isTestnet": false,
"networkId": 534352,
"chainId": 534352,
"sfId": 9,
"shortName": "scroll",
"uppercaseName": "SCROLL_MAINNET",
"humanReadableName": "Scroll",
"nativeTokenSymbol": "ETH",
"nativeTokenWrapper": "0x483C1716b6133cdA01237ebBF19c5a92898204B7",
"contractsV1": {
"resolver": "0xb25a19c0e7d10c8D37E5b63Ed3213b67f7ebfF80",
"host": "0x0F86a21F6216c061B222c224e315d9FC34520bb7",
"governance": "0x43A636A202203e52ea99b6515a191b888ccc57AC",
"cfaV1": "0x9d146055738BD4D258c99927A3188C94dCf4cd18",
"idaV1": "0xC537033813fA474e5f9588114ef2EfBB0564e080",
"gdaV1": "0x2c6dc2f45c9a15512BcF219867eAB804b5737c6a",
"constantOutflowNFT": "0x0de05fe0fF8F5eA9475CA8425e2D05Dd38ccED84",
"constantInflowNFT": "0x8c24Fc82c8fDd763F08E654212fc27e577EbD934",
"superfluidLoader": "0x7613030429E95cDFC76FE70f9573037068B51815",
"superTokenFactory": "0xacFBED2bC9344C158DD3dC229b84Bd7220e7c673",
},
"startBlockV1": 2575000,
"logsQueryRange": 50000,
"explorer": "https://scrollscan.com/",
"subgraphV1": {
"cliName": "scroll",
"name": "protocol-v1-scroll-mainnet",
"hostedEndpoint": "https://api.thegraph.com/subgraphs/name/superfluid-finance/protocol-v1-scroll-mainnet"
},
"publicRPCs": ["https://rpc.scroll.io"]
}
]
103 changes: 103 additions & 0 deletions packages/metadata/module/networks/list.js
Original file line number Diff line number Diff line change
Expand Up @@ -371,6 +371,76 @@ export default
"0xd8253782c45a12053594b9deB72d8e8aB2Fca54c"
]
},
{
"name": "optimism-sepolia",
"isTestnet": true,
"networkId": 11155420,
"chainId": 11155420,
"sfId": 109,
"shortName": "opsepolia",
"uppercaseName": "OPTIMISM_SEPOLIA",
"humanReadableName": "Optimism Sepolia",
"nativeTokenSymbol": "ETH",
"nativeTokenWrapper": "0x0043d7c85C8b96a49A72A92C0B48CdC4720437d7",
"contractsV1": {
"resolver": "0x554c06487bEc8c890A0345eb05a5292C1b1017Bd",
"host": "0xd399e2Fb5f4cf3722a11F65b88FAB6B2B8621005",
"cfaV1": "0x8a3170AdbC67233196371226141736E4151e7C26",
"cfaV1Forwarder": "0xcfA132E353cB4E398080B9700609bb008eceB125",
"idaV1": "0x51BDA2C5F627d456E282257710F4A4b6Eb094A52",
"gdaV1": "0xd453d38A001B47271488886532f1CCeAbf0c7eF3",
"gdaV1Forwarder": "0x6DA13Bde224A05a288748d857b9e7DDEffd1dE08",
"superTokenFactory": "0xfcF0489488397332579f35b0F711BE570Da0E8f5",
"constantOutflowNFT": "0xda6db863cb2EE39b196edB8159c38A1ed5c55344",
"constantInflowNFT": "0x87E00Dced5670e01BEe33a9a724B1dac790937eF",
"superfluidLoader": "0x109412E3C84f0539b43d39dB691B08c90f58dC7c"
},
"startBlockV1": 6886559,
"logsQueryRange": 50000,
"explorer": "https://sepolia-optimism.etherscan.io",
"subgraphV1": {
"cliName": "optimism-sepolia",
"name": "protocol-v1-optimism-sepolia",
"hostedEndpoint": "https://api.thegraph.com/subgraphs/name/superfluid-finance/protocol-v1-optimism-sepolia"
},
"publicRPCs": [
"https://sepolia.optimism.io"
],
"trustedForwarders": []
},
{
"name": "scroll-sepolia",
"isTestnet": true,
"networkId": 534351,
"chainId": 534351,
"sfId": 110,
"shortName": "scrsepolia",
"uppercaseName": "SCROLL_SEPOLIA",
"humanReadableName": "Scroll Sepolia",
"nativeTokenSymbol": "ETH",
"nativeTokenWrapper": "0x58f0A7c6c143074f5D824c2f27a85f6dA311A6FB",
"contractsV1": {
"resolver": "0xB62446a3006d86f6e9eAa36da773c311E7B8AF91",
"host": "0x42b05a6016B9eED232E13fd56a8F0725693DBF8e",
"governance": "0x59282c3ae5480F360429c0344A13e37cE9B13487",
"cfaV1": "0x09168F566EFF50Af1EB21D9BC45C9662fB6e08F1",
"idaV1": "0xD5F7350ad4ae4dA26714Cc95564D9Da31F2830e5",
"gdaV1": "0x7671c9059E085A14935d84E0fdE0df577D893a41",
"constantOutflowNFT": "0xEdB0A24DDb09cFeffF0C5348EB5d6D1C439d36bf",
"constantInflowNFT": "0x1DA4e4F848Cd4D0f528c2D0F19F41226BacB5489",
"superfluidLoader": "0xe25603df330027d91A0BAcc3e80a7f9e84930FC6",
"superTokenFactory": "0x87560833d59Be057aFc63cFFa3fc531589Ba428F",
},
"startBlockV1": 2823800,
"logsQueryRange": 50000,
"explorer": "https://sepolia.scrollscan.com/",
"subgraphV1": {
"cliName": "scroll-sepolia",
"name": "protocol-v1-scroll-sepolia",
"hostedEndpoint": "https://api.thegraph.com/subgraphs/name/superfluid-finance/protocol-v1-scroll-sepolia"
},
"publicRPCs": ["https://sepolia-rpc.scroll.io"]
},
{
"name": "xdai-mainnet",
"isTestnet": false,
Expand Down Expand Up @@ -851,5 +921,38 @@ export default
},
"publicRPCs": ["https://developer-access-mainnet.base.org"],
"coinGeckoId": "base"
},
{
"name": "scroll-mainnet",
"isTestnet": false,
"networkId": 534352,
"chainId": 534352,
"sfId": 9,
"shortName": "scroll",
"uppercaseName": "SCROLL_MAINNET",
"humanReadableName": "Scroll",
"nativeTokenSymbol": "ETH",
"nativeTokenWrapper": "0x483C1716b6133cdA01237ebBF19c5a92898204B7",
"contractsV1": {
"resolver": "0xb25a19c0e7d10c8D37E5b63Ed3213b67f7ebfF80",
"host": "0x0F86a21F6216c061B222c224e315d9FC34520bb7",
"governance": "0x43A636A202203e52ea99b6515a191b888ccc57AC",
"cfaV1": "0x9d146055738BD4D258c99927A3188C94dCf4cd18",
"idaV1": "0xC537033813fA474e5f9588114ef2EfBB0564e080",
"gdaV1": "0x2c6dc2f45c9a15512BcF219867eAB804b5737c6a",
"constantOutflowNFT": "0x0de05fe0fF8F5eA9475CA8425e2D05Dd38ccED84",
"constantInflowNFT": "0x8c24Fc82c8fDd763F08E654212fc27e577EbD934",
"superfluidLoader": "0x7613030429E95cDFC76FE70f9573037068B51815",
"superTokenFactory": "0xacFBED2bC9344C158DD3dC229b84Bd7220e7c673",
},
"startBlockV1": 2575000,
"logsQueryRange": 50000,
"explorer": "https://scrollscan.com/",
"subgraphV1": {
"cliName": "scroll",
"name": "protocol-v1-scroll-mainnet",
"hostedEndpoint": "https://api.thegraph.com/subgraphs/name/superfluid-finance/protocol-v1-scroll-mainnet"
},
"publicRPCs": ["https://rpc.scroll.io"]
}
]
Loading

0 comments on commit f8ac96f

Please sign in to comment.