diff --git a/.github/ISSUE_TEMPLATE/subgraph-bug-report.md b/.github/ISSUE_TEMPLATE/subgraph-bug-report.md index 78c9f2dc53..c7482ed731 100644 --- a/.github/ISSUE_TEMPLATE/subgraph-bug-report.md +++ b/.github/ISSUE_TEMPLATE/subgraph-bug-report.md @@ -10,10 +10,10 @@ assignees: 0xdavinchee **Describe the bug:** A clear and concise description of what the bug is. What is the data you are having issues with? -**Subgraph endpoint:** [e.g. https://thegraph.com/hosted-service/subgraph/superfluid-finance/protocol-v1-goerli] +**Subgraph endpoint:** [e.g. https://thegraph.com/hosted-service/subgraph/superfluid-finance/protocol-v1-polygon-mainnet] **Query:** -e.g. +e.g. ``` query MyQuery { streams(first: 10) { diff --git a/.github/workflows/handler.deploy-to-testnets.yml b/.github/workflows/handler.deploy-to-testnets.yml index 43dd5c5b76..b9960e8e54 100644 --- a/.github/workflows/handler.deploy-to-testnets.yml +++ b/.github/workflows/handler.deploy-to-testnets.yml @@ -29,11 +29,11 @@ jobs: defaults: run: shell: nix develop -c bash -xe {0} - + strategy: fail-fast: false matrix: - network: [eth-goerli, eth-sepolia, polygon-mumbai, optimism-goerli, arbitrum-goerli, avalanche-fuji, base-goerli, polygon-zkevm-testnet] + network: [eth-sepolia, polygon-mumbai, optimism-sepolia, avalanche-fuji, scroll-sepolia] steps: - uses: actions/checkout@v3 diff --git a/.github/workflows/handler.list-super-token.yml b/.github/workflows/handler.list-super-token.yml index 94d0f6742d..8e78551abf 100644 --- a/.github/workflows/handler.list-super-token.yml +++ b/.github/workflows/handler.list-super-token.yml @@ -58,17 +58,3 @@ jobs: --network ${{ github.event.inputs.network }} \ ops-scripts/resolver-list-super-token.js \ : ${{ github.event.inputs.token_address }} - - # workaround for OG networks with a Resolver not emitting events - - name: Trigger Transfer Event - if: > - github.event.inputs.network == 'polygon-mainnet' || - github.event.inputs.network == 'xdai-mainnet' || - github.event.inputs.network == 'polygon-mumbai' || - github.event.inputs.network == 'eth-goerli' - run: | - cd packages/ethereum-contracts - npx truffle exec \ - --network ${{ github.event.inputs.network }} \ - ops-scripts/tmp-trigger-token-transfer.js \ - : ${{ github.event.inputs.token_address }} diff --git a/.github/workflows/handler.verify-contracts.yml b/.github/workflows/handler.verify-contracts.yml index 2a1b393fd4..f5e1a2eb35 100644 --- a/.github/workflows/handler.verify-contracts.yml +++ b/.github/workflows/handler.verify-contracts.yml @@ -24,7 +24,7 @@ jobs: strategy: fail-fast: false matrix: - network: [eth-goerli, eth-sepolia, polygon-mumbai, optimism-goerli, arbitrum-goerli, avalanche-fuji, base-goerli, polygon-mainnet, optimism-mainnet, arbitrum-one, avalanche-c, bsc-mainnet, celo-mainnet] + network: [eth-sepolia, polygon-mumbai, optimism-sepolia, avalanche-fuji, polygon-mainnet, xdai-mainnet, optimism-mainnet, arbitrum-one, avalanche-c, bsc-mainnet, eth-mainnet, celo-mainnet, base-mainnnet, scroll-mainnet] defaults: run: diff --git a/packages/automation-contracts/autowrap/.env-example b/packages/automation-contracts/autowrap/.env-example index 78050eaeb6..3e29df7dad 100644 --- a/packages/automation-contracts/autowrap/.env-example +++ b/packages/automation-contracts/autowrap/.env-example @@ -1,11 +1,9 @@ # .env-example -GOERLI_PRIVATE_KEY= MUMBAI_PRIVATE_KEY= POLYGON_PRIVATE_KEY= BSC_PRIVATE_KEY= -GOERLI_URL= MUMBAI_URL= POLYGON_URL= BSC_URL= diff --git a/packages/automation-contracts/autowrap/README.md b/packages/automation-contracts/autowrap/README.md index 6e9485b871..db05daf8fb 100644 --- a/packages/automation-contracts/autowrap/README.md +++ b/packages/automation-contracts/autowrap/README.md @@ -20,7 +20,6 @@ When your Super Token balance reaches a certain lower threshold, Auto Wrap steps PRIVATE_KEY= -GOERLI_PRIVATE_KEY= MUMBAI_PRIVATE_KEY= POLYGON_PRIVATE_KEY= BSC_PRIVATE_KEY= @@ -59,7 +58,6 @@ npx hardhat addStrategy --manager --strategy #### Testnets | | FlowScheduler | VestingScheduler | |----------|--------------------------------------------------------------------------------------------------------------------------------------|--------------------------------------------------------------------------------------------------------------------------------------| -| Goerli | [0xA6134E107FCAEAab6140CB8fb92Dbf5bd9EF6C86](https://goerli.etherscan.io/address/0xA6134E107FCAEAab6140CB8fb92Dbf5bd9EF6C86#code) | [0xb61f8A2CbBd1be5FE437509b51dc2B9BA710c47b](https://goerli.etherscan.io/address/0xb61f8A2CbBd1be5FE437509b51dc2B9BA710c47b#code) | | Mumbai | [0xF18825d412C061aEfEFB4dF46a1c077636dA50bf](https://mumbai.polygonscan.com/address/0xF18825d412C061aEfEFB4dF46a1c077636dA50bf#code) | [0xD4fCe2a08fd2fA7495BEd900F2fb6c6deDBf8632](https://mumbai.polygonscan.com/address/0xD4fCe2a08fd2fA7495BEd900F2fb6c6deDBf8632#code) | #### Mainnets diff --git a/packages/automation-contracts/scheduler/hardhat.config.js b/packages/automation-contracts/scheduler/hardhat.config.js index f28f3493a3..5711a7e622 100644 --- a/packages/automation-contracts/scheduler/hardhat.config.js +++ b/packages/automation-contracts/scheduler/hardhat.config.js @@ -25,11 +25,6 @@ module.exports = { url: "http://127.0.0.1:8545/", chainId: 31337, }, - goerli: { - url: process.env.GOERLI_URL || "", - accounts: - process.env.GOERLI_PRIVATE_KEY !== undefined ? [process.env.GOERLI_PRIVATE_KEY] : [], - }, mumbai: { url: process.env.MUMBAI_URL || "", accounts: diff --git a/packages/ethereum-contracts/.env.template b/packages/ethereum-contracts/.env.template index eb2de0bb10..3d272227f2 100644 --- a/packages/ethereum-contracts/.env.template +++ b/packages/ethereum-contracts/.env.template @@ -11,8 +11,8 @@ # _GAS_PRICE # Example for the GΓΆrli Ethereum testnet: -ETH_GOERLI_PROVIDER_URL=https://goerli.infura.io/v3/ -ETH_GOERLI_MNEMONIC="rigid cradle south ..." +ETH_MAINNET_PROVIDER_URL=https://mainnet.infura.io/v3/ +ETH_MAINNET_MNEMONIC="rigid cradle south ..." # Fallback mnemonic for all networks - used if no network specific mnemonic is set @@ -25,7 +25,7 @@ DEFAULT_MNEMONIC="rigid cradle south ..." # A few scripts do subgraph queries, for those an endpoint must be configured -#ETH_GOERLI_SUBGRAPH_ENDPOINT=... +#ETH_MAINNET_SUBGRAPH_ENDPOINT=... # # Alternatively, you can also provide an endpoint template #SUBGRAPH_ENDPOINT_TEMPLATE=https://{{NETWORK}}.subgraph.mydomain.xyz diff --git a/packages/ethereum-contracts/README.md b/packages/ethereum-contracts/README.md index 099ff1f258..284d2b982c 100644 --- a/packages/ethereum-contracts/README.md +++ b/packages/ethereum-contracts/README.md @@ -35,7 +35,7 @@ If you're building a smart contract that uses Superfluid protocol, or even your ### Installation Prerequisites: -- [node.js v16+](https://nodejs.org/en/download) +- [node.js v18+](https://nodejs.org/en/download) - [yarn](https://classic.yarnpkg.com/en/docs/install) - [forge](https://book.getfoundry.sh/getting-started/installation) @@ -250,7 +250,7 @@ If you want contribute to Superfluid protocol contracts instead of just interfac ### Setup Development Environment -Prerequisites: You need node.js v16+ and yarn installed. +Prerequisites: You need node.js v18+ and yarn installed. First, check out this repository and cd into it. ```sh @@ -271,7 +271,7 @@ cd packages/ethereum-contracts/ ``` Then prepare an `.env` file (see `.env.template`). -The most important config items are RPC endpoint (`_PROVIDER_URL`) and a sender account (`_MNEMONIC`), __ being a network specific prefix - e.g. `GOERLI_PROVIDER_URL`. +The most important config items are RPC endpoint (`_PROVIDER_URL`) and a sender account (`_MNEMONIC`), __ being a network specific prefix - e.g. `OPTIMISM_MAINNET_PROVIDER_URL`. If you provide an actual mnemonic, the key derived at `m/44'/60'/0'/0/0` will be used. You can instead also set private keys (hex format) for `_MNEMONIC`. In order to get an overview of available config items, look for instances of `process.env` in [truffle-config.js](truffle-config.js) and in files in the [scripts](scripts) folder. diff --git a/packages/ethereum-contracts/contracts/apps/SuperfluidLoaderLibrary.sol b/packages/ethereum-contracts/contracts/apps/SuperfluidLoaderLibrary.sol index 222091227e..77955699a6 100644 --- a/packages/ethereum-contracts/contracts/apps/SuperfluidLoaderLibrary.sol +++ b/packages/ethereum-contracts/contracts/apps/SuperfluidLoaderLibrary.sol @@ -10,22 +10,23 @@ library SuperfluidLoaderLibrary { uint256 private constant BSC_MAINNET = 56; uint256 private constant XDAI_MAINNET = 100; uint256 private constant POLYGON_MAINNET = 137; + uint256 private constant BASE_MAINNET = 8453; uint256 private constant ARBITRUM_ONE = 42161; uint256 private constant CELO_MAINNET = 42220; uint256 private constant AVALANCHE_C = 43114; + uint256 private constant SCROLL_MAINNET = 534352; + // testnets - uint256 private constant ETH_GOERLI = 5; - uint256 private constant ETH_SEPOLIA = 11155111; - uint256 private constant BASE_GOERLI = 84531; - uint256 private constant POLYGON_MUMBAI = 80001; - uint256 private constant ARBITRUM_GOERLI = 421613; - uint256 private constant OPTIMISM_GOERLI = 420; uint256 private constant AVALANCHE_FUJI = 43113; - uint256 private constant ZKEVM_TESTNET = 1442; - + uint256 private constant POLYGON_MUMBAI = 80001; + uint256 private constant SCROLL_SEPOLIA = 534351; + uint256 private constant ETH_SEPOLIA = 11155111; + uint256 private constant OPTIMISM_SEPOLIA = 11155420; + function getHost() public view returns (address) { + // mainnets if (block.chainid == ETH_MAINNET) { return 0x4E583d9390082B65Bef884b629DFA426114CED6d; } else if (block.chainid == OPTIMISM_MAINNET) { @@ -36,28 +37,27 @@ library SuperfluidLoaderLibrary { return 0x2dFe937cD98Ab92e59cF3139138f18c823a4efE7; } else if (block.chainid == POLYGON_MAINNET) { return 0x3E14dC1b13c488a8d5D310918780c983bD5982E7; + } else if (block.chainid == BASE_MAINNET) { + return 0x4C073B3baB6d8826b8C5b229f3cfdC1eC6E47E74; } else if (block.chainid == ARBITRUM_ONE) { return 0xCf8Acb4eF033efF16E8080aed4c7D5B9285D2192; } else if (block.chainid == CELO_MAINNET) { return 0xA4Ff07cF81C02CFD356184879D953970cA957585; } else if (block.chainid == AVALANCHE_C) { return 0x60377C7016E4cdB03C87EF474896C11cB560752C; - } else if (block.chainid == ETH_GOERLI) { - return 0x22ff293e14F1EC3A09B137e9e06084AFd63adDF9; - } else if (block.chainid == ARBITRUM_GOERLI) { - return 0xE40983C2476032A0915600b9472B3141aA5B5Ba9; - } else if (block.chainid == OPTIMISM_GOERLI) { - return 0xE40983C2476032A0915600b9472B3141aA5B5Ba9; + } else if (block.chainid == SCROLL_MAINNET) { + return 0x0F86a21F6216c061B222c224e315d9FC34520bb7; + // testnets } else if (block.chainid == AVALANCHE_FUJI) { return 0x85Fe79b998509B77BF10A8BD4001D58475D29386; } else if (block.chainid == POLYGON_MUMBAI) { return 0xEB796bdb90fFA0f28255275e16936D25d3418603; + } else if (block.chainid == SCROLL_SEPOLIA) { + return 0x42b05a6016B9eED232E13fd56a8F0725693DBF8e; } else if (block.chainid == ETH_SEPOLIA) { return 0x109412E3C84f0539b43d39dB691B08c90f58dC7c; - } else if (block.chainid == BASE_GOERLI) { - return 0x507c3a7C6Ccc253884A2e3a3ee2A211cC7E796a6; - } else if (block.chainid == ZKEVM_TESTNET) { - return 0xe64f81d5dDdA1c7172e5C6d964E8ef1BD82D8704; + } else if (block.chainid == OPTIMISM_SEPOLIA) { + return 0xd399e2Fb5f4cf3722a11F65b88FAB6B2B8621005; } else { revert UnsupportedNetwork(); } diff --git a/packages/ethereum-contracts/hardhat.config.ts b/packages/ethereum-contracts/hardhat.config.ts index 3611892089..18b86764fe 100644 --- a/packages/ethereum-contracts/hardhat.config.ts +++ b/packages/ethereum-contracts/hardhat.config.ts @@ -55,16 +55,13 @@ subtask(TASK_COMPILE_SOLIDITY_GET_SOURCE_PATHS).setAction( const chainIds = { "eth-mainnet": 1, - "eth-goerli": 5, "eth-sepolia": 11155111, "xdai-mainnet": 100, "optimism-mainnet": 10, - "optimism-goerli": 420, "arbitrum-one": 42161, - "arbitrum-goerli": 421613, "polygon-mainnet": 137, "polygon-mumbai": 80001, @@ -114,10 +111,6 @@ const config: HardhatUserConfig = { ...createNetworkConfig("bsc-mainnet"), url: process.env.BSC_MAINNET_PROVIDER_URL || "", }, - "eth-goerli": { - ...createNetworkConfig("eth-goerli"), - url: process.env.ETH_GOERLI_PROVIDER_URL || "", - }, "xdai-mainnet": { ...createNetworkConfig("xdai-mainnet"), url: process.env.XDAI_MAINNET_PROVIDER_URL || "", @@ -126,18 +119,10 @@ const config: HardhatUserConfig = { ...createNetworkConfig("optimism-mainnet"), url: process.env.OPTIMISM_MAINNET_PROVIDER_URL || "", }, - "optimism-goerli": { - ...createNetworkConfig("optimism-goerli"), - url: process.env.OPTIMISM_GOERLI_PROVIDER_URL || "", - }, "arbitrum-one": { ...createNetworkConfig("arbitrum-one"), url: process.env.ARBITRUM_ONE_PROVIDER_URL || "", }, - "arbitrum-goerli": { - ...createNetworkConfig("arbitrum-goerli"), - url: process.env.ARBITRUM_GOERLI_PROVIDER_URL || "", - }, "polygon-mainnet": { ...createNetworkConfig("polygon-mainnet"), url: process.env.POLYGON_MAINNET_PROVIDER_URL || "", @@ -162,10 +147,6 @@ const config: HardhatUserConfig = { ...createNetworkConfig("eth-sepolia"), url: process.env.ETH_SEPOLIA_PROVIDER_URL || "", }, - "base-goerli": { - ...createNetworkConfig("base-goerli"), - url: process.env.BASE_GOERLI_PROVIDER_URL || "", - }, "scroll-sepolia": { ...createNetworkConfig("scroll-sepolia"), url: process.env.SCROLL_SEPOLIA_PROVIDER_URL || "", diff --git a/packages/ethereum-contracts/ops-scripts/libs/common.js b/packages/ethereum-contracts/ops-scripts/libs/common.js index 89ecb0c6e2..e43afb0628 100644 --- a/packages/ethereum-contracts/ops-scripts/libs/common.js +++ b/packages/ethereum-contracts/ops-scripts/libs/common.js @@ -200,7 +200,6 @@ async function setResolver(sf, key, value) { const resolverAdmin = nrAdmins > 0 ? await ac.getRoleMember(ADMIN_ROLE, nrAdmins - 1): await (async () => { - // This is for eth-goerli (and maybe other networks too) console.log(`!!! resolver.getRoleMemberCount() returned 0. Trying account[0] as resolver admin.`); return (await web3.eth.getAccounts())[0]; })(); @@ -345,7 +344,7 @@ async function autodetectAdminType(sf, account) { } // returns the Safe Tx Service URL or throws if none available -// source: https://github.com/safe-global/safe-docs/blob/main/safe-core-api/available-services.md +// source: https://github.com/safe-global/safe-docs/blob/main/pages/api-supported-networks.md?plain=1 function getSafeTxServiceUrl(chainId) { const safeChainNames = { // mainnets @@ -356,10 +355,10 @@ function getSafeTxServiceUrl(chainId) { 137: "polygon", 8453: "base", 42161: "arbitrum", + 42220: "celo", 43114: "avalanche", // testnets - 5: "goerli", - 84531: "base-testnet" + 11155111: "sepolia" }; if (safeChainNames[chainId] === undefined) { throw new Error(`no Safe tx service url known for chainId ${chainId}`); diff --git a/packages/ethereum-contracts/tasks/deploy-cfa-forwarder.sh b/packages/ethereum-contracts/tasks/deploy-cfa-forwarder.sh index 0e6151c198..7ca80a6e0a 100755 --- a/packages/ethereum-contracts/tasks/deploy-cfa-forwarder.sh +++ b/packages/ethereum-contracts/tasks/deploy-cfa-forwarder.sh @@ -4,9 +4,6 @@ set -eu # Usage: # tasks/deploy-cfa-forwarder.sh # -# Example: -# tasks/deploy-cfa-forwarder.sh optimism-goerli -# # The invoking account needs to be (co-)owner of the resolver and governance # # important ENV vars: diff --git a/packages/ethereum-contracts/tasks/deploy-gda-forwarder.sh b/packages/ethereum-contracts/tasks/deploy-gda-forwarder.sh index 08da123704..3176ef396f 100755 --- a/packages/ethereum-contracts/tasks/deploy-gda-forwarder.sh +++ b/packages/ethereum-contracts/tasks/deploy-gda-forwarder.sh @@ -4,9 +4,6 @@ set -eu # Usage: # tasks/deploy-gda-forwarder.sh # -# Example: -# tasks/deploy-gda-forwarder.sh optimism-goerli -# # The invoking account needs to be (co-)owner of the resolver and governance # # important ENV vars: diff --git a/packages/ethereum-contracts/tasks/deploy-macro-forwarder.sh b/packages/ethereum-contracts/tasks/deploy-macro-forwarder.sh index af2fb5f093..71fca058cb 100755 --- a/packages/ethereum-contracts/tasks/deploy-macro-forwarder.sh +++ b/packages/ethereum-contracts/tasks/deploy-macro-forwarder.sh @@ -4,9 +4,6 @@ set -eu # Usage: # tasks/deploy-macro-forwarder.sh # -# Example: -# tasks/deploy-macro-forwarder.sh optimism-goerli -# # The invoking account needs to be (co-)owner of the resolver and governance # # important ENV vars: diff --git a/packages/ethereum-contracts/truffle-config.js b/packages/ethereum-contracts/truffle-config.js index 0c231b5ffe..d11c8ef7ba 100644 --- a/packages/ethereum-contracts/truffle-config.js +++ b/packages/ethereum-contracts/truffle-config.js @@ -55,7 +55,6 @@ try { const ALIASES = { "eth-mainnet": ["mainnet"], - "eth-goerli": ["goerli"], "eth-sepolia": ["sepolia"], "xdai-mainnet": ["xdai"], @@ -75,8 +74,6 @@ const ALIASES = { "celo-mainnet": ["celo"], - "polygon-zkevm-testnet": ["pzkevmtest"], - "base-mainnet": ["base"], "scroll-sepolia": ["scrsepolia"], @@ -84,20 +81,6 @@ const ALIASES = { // wildcard for any network "any": ["any"], - - // currently unsupported or deprecated networks - - "base-goerli": ["bgoerli"], - - "optimism-goerli": ["opgoerli"], - "optimism-kovan": ["opkovan"], - - "arbitrum-goerli": ["arbgoerli"], - "arbitrum-rinkeby": ["arbrinkeby"], - - "bsc-chapel": ["chapel"], - - "celo-alfajores": ["alfajores"], }; const DEFAULT_NETWORK_TIMEOUT = 60000; @@ -196,11 +179,6 @@ const E = (module.exports = { maxFeePerGas: 50e9, }, - "eth-goerli": { - ...createNetworkDefaultConfiguration("eth-goerli"), - network_id: 5, - }, - "eth-sepolia": { ...createNetworkDefaultConfiguration("eth-sepolia"), network_id: 11155111, @@ -222,11 +200,6 @@ const E = (module.exports = { network_id: 80001, }, - "polygon-zkevm-testnet": { - ...createNetworkDefaultConfiguration("polygon-zkevm-testnet"), - network_id: 1442, - }, - // // xDAI: https://www.xdaichain.com/for-users/wallets/metamask/metamask-setup @@ -246,11 +219,6 @@ const E = (module.exports = { maxFeePerGas: 1e9, // 1 gwei }, - "optimism-goerli": { - ...createNetworkDefaultConfiguration("optimism-goerli"), - network_id: 420, - }, - "optimism-sepolia": { ...createNetworkDefaultConfiguration("optimism-sepolia"), network_id: 11155420, @@ -264,11 +232,6 @@ const E = (module.exports = { network_id: 42161, }, - "arbitrum-goerli": { - ...createNetworkDefaultConfiguration("arbitrum-goerli"), - network_id: 421613, - }, - // // Avalanche C-Chain: https://docs.avax.network/learn/platform-overview#contract-chain-c-chain // @@ -297,10 +260,6 @@ const E = (module.exports = { ...createNetworkDefaultConfiguration("celo-mainnet"), network_id: 42220, }, - "celo-alfajores": { - ...createNetworkDefaultConfiguration("celo-alfajores"), - network_id: 44787, - }, // // Base: https://base.org/ @@ -311,10 +270,6 @@ const E = (module.exports = { maxPriorityFeePerGas: 1e6, // 0.001 gwei - even 0 may do maxFeePerGas: 1e9, // 1 gwei }, - "base-goerli": { - ...createNetworkDefaultConfiguration("base-goerli"), - network_id: 84531, - }, // // Scroll: https://docs.scroll.xyz/en/getting-started/overview/ @@ -336,15 +291,6 @@ const E = (module.exports = { network_id: "*", }, - // - // Currently unsupported networks - // - - "bsc-chapel": { - ...createNetworkDefaultConfiguration("bsc-chapel"), - network_id: 97, - }, - /// For truffle development environment development: { host: "127.0.0.1", diff --git a/packages/ethereum-contracts/utils/supertoken-deployer.html b/packages/ethereum-contracts/utils/supertoken-deployer.html index 238a409095..836633d9e6 100644 --- a/packages/ethereum-contracts/utils/supertoken-deployer.html +++ b/packages/ethereum-contracts/utils/supertoken-deployer.html @@ -53,13 +53,7 @@ // TODO: replace with external canonical network list networks = [ - { chainId: 5, hostAddr: "0x22ff293e14F1EC3A09B137e9e06084AFd63adDF9" }, // eth-goerli - { chainId: 42, hostAddr: "0xF0d7d1D47109bA426B9D8A3Cde1941327af1eea3" }, // eth-kovan - { chainId: 4, hostAddr: "0xeD5B5b32110c3Ded02a07c8b8e97513FAfb883B6" }, // eth-rinkeby - { chainId: 3, hostAddr: "0xF2B4E81ba39F5215Db2e05B2F66f482BB8e87FD2" }, // eth-ropsten { chainId: 80001, hostAddr: "0xEB796bdb90fFA0f28255275e16936D25d3418603" }, // polygon-mumbai - { chainId: 69, hostAddr: "0x74b57883f8ce9F2BD330286E884CfD8BB24AC4ED" }, // optimism-kovan - { chainId: 421611, hostAddr: "0xE01F8743677Da897F4e7De9073b57Bf034FC2433" }, // arbitrum-rinkeby { chainId: 43113, hostAddr: "0xf04F2C525819691ed9ABD3D2B7109E1633795e68" }, // avalanche-fuji { chainId: 137, hostAddr: "0x3E14dC1b13c488a8d5D310918780c983bD5982E7" }, // polygon-mainnet diff --git a/packages/js-sdk/test/getConfig.test.js b/packages/js-sdk/test/getConfig.test.js index 0e2975d501..bdd72252e7 100644 --- a/packages/js-sdk/test/getConfig.test.js +++ b/packages/js-sdk/test/getConfig.test.js @@ -6,20 +6,18 @@ describe("getConfig", () => { delete process.env.RESOLVER_ADDRESS; }); - it("goerli v1", async () => { - // goerli - const goerliConfig = SuperfluidSDK.getConfig(5, "v1"); - assert.isNotEmpty(goerliConfig.resolverAddress); - assert.isNotEmpty(goerliConfig.subgraphQueryEndpoint); - assert.isUndefined(goerliConfig.versions); + it("mumbai v1", async () => { + const mumbaiConfig = SuperfluidSDK.getConfig(80001, "v1"); + assert.isNotEmpty(mumbaiConfig.resolverAddress); + assert.isNotEmpty(mumbaiConfig.subgraphQueryEndpoint); + assert.isUndefined(mumbaiConfig.versions); }); - it("goerli test", async () => { - // goerli - const goerliConfig = SuperfluidSDK.getConfig(5, "test"); - assert.isNotEmpty(goerliConfig.resolverAddress); - assert.isUndefined(goerliConfig.subgraphQueryEndpoint); - assert.isUndefined(goerliConfig.versions); + it("mumbai test", async () => { + const mumbaiConfig = SuperfluidSDK.getConfig(80001, "test"); + assert.isNotEmpty(mumbaiConfig.resolverAddress); + assert.isUndefined(mumbaiConfig.subgraphQueryEndpoint); + assert.isUndefined(mumbaiConfig.versions); }); it("defaultConfig", async () => { diff --git a/packages/metadata/CHANGELOG.md b/packages/metadata/CHANGELOG.md index fbf2f15c67..0a20d5e364 100644 --- a/packages/metadata/CHANGELOG.md +++ b/packages/metadata/CHANGELOG.md @@ -6,6 +6,8 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm ## [WIP] ### Added - toga and batchLiquidator for scroll-mainnet +### Changed +- removed eth-goerli and GΓΆrli based networks: optimism-goerli, arbitrun-goerli, base-goerli, polygon-zkevm-testnet ## [v1.1.27] ### Added diff --git a/packages/metadata/main/networks/list.cjs b/packages/metadata/main/networks/list.cjs index a67436e1f3..e626b75ce3 100644 --- a/packages/metadata/main/networks/list.cjs +++ b/packages/metadata/main/networks/list.cjs @@ -1,70 +1,6 @@ /* eslint-disable */ module.exports = [ - { - "name": "eth-goerli", - "isTestnet": true, - "networkId": 5, - "chainId": 5, - "sfId": 101, - "shortName": "goerli", - "uppercaseName": "ETH_GOERLI", - "humanReadableName": "Goerli", - "nativeTokenSymbol": "ETH", - "nativeTokenWrapper": "0x5943f705abb6834cad767e6e4bb258bc48d9c947", - "duneName": "goerli", - "contractsV1": { - "resolver": "0x071077b24943D4DC09a6A57B8aFfE2BdE9bD4B89", - "host": "0x22ff293e14F1EC3A09B137e9e06084AFd63adDF9", - "governance": "0x3a648764a6d66440ca096343937c711a7ac1b1e9", - "cfaV1": "0xEd6BcbF6907D4feEEe8a8875543249bEa9D308E8", - "cfaV1Forwarder": "0xcfA132E353cB4E398080B9700609bb008eceB125", - "idaV1": "0xfDdcdac21D64B639546f3Ce2868C7EF06036990c", - "gdaV1": "0x3dB8Abd8B696F6c4150212A85961f954825Dd4B9", - "gdaV1Forwarder": "0x6DA13Bde224A05a288748d857b9e7DDEffd1dE08", - "superTokenFactory": "0x94f26B4c8AD12B18c12f38E878618f7664bdcCE2", - "constantOutflowNFT": "0xB18cbFeA12b5CB2626C74c94920dB1B37Ae91506", - "constantInflowNFT": "0xF07df8b66ed80399B1E00981D61aD34EB4293032", - "superfluidLoader": "0x08C6Ad85c040076dD3e33Bbd963C4c37DBF6fCc4", - "toga": "0xa54FC15FC75693447d70a57262F37a70B614721b", - "flowScheduler": "0xf428308b426D7cD7Ad8eBE549d750f31C8E060Ca", - "vestingScheduler": "0xF9240F930d847F70ad900aBEE8949F25649Bf24a", - "autowrap": { - "manager": "0x0B82D14E9616ca4d260E77454834AdCf5887595F", - "wrapStrategy": "0xea49af829d3e28d3ec49e0e0a0ba1e7860a56f60" - }, - "existentialNFTCloneFactory": "0x3e5e8449477F80a3Dc0bA394882AeAB300c7F807" - }, - "startBlockV1": 3550000, - "logsQueryRange": 10000, - "explorer": "https://goerli.etherscan.io", - "subgraphV1": { - "cliName": "goerli", - "name": "protocol-v1-goerli", - "hostedEndpoint": "https://api.thegraph.com/subgraphs/name/superfluid-finance/protocol-v1-goerli" - }, - "subgraphVesting": { - "name": "vesting-v1-eth-goerli", - "hostedEndpoint": "https://api.thegraph.com/subgraphs/name/superfluid-finance/vesting-v1-eth-goerli" - }, - "subgraphFlowScheduler": { - "name": "scheduling-v1-eth-goerli", - "hostedEndpoint": "https://api.thegraph.com/subgraphs/name/superfluid-finance/scheduling-v1-eth-goerli" - }, - "subgraphAutoWrap": { - "name": "auto-wrap-v1-eth-goerli", - "hostedEndpoint": "https://api.thegraph.com/subgraphs/name/superfluid-finance/auto-wrap-v1-eth-goerli" - }, - "publicRPCs": [ - "https://rpc.ankr.com/eth_goerli", - "https://goerli.infura.io/v3/9aa3d95b3bc440fa88ea12eaa4456161" - ], - "trustedForwarders": [ - "0xE041608922d06a4F26C0d4c27d8bCD01daf1f792", - "0xb539068872230f20456CF38EC52EF2f91AF4AE49", - "0xd8253782c45a12053594b9deB72d8e8aB2Fca54c" - ] - }, { "name": "polygon-mumbai", "isTestnet": true, @@ -129,93 +65,6 @@ module.exports = "0xd8253782c45a12053594b9deB72d8e8aB2Fca54c" ] }, - { - "name": "optimism-goerli", - "isDeprecated": true, - "isTestnet": true, - "networkId": 420, - "chainId": 420, - "sfId": 103, - "shortName": "opgoerli", - "uppercaseName": "OPTIMISM_GOERLI", - "humanReadableName": "Optimism Goerli", - "nativeTokenSymbol": "ETH", - "nativeTokenWrapper": "0xE01F8743677Da897F4e7De9073b57Bf034FC2433", - "contractsV1": { - "resolver": "0x21d4E9fbB9DB742E6ef4f29d189a7C18B0b59136", - "host": "0xE40983C2476032A0915600b9472B3141aA5B5Ba9", - "cfaV1": "0xff48668fa670A85e55A7a822b352d5ccF3E7b18C", - "cfaV1Forwarder": "0xcfA132E353cB4E398080B9700609bb008eceB125", - "idaV1": "0x96215257F2FcbB00135578f766c0449d239bd92F", - "gdaV1": "0xe87F46A15C410F151309Bf7516e130087Fc6a5E5", - "gdaV1Forwarder": "0x6DA13Bde224A05a288748d857b9e7DDEffd1dE08", - "superTokenFactory": "0xfafe31cf998Df4e5D8310B03EBa8fb5bF327Eaf5", - "constantOutflowNFT": "0xDF874BA132D8C68FEb5De513790f7612Fe20dDbd", - "constantInflowNFT": "0xf88dd7208438Fdc5Ad05857eA701b7b51cdae0a9", - "superfluidLoader": "0x5Bb5908dcCC9Bb0fC39a78CfDf9e47B4C08E9521", - "existentialNFTCloneFactory": "0xFCb633f4ff90241391aD92E4678eC2a11a94a990" - }, - "startBlockV1": 340000, - "logsQueryRange": 50000, - "explorer": "https://goerli-optimism.etherscan.io", - "subgraphV1": { - "cliName": "optimism-goerli", - "name": "protocol-v1-optimism-goerli", - "hostedEndpoint": "https://api.thegraph.com/subgraphs/name/superfluid-finance/protocol-v1-optimism-goerli" - }, - "publicRPCs": [ - "https://goerli.optimism.io", - "https://opt-goerli.g.alchemy.com/v2/demo" - ], - "trustedForwarders": [ - "0x9C73373C70F23920EA54F7883dCB1F85b162Df40", - "0xb539068872230f20456CF38EC52EF2f91AF4AE49", - "0xd8253782c45a12053594b9deB72d8e8aB2Fca54c" - ] - }, - { - "name": "arbitrum-goerli", - "isDeprecated": true, - "isTestnet": true, - "networkId": 421613, - "chainId": 421613, - "sfId": 104, - "shortName": "arbgoerli", - "uppercaseName": "ARBITRUM_GOERLI", - "humanReadableName": "Arbitrum Goerli", - "nativeTokenSymbol": "ETH", - "nativeTokenWrapper": "0xE01F8743677Da897F4e7De9073b57Bf034FC2433", - "contractsV1": { - "resolver": "0x21d4E9fbB9DB742E6ef4f29d189a7C18B0b59136", - "host": "0xE40983C2476032A0915600b9472B3141aA5B5Ba9", - "cfaV1": "0xff48668fa670A85e55A7a822b352d5ccF3E7b18C", - "cfaV1Forwarder": "0xcfA132E353cB4E398080B9700609bb008eceB125", - "idaV1": "0x96215257F2FcbB00135578f766c0449d239bd92F", - "gdaV1": "0xe87F46A15C410F151309Bf7516e130087Fc6a5E5", - "gdaV1Forwarder": "0x6DA13Bde224A05a288748d857b9e7DDEffd1dE08", - "superTokenFactory": "0xfafe31cf998Df4e5D8310B03EBa8fb5bF327Eaf5", - "constantOutflowNFT": "0xDF874BA132D8C68FEb5De513790f7612Fe20dDbd", - "constantInflowNFT": "0xf88dd7208438Fdc5Ad05857eA701b7b51cdae0a9", - "superfluidLoader": "0x5Bb5908dcCC9Bb0fC39a78CfDf9e47B4C08E9521", - "existentialNFTCloneFactory": "0x22f391AB6755F0A8986AFD543289C43701beaCAa" - }, - "startBlockV1": 93000, - "logsQueryRange": 50000, - "explorer": "https://goerli.arbiscan.io", - "subgraphV1": { - "cliName": "arbitrum-goerli", - "name": "protocol-v1-arbitrum-goerli", - "hostedEndpoint": "https://api.thegraph.com/subgraphs/name/superfluid-finance/protocol-v1-arbitrum-goerli" - }, - "publicRPCs": [ - "https://goerli-rollup.arbitrum.io/rpc", - "https://arb-goerli.g.alchemy.com/v2/demo" - ], - "trustedForwarders": [ - "0xb539068872230f20456CF38EC52EF2f91AF4AE49", - "0xd8253782c45a12053594b9deB72d8e8aB2Fca54c" - ] - }, { "name": "avalanche-fuji", "isTestnet": true, @@ -301,84 +150,6 @@ module.exports = "https://ethereum-sepolia.blockpi.network/v1/rpc/public" ] }, - { - "name": "base-goerli", - "isDeprecated": true, - "isTestnet": true, - "networkId": 84531, - "chainId": 84531, - "sfId": 107, - "shortName": "bgoerli", - "uppercaseName": "BASE_GOERLI", - "humanReadableName": "Base Goerli", - "nativeTokenSymbol": "ETH", - "nativeTokenWrapper": "0x7fFCE315B2014546bA461d54eDed7AAc70DF4f53", - "contractsV1": { - "resolver": "0x598D5dB9902cbBd6e8Ee9CDb3A231377cdA2f018", - "host": "0x507c3a7C6Ccc253884A2e3a3ee2A211cC7E796a6", - "cfaV1": "0x4C476F2Fb27272680F2f6f2592E94d9e704691bC", - "cfaV1Forwarder": "0xcfA132E353cB4E398080B9700609bb008eceB125", - "idaV1": "0xaa4FCc799B8857FA87b2945Dc6572D5d76b35485", - "superTokenFactory": "0x1015BE31D7711D95d2c3444708FB53cC851ba856", - "constantOutflowNFT": "0x4E89088Cd14064f38E5B2F309cFaB9C864F9a8e6", - "constantInflowNFT": "0xda6db863cb2EE39b196edB8159c38A1ed5c55344", - "superfluidLoader": "0x15F0Ca26781C3852f8166eD2ebce5D18265cceb7", - "existentialNFTCloneFactory": "0x42B332F56BCD15F0D7cd523E5eC26Cd0734621eD" - }, - "startBlockV1": 5249500, - "logsQueryRange": 10000, - "explorer": "https://goerli.basescan.org/", - "subgraphV1": { - "cliName": "base-testnet", - "name": "protocol-v1-base-goerli" - }, - "publicRPCs": [ - "https://goerli.base.org", - "https://base-goerli.public.blastapi.io" - ], - "trustedForwarders": [ - "0xb539068872230f20456CF38EC52EF2f91AF4AE49", - "0xd8253782c45a12053594b9deB72d8e8aB2Fca54c" - ] - }, - { - "name": "polygon-zkevm-testnet", - "isTestnet": true, - "networkId": 1442, - "chainId": 1442, - "sfId": 108, - "shortName": "pzkevmtest", - "uppercaseName": "POLYGON_ZKEVM_TESTNET", - "humanReadableName": "Polygon zkEVM Testnet", - "nativeTokenSymbol": "ETH", - "nativeTokenWrapper": "0x6345Aa6cec42a85160CF436810F97661e28c1876", - "contractsV1": { - "resolver": "0x642332562BC60a4Bd9681E7bb1588f7456A497aC", - "host": "0xe64f81d5dDdA1c7172e5C6d964E8ef1BD82D8704", - "cfaV1": "0x1EAa5ceA064aab2692AF257FB31f5291fdA3Cdee", - "cfaV1Forwarder": "0xcfA132E353cB4E398080B9700609bb008eceB125", - "idaV1": "0xBf22019a4A4430bA67D3B0c8B4d5Edc48F913301", - "gdaV1": "0x11C3c89701E6b0BA7576543dBa0c81Bd74c53e13", - "gdaV1Forwarder": "0x6DA13Bde224A05a288748d857b9e7DDEffd1dE08", - "superTokenFactory": "0x0F3B163623F05b2BfF42956f7C7bd31456bd83a2", - "constantOutflowNFT": "0xDBD6f113E46A99D7BF95edfa47390c0c8127E922", - "constantInflowNFT": "0xcb05535bd212eCFC4B7b9db81d6C2C768b726776", - "superfluidLoader": "0x712A3edF1fb9070695BF08Adf82C289fB1972E78", - "existentialNFTCloneFactory": "0x70bbB7a057A13070dF11d533e8f299357D778637" - }, - "startBlockV1": 726000, - "logsQueryRange": 20000, - "explorer": "https://testnet-zkevm.polygonscan.org/", - "subgraphV1": { - "cliName": "polygon-zkevm-testnet", - "name": "protocol-v1-polygon-zkevm-testnet" - }, - "publicRPCs": ["https://rpc.public.zkevm-test.net"], - "trustedForwarders": [ - "0xb539068872230f20456CF38EC52EF2f91AF4AE49", - "0xd8253782c45a12053594b9deB72d8e8aB2Fca54c" - ] - }, { "name": "optimism-sepolia", "isTestnet": true, diff --git a/packages/metadata/module/networks/list.js b/packages/metadata/module/networks/list.js index 323f691e39..4bf1c6e22b 100644 --- a/packages/metadata/module/networks/list.js +++ b/packages/metadata/module/networks/list.js @@ -1,70 +1,6 @@ /* eslint-disable */ export default [ - { - "name": "eth-goerli", - "isTestnet": true, - "networkId": 5, - "chainId": 5, - "sfId": 101, - "shortName": "goerli", - "uppercaseName": "ETH_GOERLI", - "humanReadableName": "Goerli", - "nativeTokenSymbol": "ETH", - "nativeTokenWrapper": "0x5943f705abb6834cad767e6e4bb258bc48d9c947", - "duneName": "goerli", - "contractsV1": { - "resolver": "0x071077b24943D4DC09a6A57B8aFfE2BdE9bD4B89", - "host": "0x22ff293e14F1EC3A09B137e9e06084AFd63adDF9", - "governance": "0x3a648764a6d66440ca096343937c711a7ac1b1e9", - "cfaV1": "0xEd6BcbF6907D4feEEe8a8875543249bEa9D308E8", - "cfaV1Forwarder": "0xcfA132E353cB4E398080B9700609bb008eceB125", - "idaV1": "0xfDdcdac21D64B639546f3Ce2868C7EF06036990c", - "gdaV1": "0x3dB8Abd8B696F6c4150212A85961f954825Dd4B9", - "gdaV1Forwarder": "0x6DA13Bde224A05a288748d857b9e7DDEffd1dE08", - "superTokenFactory": "0x94f26B4c8AD12B18c12f38E878618f7664bdcCE2", - "constantOutflowNFT": "0xB18cbFeA12b5CB2626C74c94920dB1B37Ae91506", - "constantInflowNFT": "0xF07df8b66ed80399B1E00981D61aD34EB4293032", - "superfluidLoader": "0x08C6Ad85c040076dD3e33Bbd963C4c37DBF6fCc4", - "toga": "0xa54FC15FC75693447d70a57262F37a70B614721b", - "flowScheduler": "0xf428308b426D7cD7Ad8eBE549d750f31C8E060Ca", - "vestingScheduler": "0xF9240F930d847F70ad900aBEE8949F25649Bf24a", - "autowrap": { - "manager": "0x0B82D14E9616ca4d260E77454834AdCf5887595F", - "wrapStrategy": "0xea49af829d3e28d3ec49e0e0a0ba1e7860a56f60" - }, - "existentialNFTCloneFactory": "0x3e5e8449477F80a3Dc0bA394882AeAB300c7F807" - }, - "startBlockV1": 3550000, - "logsQueryRange": 10000, - "explorer": "https://goerli.etherscan.io", - "subgraphV1": { - "cliName": "goerli", - "name": "protocol-v1-goerli", - "hostedEndpoint": "https://api.thegraph.com/subgraphs/name/superfluid-finance/protocol-v1-goerli" - }, - "subgraphVesting": { - "name": "vesting-v1-eth-goerli", - "hostedEndpoint": "https://api.thegraph.com/subgraphs/name/superfluid-finance/vesting-v1-eth-goerli" - }, - "subgraphFlowScheduler": { - "name": "scheduling-v1-eth-goerli", - "hostedEndpoint": "https://api.thegraph.com/subgraphs/name/superfluid-finance/scheduling-v1-eth-goerli" - }, - "subgraphAutoWrap": { - "name": "auto-wrap-v1-eth-goerli", - "hostedEndpoint": "https://api.thegraph.com/subgraphs/name/superfluid-finance/auto-wrap-v1-eth-goerli" - }, - "publicRPCs": [ - "https://rpc.ankr.com/eth_goerli", - "https://goerli.infura.io/v3/9aa3d95b3bc440fa88ea12eaa4456161" - ], - "trustedForwarders": [ - "0xE041608922d06a4F26C0d4c27d8bCD01daf1f792", - "0xb539068872230f20456CF38EC52EF2f91AF4AE49", - "0xd8253782c45a12053594b9deB72d8e8aB2Fca54c" - ] - }, { "name": "polygon-mumbai", "isTestnet": true, @@ -129,93 +65,6 @@ export default "0xd8253782c45a12053594b9deB72d8e8aB2Fca54c" ] }, - { - "name": "optimism-goerli", - "isDeprecated": true, - "isTestnet": true, - "networkId": 420, - "chainId": 420, - "sfId": 103, - "shortName": "opgoerli", - "uppercaseName": "OPTIMISM_GOERLI", - "humanReadableName": "Optimism Goerli", - "nativeTokenSymbol": "ETH", - "nativeTokenWrapper": "0xE01F8743677Da897F4e7De9073b57Bf034FC2433", - "contractsV1": { - "resolver": "0x21d4E9fbB9DB742E6ef4f29d189a7C18B0b59136", - "host": "0xE40983C2476032A0915600b9472B3141aA5B5Ba9", - "cfaV1": "0xff48668fa670A85e55A7a822b352d5ccF3E7b18C", - "cfaV1Forwarder": "0xcfA132E353cB4E398080B9700609bb008eceB125", - "idaV1": "0x96215257F2FcbB00135578f766c0449d239bd92F", - "gdaV1": "0xe87F46A15C410F151309Bf7516e130087Fc6a5E5", - "gdaV1Forwarder": "0x6DA13Bde224A05a288748d857b9e7DDEffd1dE08", - "superTokenFactory": "0xfafe31cf998Df4e5D8310B03EBa8fb5bF327Eaf5", - "constantOutflowNFT": "0xDF874BA132D8C68FEb5De513790f7612Fe20dDbd", - "constantInflowNFT": "0xf88dd7208438Fdc5Ad05857eA701b7b51cdae0a9", - "superfluidLoader": "0x5Bb5908dcCC9Bb0fC39a78CfDf9e47B4C08E9521", - "existentialNFTCloneFactory": "0xFCb633f4ff90241391aD92E4678eC2a11a94a990" - }, - "startBlockV1": 340000, - "logsQueryRange": 50000, - "explorer": "https://goerli-optimism.etherscan.io", - "subgraphV1": { - "cliName": "optimism-goerli", - "name": "protocol-v1-optimism-goerli", - "hostedEndpoint": "https://api.thegraph.com/subgraphs/name/superfluid-finance/protocol-v1-optimism-goerli" - }, - "publicRPCs": [ - "https://goerli.optimism.io", - "https://opt-goerli.g.alchemy.com/v2/demo" - ], - "trustedForwarders": [ - "0x9C73373C70F23920EA54F7883dCB1F85b162Df40", - "0xb539068872230f20456CF38EC52EF2f91AF4AE49", - "0xd8253782c45a12053594b9deB72d8e8aB2Fca54c" - ] - }, - { - "name": "arbitrum-goerli", - "isDeprecated": true, - "isTestnet": true, - "networkId": 421613, - "chainId": 421613, - "sfId": 104, - "shortName": "arbgoerli", - "uppercaseName": "ARBITRUM_GOERLI", - "humanReadableName": "Arbitrum Goerli", - "nativeTokenSymbol": "ETH", - "nativeTokenWrapper": "0xE01F8743677Da897F4e7De9073b57Bf034FC2433", - "contractsV1": { - "resolver": "0x21d4E9fbB9DB742E6ef4f29d189a7C18B0b59136", - "host": "0xE40983C2476032A0915600b9472B3141aA5B5Ba9", - "cfaV1": "0xff48668fa670A85e55A7a822b352d5ccF3E7b18C", - "cfaV1Forwarder": "0xcfA132E353cB4E398080B9700609bb008eceB125", - "idaV1": "0x96215257F2FcbB00135578f766c0449d239bd92F", - "gdaV1": "0xe87F46A15C410F151309Bf7516e130087Fc6a5E5", - "gdaV1Forwarder": "0x6DA13Bde224A05a288748d857b9e7DDEffd1dE08", - "superTokenFactory": "0xfafe31cf998Df4e5D8310B03EBa8fb5bF327Eaf5", - "constantOutflowNFT": "0xDF874BA132D8C68FEb5De513790f7612Fe20dDbd", - "constantInflowNFT": "0xf88dd7208438Fdc5Ad05857eA701b7b51cdae0a9", - "superfluidLoader": "0x5Bb5908dcCC9Bb0fC39a78CfDf9e47B4C08E9521", - "existentialNFTCloneFactory": "0x22f391AB6755F0A8986AFD543289C43701beaCAa" - }, - "startBlockV1": 93000, - "logsQueryRange": 50000, - "explorer": "https://goerli.arbiscan.io", - "subgraphV1": { - "cliName": "arbitrum-goerli", - "name": "protocol-v1-arbitrum-goerli", - "hostedEndpoint": "https://api.thegraph.com/subgraphs/name/superfluid-finance/protocol-v1-arbitrum-goerli" - }, - "publicRPCs": [ - "https://goerli-rollup.arbitrum.io/rpc", - "https://arb-goerli.g.alchemy.com/v2/demo" - ], - "trustedForwarders": [ - "0xb539068872230f20456CF38EC52EF2f91AF4AE49", - "0xd8253782c45a12053594b9deB72d8e8aB2Fca54c" - ] - }, { "name": "avalanche-fuji", "isTestnet": true, @@ -301,84 +150,6 @@ export default "https://ethereum-sepolia.blockpi.network/v1/rpc/public" ] }, - { - "name": "base-goerli", - "isDeprecated": true, - "isTestnet": true, - "networkId": 84531, - "chainId": 84531, - "sfId": 107, - "shortName": "bgoerli", - "uppercaseName": "BASE_GOERLI", - "humanReadableName": "Base Goerli", - "nativeTokenSymbol": "ETH", - "nativeTokenWrapper": "0x7fFCE315B2014546bA461d54eDed7AAc70DF4f53", - "contractsV1": { - "resolver": "0x598D5dB9902cbBd6e8Ee9CDb3A231377cdA2f018", - "host": "0x507c3a7C6Ccc253884A2e3a3ee2A211cC7E796a6", - "cfaV1": "0x4C476F2Fb27272680F2f6f2592E94d9e704691bC", - "cfaV1Forwarder": "0xcfA132E353cB4E398080B9700609bb008eceB125", - "idaV1": "0xaa4FCc799B8857FA87b2945Dc6572D5d76b35485", - "superTokenFactory": "0x1015BE31D7711D95d2c3444708FB53cC851ba856", - "constantOutflowNFT": "0x4E89088Cd14064f38E5B2F309cFaB9C864F9a8e6", - "constantInflowNFT": "0xda6db863cb2EE39b196edB8159c38A1ed5c55344", - "superfluidLoader": "0x15F0Ca26781C3852f8166eD2ebce5D18265cceb7", - "existentialNFTCloneFactory": "0x42B332F56BCD15F0D7cd523E5eC26Cd0734621eD" - }, - "startBlockV1": 5249500, - "logsQueryRange": 10000, - "explorer": "https://goerli.basescan.org/", - "subgraphV1": { - "cliName": "base-testnet", - "name": "protocol-v1-base-goerli" - }, - "publicRPCs": [ - "https://goerli.base.org", - "https://base-goerli.public.blastapi.io" - ], - "trustedForwarders": [ - "0xb539068872230f20456CF38EC52EF2f91AF4AE49", - "0xd8253782c45a12053594b9deB72d8e8aB2Fca54c" - ] - }, - { - "name": "polygon-zkevm-testnet", - "isTestnet": true, - "networkId": 1442, - "chainId": 1442, - "sfId": 108, - "shortName": "pzkevmtest", - "uppercaseName": "POLYGON_ZKEVM_TESTNET", - "humanReadableName": "Polygon zkEVM Testnet", - "nativeTokenSymbol": "ETH", - "nativeTokenWrapper": "0x6345Aa6cec42a85160CF436810F97661e28c1876", - "contractsV1": { - "resolver": "0x642332562BC60a4Bd9681E7bb1588f7456A497aC", - "host": "0xe64f81d5dDdA1c7172e5C6d964E8ef1BD82D8704", - "cfaV1": "0x1EAa5ceA064aab2692AF257FB31f5291fdA3Cdee", - "cfaV1Forwarder": "0xcfA132E353cB4E398080B9700609bb008eceB125", - "idaV1": "0xBf22019a4A4430bA67D3B0c8B4d5Edc48F913301", - "gdaV1": "0x11C3c89701E6b0BA7576543dBa0c81Bd74c53e13", - "gdaV1Forwarder": "0x6DA13Bde224A05a288748d857b9e7DDEffd1dE08", - "superTokenFactory": "0x0F3B163623F05b2BfF42956f7C7bd31456bd83a2", - "constantOutflowNFT": "0xDBD6f113E46A99D7BF95edfa47390c0c8127E922", - "constantInflowNFT": "0xcb05535bd212eCFC4B7b9db81d6C2C768b726776", - "superfluidLoader": "0x712A3edF1fb9070695BF08Adf82C289fB1972E78", - "existentialNFTCloneFactory": "0x70bbB7a057A13070dF11d533e8f299357D778637" - }, - "startBlockV1": 726000, - "logsQueryRange": 20000, - "explorer": "https://testnet-zkevm.polygonscan.org/", - "subgraphV1": { - "cliName": "polygon-zkevm-testnet", - "name": "protocol-v1-polygon-zkevm-testnet" - }, - "publicRPCs": ["https://rpc.public.zkevm-test.net"], - "trustedForwarders": [ - "0xb539068872230f20456CF38EC52EF2f91AF4AE49", - "0xd8253782c45a12053594b9deB72d8e8aB2Fca54c" - ] - }, { "name": "optimism-sepolia", "isTestnet": true, diff --git a/packages/metadata/networks.json b/packages/metadata/networks.json index b0ab97332a..88255aad67 100644 --- a/packages/metadata/networks.json +++ b/packages/metadata/networks.json @@ -1,68 +1,4 @@ [ - { - "name": "eth-goerli", - "isTestnet": true, - "networkId": 5, - "chainId": 5, - "sfId": 101, - "shortName": "goerli", - "uppercaseName": "ETH_GOERLI", - "humanReadableName": "Goerli", - "nativeTokenSymbol": "ETH", - "nativeTokenWrapper": "0x5943f705abb6834cad767e6e4bb258bc48d9c947", - "duneName": "goerli", - "contractsV1": { - "resolver": "0x071077b24943D4DC09a6A57B8aFfE2BdE9bD4B89", - "host": "0x22ff293e14F1EC3A09B137e9e06084AFd63adDF9", - "governance": "0x3a648764a6d66440ca096343937c711a7ac1b1e9", - "cfaV1": "0xEd6BcbF6907D4feEEe8a8875543249bEa9D308E8", - "cfaV1Forwarder": "0xcfA132E353cB4E398080B9700609bb008eceB125", - "idaV1": "0xfDdcdac21D64B639546f3Ce2868C7EF06036990c", - "gdaV1": "0x3dB8Abd8B696F6c4150212A85961f954825Dd4B9", - "gdaV1Forwarder": "0x6DA13Bde224A05a288748d857b9e7DDEffd1dE08", - "superTokenFactory": "0x94f26B4c8AD12B18c12f38E878618f7664bdcCE2", - "constantOutflowNFT": "0xB18cbFeA12b5CB2626C74c94920dB1B37Ae91506", - "constantInflowNFT": "0xF07df8b66ed80399B1E00981D61aD34EB4293032", - "superfluidLoader": "0x08C6Ad85c040076dD3e33Bbd963C4c37DBF6fCc4", - "toga": "0xa54FC15FC75693447d70a57262F37a70B614721b", - "flowScheduler": "0xf428308b426D7cD7Ad8eBE549d750f31C8E060Ca", - "vestingScheduler": "0xF9240F930d847F70ad900aBEE8949F25649Bf24a", - "autowrap": { - "manager": "0x0B82D14E9616ca4d260E77454834AdCf5887595F", - "wrapStrategy": "0xea49af829d3e28d3ec49e0e0a0ba1e7860a56f60" - }, - "existentialNFTCloneFactory": "0x3e5e8449477F80a3Dc0bA394882AeAB300c7F807" - }, - "startBlockV1": 3550000, - "logsQueryRange": 10000, - "explorer": "https://goerli.etherscan.io", - "subgraphV1": { - "cliName": "goerli", - "name": "protocol-v1-goerli", - "hostedEndpoint": "https://api.thegraph.com/subgraphs/name/superfluid-finance/protocol-v1-goerli" - }, - "subgraphVesting": { - "name": "vesting-v1-eth-goerli", - "hostedEndpoint": "https://api.thegraph.com/subgraphs/name/superfluid-finance/vesting-v1-eth-goerli" - }, - "subgraphFlowScheduler": { - "name": "scheduling-v1-eth-goerli", - "hostedEndpoint": "https://api.thegraph.com/subgraphs/name/superfluid-finance/scheduling-v1-eth-goerli" - }, - "subgraphAutoWrap": { - "name": "auto-wrap-v1-eth-goerli", - "hostedEndpoint": "https://api.thegraph.com/subgraphs/name/superfluid-finance/auto-wrap-v1-eth-goerli" - }, - "publicRPCs": [ - "https://rpc.ankr.com/eth_goerli", - "https://goerli.infura.io/v3/9aa3d95b3bc440fa88ea12eaa4456161" - ], - "trustedForwarders": [ - "0xE041608922d06a4F26C0d4c27d8bCD01daf1f792", - "0xb539068872230f20456CF38EC52EF2f91AF4AE49", - "0xd8253782c45a12053594b9deB72d8e8aB2Fca54c" - ] - }, { "name": "polygon-mumbai", "isTestnet": true, @@ -127,93 +63,6 @@ "0xd8253782c45a12053594b9deB72d8e8aB2Fca54c" ] }, - { - "name": "optimism-goerli", - "isDeprecated": true, - "isTestnet": true, - "networkId": 420, - "chainId": 420, - "sfId": 103, - "shortName": "opgoerli", - "uppercaseName": "OPTIMISM_GOERLI", - "humanReadableName": "Optimism Goerli", - "nativeTokenSymbol": "ETH", - "nativeTokenWrapper": "0xE01F8743677Da897F4e7De9073b57Bf034FC2433", - "contractsV1": { - "resolver": "0x21d4E9fbB9DB742E6ef4f29d189a7C18B0b59136", - "host": "0xE40983C2476032A0915600b9472B3141aA5B5Ba9", - "cfaV1": "0xff48668fa670A85e55A7a822b352d5ccF3E7b18C", - "cfaV1Forwarder": "0xcfA132E353cB4E398080B9700609bb008eceB125", - "idaV1": "0x96215257F2FcbB00135578f766c0449d239bd92F", - "gdaV1": "0xe87F46A15C410F151309Bf7516e130087Fc6a5E5", - "gdaV1Forwarder": "0x6DA13Bde224A05a288748d857b9e7DDEffd1dE08", - "superTokenFactory": "0xfafe31cf998Df4e5D8310B03EBa8fb5bF327Eaf5", - "constantOutflowNFT": "0xDF874BA132D8C68FEb5De513790f7612Fe20dDbd", - "constantInflowNFT": "0xf88dd7208438Fdc5Ad05857eA701b7b51cdae0a9", - "superfluidLoader": "0x5Bb5908dcCC9Bb0fC39a78CfDf9e47B4C08E9521", - "existentialNFTCloneFactory": "0xFCb633f4ff90241391aD92E4678eC2a11a94a990" - }, - "startBlockV1": 340000, - "logsQueryRange": 50000, - "explorer": "https://goerli-optimism.etherscan.io", - "subgraphV1": { - "cliName": "optimism-goerli", - "name": "protocol-v1-optimism-goerli", - "hostedEndpoint": "https://api.thegraph.com/subgraphs/name/superfluid-finance/protocol-v1-optimism-goerli" - }, - "publicRPCs": [ - "https://goerli.optimism.io", - "https://opt-goerli.g.alchemy.com/v2/demo" - ], - "trustedForwarders": [ - "0x9C73373C70F23920EA54F7883dCB1F85b162Df40", - "0xb539068872230f20456CF38EC52EF2f91AF4AE49", - "0xd8253782c45a12053594b9deB72d8e8aB2Fca54c" - ] - }, - { - "name": "arbitrum-goerli", - "isDeprecated": true, - "isTestnet": true, - "networkId": 421613, - "chainId": 421613, - "sfId": 104, - "shortName": "arbgoerli", - "uppercaseName": "ARBITRUM_GOERLI", - "humanReadableName": "Arbitrum Goerli", - "nativeTokenSymbol": "ETH", - "nativeTokenWrapper": "0xE01F8743677Da897F4e7De9073b57Bf034FC2433", - "contractsV1": { - "resolver": "0x21d4E9fbB9DB742E6ef4f29d189a7C18B0b59136", - "host": "0xE40983C2476032A0915600b9472B3141aA5B5Ba9", - "cfaV1": "0xff48668fa670A85e55A7a822b352d5ccF3E7b18C", - "cfaV1Forwarder": "0xcfA132E353cB4E398080B9700609bb008eceB125", - "idaV1": "0x96215257F2FcbB00135578f766c0449d239bd92F", - "gdaV1": "0xe87F46A15C410F151309Bf7516e130087Fc6a5E5", - "gdaV1Forwarder": "0x6DA13Bde224A05a288748d857b9e7DDEffd1dE08", - "superTokenFactory": "0xfafe31cf998Df4e5D8310B03EBa8fb5bF327Eaf5", - "constantOutflowNFT": "0xDF874BA132D8C68FEb5De513790f7612Fe20dDbd", - "constantInflowNFT": "0xf88dd7208438Fdc5Ad05857eA701b7b51cdae0a9", - "superfluidLoader": "0x5Bb5908dcCC9Bb0fC39a78CfDf9e47B4C08E9521", - "existentialNFTCloneFactory": "0x22f391AB6755F0A8986AFD543289C43701beaCAa" - }, - "startBlockV1": 93000, - "logsQueryRange": 50000, - "explorer": "https://goerli.arbiscan.io", - "subgraphV1": { - "cliName": "arbitrum-goerli", - "name": "protocol-v1-arbitrum-goerli", - "hostedEndpoint": "https://api.thegraph.com/subgraphs/name/superfluid-finance/protocol-v1-arbitrum-goerli" - }, - "publicRPCs": [ - "https://goerli-rollup.arbitrum.io/rpc", - "https://arb-goerli.g.alchemy.com/v2/demo" - ], - "trustedForwarders": [ - "0xb539068872230f20456CF38EC52EF2f91AF4AE49", - "0xd8253782c45a12053594b9deB72d8e8aB2Fca54c" - ] - }, { "name": "avalanche-fuji", "isTestnet": true, @@ -299,84 +148,6 @@ "https://ethereum-sepolia.blockpi.network/v1/rpc/public" ] }, - { - "name": "base-goerli", - "isDeprecated": true, - "isTestnet": true, - "networkId": 84531, - "chainId": 84531, - "sfId": 107, - "shortName": "bgoerli", - "uppercaseName": "BASE_GOERLI", - "humanReadableName": "Base Goerli", - "nativeTokenSymbol": "ETH", - "nativeTokenWrapper": "0x7fFCE315B2014546bA461d54eDed7AAc70DF4f53", - "contractsV1": { - "resolver": "0x598D5dB9902cbBd6e8Ee9CDb3A231377cdA2f018", - "host": "0x507c3a7C6Ccc253884A2e3a3ee2A211cC7E796a6", - "cfaV1": "0x4C476F2Fb27272680F2f6f2592E94d9e704691bC", - "cfaV1Forwarder": "0xcfA132E353cB4E398080B9700609bb008eceB125", - "idaV1": "0xaa4FCc799B8857FA87b2945Dc6572D5d76b35485", - "superTokenFactory": "0x1015BE31D7711D95d2c3444708FB53cC851ba856", - "constantOutflowNFT": "0x4E89088Cd14064f38E5B2F309cFaB9C864F9a8e6", - "constantInflowNFT": "0xda6db863cb2EE39b196edB8159c38A1ed5c55344", - "superfluidLoader": "0x15F0Ca26781C3852f8166eD2ebce5D18265cceb7", - "existentialNFTCloneFactory": "0x42B332F56BCD15F0D7cd523E5eC26Cd0734621eD" - }, - "startBlockV1": 5249500, - "logsQueryRange": 10000, - "explorer": "https://goerli.basescan.org/", - "subgraphV1": { - "cliName": "base-testnet", - "name": "protocol-v1-base-goerli" - }, - "publicRPCs": [ - "https://goerli.base.org", - "https://base-goerli.public.blastapi.io" - ], - "trustedForwarders": [ - "0xb539068872230f20456CF38EC52EF2f91AF4AE49", - "0xd8253782c45a12053594b9deB72d8e8aB2Fca54c" - ] - }, - { - "name": "polygon-zkevm-testnet", - "isTestnet": true, - "networkId": 1442, - "chainId": 1442, - "sfId": 108, - "shortName": "pzkevmtest", - "uppercaseName": "POLYGON_ZKEVM_TESTNET", - "humanReadableName": "Polygon zkEVM Testnet", - "nativeTokenSymbol": "ETH", - "nativeTokenWrapper": "0x6345Aa6cec42a85160CF436810F97661e28c1876", - "contractsV1": { - "resolver": "0x642332562BC60a4Bd9681E7bb1588f7456A497aC", - "host": "0xe64f81d5dDdA1c7172e5C6d964E8ef1BD82D8704", - "cfaV1": "0x1EAa5ceA064aab2692AF257FB31f5291fdA3Cdee", - "cfaV1Forwarder": "0xcfA132E353cB4E398080B9700609bb008eceB125", - "idaV1": "0xBf22019a4A4430bA67D3B0c8B4d5Edc48F913301", - "gdaV1": "0x11C3c89701E6b0BA7576543dBa0c81Bd74c53e13", - "gdaV1Forwarder": "0x6DA13Bde224A05a288748d857b9e7DDEffd1dE08", - "superTokenFactory": "0x0F3B163623F05b2BfF42956f7C7bd31456bd83a2", - "constantOutflowNFT": "0xDBD6f113E46A99D7BF95edfa47390c0c8127E922", - "constantInflowNFT": "0xcb05535bd212eCFC4B7b9db81d6C2C768b726776", - "superfluidLoader": "0x712A3edF1fb9070695BF08Adf82C289fB1972E78", - "existentialNFTCloneFactory": "0x70bbB7a057A13070dF11d533e8f299357D778637" - }, - "startBlockV1": 726000, - "logsQueryRange": 20000, - "explorer": "https://testnet-zkevm.polygonscan.org/", - "subgraphV1": { - "cliName": "polygon-zkevm-testnet", - "name": "protocol-v1-polygon-zkevm-testnet" - }, - "publicRPCs": ["https://rpc.public.zkevm-test.net"], - "trustedForwarders": [ - "0xb539068872230f20456CF38EC52EF2f91AF4AE49", - "0xd8253782c45a12053594b9deB72d8e8aB2Fca54c" - ] - }, { "name": "optimism-sepolia", "isTestnet": true, diff --git a/packages/sdk-core/package.json b/packages/sdk-core/package.json index c2ec30be77..9135fef0bd 100644 --- a/packages/sdk-core/package.json +++ b/packages/sdk-core/package.json @@ -48,8 +48,8 @@ "generate-graphql-schema": "yarn generate-graphql-schema:v1", "generate-graphql-schema:local": "get-graphql-schema http://localhost:8000/subgraphs/name/superfluid-test > src/subgraph/schema.graphql", "generate-graphql-schema:v1": "get-graphql-schema https://api.thegraph.com/subgraphs/name/superfluid-finance/protocol-v1-mumbai > src/subgraph/schema.graphql", - "generate-graphql-schema:dev": "get-graphql-schema https://api.thegraph.com/subgraphs/name/superfluid-finance/protocol-dev-goerli > src/subgraph/schema.graphql", - "generate-graphql-schema:feature": "get-graphql-schema https://api.thegraph.com/subgraphs/name/superfluid-finance/protocol-feature-goerli > src/subgraph/schema.graphql", + "generate-graphql-schema:dev": "get-graphql-schema https://api.thegraph.com/subgraphs/name/superfluid-finance/protocol-dev-mumbai > src/subgraph/schema.graphql", + "generate-graphql-schema:feature": "get-graphql-schema https://api.thegraph.com/subgraphs/name/superfluid-finance/protocol-feature-mumbai > src/subgraph/schema.graphql", "cloc": "sh tasks/cloc.sh" }, "bugs": { diff --git a/packages/sdk-core/previous-versions-testing/queryTests.ts b/packages/sdk-core/previous-versions-testing/queryTests.ts index 2fa783e905..2e38fae95f 100644 --- a/packages/sdk-core/previous-versions-testing/queryTests.ts +++ b/packages/sdk-core/previous-versions-testing/queryTests.ts @@ -5,14 +5,14 @@ import metadata from "@superfluid-finance/metadata"; /** * We only use matic network endpoints for v1 release tests - * otherwise, we use goerli + * otherwise, we use mumbai * @returns chainId */ export const getChainId = () => { // null coalesce, but this should NEVER return null for either return process.env.SUBGRAPH_RELEASE_TAG == "v1" ? metadata.getNetworkByShortName("matic")?.chainId ?? 0 - : metadata.getNetworkByShortName("goerli")?.chainId ?? 0; + : metadata.getNetworkByShortName("mumbai")?.chainId ?? 0; }; export const testQueryClassFunctions = async (query: Query) => { diff --git a/packages/sdk-core/src/subgraph/.graphqlconfig b/packages/sdk-core/src/subgraph/.graphqlconfig index fe91d7d5a0..bad7321ceb 100644 --- a/packages/sdk-core/src/subgraph/.graphqlconfig +++ b/packages/sdk-core/src/subgraph/.graphqlconfig @@ -4,7 +4,7 @@ "extensions": { "endpoints": { "Default GraphQL Endpoint": { - "url": "https://api.thegraph.com/subgraphs/name/superfluid-finance/protocol-feature-goerli", + "url": "https://api.thegraph.com/subgraphs/name/superfluid-finance/protocol-feature-mumbai", "headers": { "user-agent": "JS GraphQL" }, diff --git a/packages/sdk-core/tasks/testSchemasAndQueries.sh b/packages/sdk-core/tasks/testSchemasAndQueries.sh index dc085a9838..bae1f2f734 100755 --- a/packages/sdk-core/tasks/testSchemasAndQueries.sh +++ b/packages/sdk-core/tasks/testSchemasAndQueries.sh @@ -6,9 +6,9 @@ JQ="npx --package=node-jq -- jq" set -xe if [ "$SUBGRAPH_RELEASE_TAG" == "feature" ];then - # we only support matic and goerli feature endpoints + # we only support matic and mumbai feature endpoints # however, we don't want to be blocked by matic for feature - NETWORKS=("goerli") + NETWORKS=("mumbai") fi if [ "$SUBGRAPH_RELEASE_TAG" == "dev" ] || [ "$SUBGRAPH_RELEASE_TAG" == "v1" ];then @@ -31,7 +31,6 @@ for i in "${NETWORKS[@]}";do declare -A LEGACY_NETWORK_NAMES=( ["xdai-mainnet"]="xdai" ["polygon-mainnet"]="matic" - ["eth-goerli"]="goerli" ["polygon-mumbai"]="mumbai" ) diff --git a/packages/sdk-core/test/0_framework.test.ts b/packages/sdk-core/test/0_framework.test.ts index 36b96f5860..b1590494d6 100644 --- a/packages/sdk-core/test/0_framework.test.ts +++ b/packages/sdk-core/test/0_framework.test.ts @@ -27,7 +27,7 @@ makeSuite("Framework Tests", (testEnv: TestEnvironment) => { try { await Framework.create({ // force cast because we know this exists - chainId: networkNameToChainIdMap.get("eth-goerli")!, + chainId: networkNameToChainIdMap.get("polygon-mumbai")!, provider: testEnv.provider, }); } catch (err: any) { @@ -36,7 +36,7 @@ makeSuite("Framework Tests", (testEnv: TestEnvironment) => { "Network Mismatch Error: Your provider network chainId is: " + chainId + " whereas your desired chainId is: " + - networkNameToChainIdMap.get("eth-goerli")! + networkNameToChainIdMap.get("polygon-mumbai")! ); } }); diff --git a/packages/subgraph/.env.example b/packages/subgraph/.env.example index 9171ebc8fe..40b56851ad 100644 --- a/packages/subgraph/.env.example +++ b/packages/subgraph/.env.example @@ -4,6 +4,5 @@ MATIC_PROVIDER_URL= ARBITRUM_ONE_PROVIDER_URL= AVALANCHE_C_PROVIDER_URL= BSC_MAINNET_PROVIDER_URL= -GOERLI_PROVIDER_URL= AVAFUJI_PROVIDER_URL= -MUMBAI_PROVIDER_URL= \ No newline at end of file +MUMBAI_PROVIDER_URL= diff --git a/packages/subgraph/README.md b/packages/subgraph/README.md index 928095a5d8..6f2f461e64 100644 --- a/packages/subgraph/README.md +++ b/packages/subgraph/README.md @@ -20,51 +20,10 @@ Get started using the Subgraphs with an introduction and query examples: https://docs.superfluid.finance/superfluid/docs/subgraph -# πŸ‘¨β€πŸš€ Hosted Subgraphs - -All subgraphs are available via The Graph's hosted service: - -**V1 Endpoints** -| Network | URL | -| --- | --- | -| Matic | https://thegraph.com/explorer/subgraph/superfluid-finance/protocol-v1-matic | -| Gnosis | https://thegraph.com/explorer/subgraph/superfluid-finance/protocol-v1-xdai | -| Optimism Mainnet | https://thegraph.com/explorer/subgraph/superfluid-finance/protocol-v1-optimism-mainnet | -| Arbitrum One | https://thegraph.com/explorer/subgraph/superfluid-finance/protocol-v1-arbitrum-one | -| Avalanche C-Chain | https://thegraph.com/explorer/subgraph/superfluid-finance/protocol-v1-avalanche-c | -| BNB Chain | https://thegraph.com/explorer/subgraph/superfluid-finance/protocol-v1-bsc-mainnet | -| Goerli | https://thegraph.com/explorer/subgraph/superfluid-finance/protocol-v1-goerli | -| Mumbai | https://thegraph.com/explorer/subgraph/superfluid-finance/protocol-v1-mumbai | -| Optimism Goerli | https://thegraph.com/explorer/subgraph/superfluid-finance/protocol-v1-optimism-goerli | -| Arbitrum Goerli | https://thegraph.com/explorer/subgraph/superfluid-finance/protocol-v1-arbitrum-goerli | -| Avalanche Fuji | https://thegraph.com/explorer/subgraph/superfluid-finance/protocol-v1-avalanche-fuji | - -**Development Endpoints** -| Network | URL | -| --- | --- | -| Matic | https://thegraph.com/explorer/subgraph/superfluid-finance/protocol-dev-matic | -| Gnosis | https://thegraph.com/explorer/subgraph/superfluid-finance/protocol-dev-xdai | -| Optimism Mainnet | https://thegraph.com/explorer/subgraph/superfluid-finance/protocol-dev-optimism-mainnet | -| Arbitrum One | https://thegraph.com/explorer/subgraph/superfluid-finance/protocol-dev-arbitrum-one | -| Avalanche C-Chain | https://thegraph.com/explorer/subgraph/superfluid-finance/protocol-dev-avalanche-c | -| BNB Chain | https://thegraph.com/explorer/subgraph/superfluid-finance/protocol-dev-bsc-mainnet | -| Mumbai | https://thegraph.com/explorer/subgraph/superfluid-finance/protocol-dev-mumbai | -| Goerli| https://thegraph.com/explorer/subgraph/superfluid-finance/protocol-dev-goerli | -| Optimism Goerli | https://thegraph.com/explorer/subgraph/superfluid-finance/protocol-dev-optimism-goerli | -| Arbitrum Goerli | https://thegraph.com/explorer/subgraph/superfluid-finance/protocol-dev-arbitrum-goerli | -| Avalanche Fuji | https://thegraph.com/explorer/subgraph/superfluid-finance/protocol-dev-avalanche-fuji | - -**Feature Endpoints** -| Network | URL | -| --- | --- | -| Matic | https://thegraph.com/explorer/subgraph/superfluid-finance/protocol-feature-matic | -| Goerli | https://thegraph.com/explorer/subgraph/superfluid-finance/protocol-feature-goerli | - -\*Note: Development endpoints will include features that are still in progress. Documentation will not reflect new features yet to be released in V1 - # πŸ€“ Local development -πŸ›‘ **STOP - Do not pass Go** πŸ›‘ You probably don't need this repo. If you need data for Superfluid on Optimism, Arbitrum-One, Avalanche-C, Gnosis, Polygon (Matic), or testnet, we already deployed them for you! Head over to the **Docs** to get started. +πŸ›‘ **STOP - Do not pass Go** πŸ›‘ You probably don't need this repo. If you need data for a supported Superfluid deployment, we already deployed them for you! +Head over to the **Docs** to get started. In this section we will cover the following: @@ -283,7 +242,7 @@ The tests look something like this: - you create a mock event with the desired parameters for a specific entity - you pass this event to its complementary event handler -- you assert that the values on the created entity in the graph store have been created +- you assert that the values on the created entity in the graph store have been created #### Integration Tests The integration tests have been scaled down drastically and are no longer responsible for validating the mapping logic as this is handled in the unit tests. This solely serves to ensure that transactions executed against a local blockchain connected to a local subgraph instance will index events and create entities which can be retrieved by querying the exposed API endpoint from the local subgraph. At its core, we are testing the full lifecycle from transaction => event => indexed event => entity => entity is queryable. In addition, we still need these tests to ensure that new changes made to our schema won't break the SDK's query feature. diff --git a/packages/subgraph/hardhat.config.ts b/packages/subgraph/hardhat.config.ts index 7f434d4af6..c4953478a2 100644 --- a/packages/subgraph/hardhat.config.ts +++ b/packages/subgraph/hardhat.config.ts @@ -21,48 +21,7 @@ const config: HardhatUserConfig = { }, }, }, - networks: { - "optimism-mainnet": { - url: process.env.OPTIMISM_PROVIDER_URL || "", - chainId: 10, - }, - gnosis: { - url: process.env.GNOSIS_PROVIDER_URL || "", - chainId: 100, - }, - matic: { - url: process.env.MATIC_PROVIDER_URL || "", - chainId: 137, - }, - "arbitrum-one": { - url: process.env.ARBITRUM_ONE_PROVIDER_URL || "", - chainId: 42161, - }, - "avalanche-c": { - url: process.env.AVALANCHE_C_PROVIDER_URL || "", - chainId: 43114, - }, - "bsc-mainnet": { - url: process.env.BSC_MAINNET_PROVIDER_URL || "", - chainId: 56, - }, - "celo-mainnet": { - url: process.env.CELO_MAINNET_PROVIDER_URL || "", - chainId: 42220, - }, - goerli: { - url: process.env.GOERLI_PROVIDER_URL || "", - chainId: 5, - }, - avafuji: { - url: process.env.AVAFUJI_PROVIDER_URL || "", - chainId: 43113, - }, - mumbai: { - url: process.env.MUMBAI_PROVIDER_URL || "", - chainId: 80001, - }, - }, + mocha: { timeout: 500000, }, diff --git a/packages/subgraph/scripts/balanceValidation.ts b/packages/subgraph/scripts/balanceValidation.ts index b5fc6ddf98..a0677a0421 100644 --- a/packages/subgraph/scripts/balanceValidation.ts +++ b/packages/subgraph/scripts/balanceValidation.ts @@ -14,9 +14,9 @@ import { DataIntegrityAccountTokenSnapshot } from "./dataIntegrity/interfaces"; */ async function main() { const endpointA = - "https://api.thegraph.com/subgraphs/name/superfluid-finance/protocol-feature-goerli"; + "https://api.thegraph.com/subgraphs/name/superfluid-finance/protocol-feature-mumbai"; const endpointB = - "https://api.thegraph.com/subgraphs/name/superfluid-finance/protocol-v1-goerli"; + "https://api.thegraph.com/subgraphs/name/superfluid-finance/protocol-v1-mumbai"; const endpointARecentBlock = await getMostRecentIndexedBlockNumber( endpointA ); diff --git a/packages/subgraph/tasks/deploy.sh b/packages/subgraph/tasks/deploy.sh index 2840864ccd..6f294bc78d 100755 --- a/packages/subgraph/tasks/deploy.sh +++ b/packages/subgraph/tasks/deploy.sh @@ -15,7 +15,7 @@ GRAPH_NETWORKS=( $($JQ -r .[] ./hosted-service-networks.json) ) || exit 1 # shellcheck disable=SC2034 SATSUMA_NETWORKS=( "polygon-mainnet" "xdai-mainnet" "eth-mainnet" "eth-sepolia" "optimism-mainnet" "base-mainnet") # shellcheck disable=SC2034 -SUPERFLUID_NETWORKS=( "polygon-zkevm-testnet" "polygon-mainnet" "base-goerli" "xdai-mainnet" "base-mainnet" "optimism-mainnet" "arbitrum-one" "celo-mainnet" "bsc-mainnet" "avalanche-c" "optimism-sepolia" "scroll-sepolia" "scroll-mainnet") +SUPERFLUID_NETWORKS=( "polygon-mainnet" "xdai-mainnet" "base-mainnet" "optimism-mainnet" "arbitrum-one" "celo-mainnet" "bsc-mainnet" "avalanche-c" "optimism-sepolia" "scroll-sepolia" "scroll-mainnet") declare -A VENDOR_NETWORKS=( ["graph"]="${GRAPH_NETWORKS[@]}" @@ -66,7 +66,6 @@ deploy_to_graph() { local -A legacyNetworkNames=( ["xdai-mainnet"]="xdai" ["polygon-mainnet"]="matic" - ["eth-goerli"]="goerli" ["polygon-mumbai"]="mumbai" ) diff --git a/sdk-redux-examples/sdk-redux-nextjs-typescript/redux/chainIds.ts b/sdk-redux-examples/sdk-redux-nextjs-typescript/redux/chainIds.ts index 84dff26b12..21d2a25c71 100644 --- a/sdk-redux-examples/sdk-redux-nextjs-typescript/redux/chainIds.ts +++ b/sdk-redux-examples/sdk-redux-nextjs-typescript/redux/chainIds.ts @@ -1,8 +1,4 @@ export const chainIds = [ - 3, // ROPSTEN - 4, // RINKEBY - 5, // GOERLI - 42, // KOVAN // 100, // XDAI //TODO(KK): No infura support 137, // MATIC 80001, // MUMBAI @@ -14,22 +10,6 @@ export type Network = { }; export const networks: Network[] = [ - { - name: "ropsten", - chainId: 3, - }, - { - name: "rinkeby", - chainId: 4, - }, - { - name: "goerli", - chainId: 5, - }, - { - name: "kovan", - chainId: 42, - }, { name: "matic", chainId: 137, diff --git a/sdk-redux-examples/sdk-redux-nextjs-typescript/redux/store.ts b/sdk-redux-examples/sdk-redux-nextjs-typescript/redux/store.ts index 2e1b1b1176..f5fe4278a6 100644 --- a/sdk-redux-examples/sdk-redux-nextjs-typescript/redux/store.ts +++ b/sdk-redux-examples/sdk-redux-nextjs-typescript/redux/store.ts @@ -22,13 +22,12 @@ export const subgraphApi = initializeSubgraphApiSlice((options) => ).injectEndpoints(allSubgraphEndpoints); export const makeStore = () => { - const goerliChainId = 5; - setFrameworkForSdkRedux(goerliChainId, () => + const xdaiChainId = 100; + setFrameworkForSdkRedux(xdaiChainId, () => Framework.create({ - chainId: goerliChainId, + chainId: xdaiChainId, provider: new ethers.providers.StaticJsonRpcProvider( - "https://rpc-endpoints.superfluid.dev/eth-goerli", - "goerli" + "https://rpc-endpoints.superfluid.dev/xdai-mainnet" ), }) ); diff --git a/sdk-redux-examples/sdk-redux-react-typecript/src/wagmiAndRainbowKit.ts b/sdk-redux-examples/sdk-redux-react-typecript/src/wagmiAndRainbowKit.ts index 23dd9cb724..01ab2b7a6a 100644 --- a/sdk-redux-examples/sdk-redux-react-typecript/src/wagmiAndRainbowKit.ts +++ b/sdk-redux-examples/sdk-redux-react-typecript/src/wagmiAndRainbowKit.ts @@ -7,13 +7,12 @@ import { } from 'wagmi'; import { polygon, - polygonMumbai, - goerli + polygonMumbai } from 'wagmi/chains' import { publicProvider } from 'wagmi/providers/public'; export const { chains, provider } = configureChains( - [polygon, polygonMumbai, goerli], + [polygon, polygonMumbai], [ publicProvider() ] diff --git a/tasks/daily-slack-bot.js b/tasks/daily-slack-bot.js index 1570b9f7e2..72b6b3468b 100644 --- a/tasks/daily-slack-bot.js +++ b/tasks/daily-slack-bot.js @@ -30,8 +30,6 @@ const greenImage = //Using graph to get the token list, so please use non-checksum addresses for ignoring tokens const whiteListedAddresses = [ "0xb63e38d21b31719e6df314d3d2c351df0d4a9162", // Polygon Mainnet IDLEx - // Optimism Goerli and Arbitrum Goerli ETHx, read and write as proxy still works fine - "0xe01f8743677da897f4e7de9073b57bf034fc2433", "0x00a27a8cf40d419fe581643f5c7d671e158ca4c3", // Old 2021 contract "0x42c3f8648bb518ae5fd74a79b4df6406171095ae", // Old 2021 contract "0xeb5748f9798b11af79f892f344f585e3a88aa784", // Old 2021 contract @@ -50,6 +48,7 @@ const networkSpecificData = { url: "https://api-sepolia.etherscan.io/api", key: process.env.ETHERSCAN_API_KEY, }, + // mainnets "xdai-mainnet": { url: "https://api.gnosisscan.io/api", key: process.env.GNOSISSCAN_API_KEY,