diff --git a/.github/workflows/handler.deploy-to-testnets.yml b/.github/workflows/handler.deploy-to-testnets.yml index b9960e8e54..322a511769 100644 --- a/.github/workflows/handler.deploy-to-testnets.yml +++ b/.github/workflows/handler.deploy-to-testnets.yml @@ -33,7 +33,7 @@ jobs: strategy: fail-fast: false matrix: - network: [eth-sepolia, polygon-mumbai, optimism-sepolia, avalanche-fuji, scroll-sepolia] + network: [eth-sepolia, optimism-sepolia, avalanche-fuji, scroll-sepolia] steps: - uses: actions/checkout@v3 diff --git a/.github/workflows/handler.verify-contracts.yml b/.github/workflows/handler.verify-contracts.yml index f5e1a2eb35..7aa764cae7 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-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] + network: [eth-sepolia, 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 3e29df7dad..4b025569de 100644 --- a/packages/automation-contracts/autowrap/.env-example +++ b/packages/automation-contracts/autowrap/.env-example @@ -1,10 +1,8 @@ # .env-example -MUMBAI_PRIVATE_KEY= POLYGON_PRIVATE_KEY= BSC_PRIVATE_KEY= -MUMBAI_URL= POLYGON_URL= BSC_URL= diff --git a/packages/automation-contracts/autowrap/README.md b/packages/automation-contracts/autowrap/README.md index db05daf8fb..dc05add73d 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= -MUMBAI_PRIVATE_KEY= POLYGON_PRIVATE_KEY= BSC_PRIVATE_KEY= @@ -58,7 +57,7 @@ npx hardhat addStrategy --manager --strategy #### Testnets | | FlowScheduler | VestingScheduler | |----------|--------------------------------------------------------------------------------------------------------------------------------------|--------------------------------------------------------------------------------------------------------------------------------------| -| Mumbai | [0xF18825d412C061aEfEFB4dF46a1c077636dA50bf](https://mumbai.polygonscan.com/address/0xF18825d412C061aEfEFB4dF46a1c077636dA50bf#code) | [0xD4fCe2a08fd2fA7495BEd900F2fb6c6deDBf8632](https://mumbai.polygonscan.com/address/0xD4fCe2a08fd2fA7495BEd900F2fb6c6deDBf8632#code) | +| OP Sepolia | [0x73B1Ce21d03ad389C2A291B1d1dc4DAFE7B5Dc68](https://sepolia-optimism.etherscan.io/address/0x73B1Ce21d03ad389C2A291B1d1dc4DAFE7B5Dc68) | [0x27444c0235a4D921F3106475faeba0B5e7ABDD7a](https://sepolia-optimism.etherscan.io/address/0x27444c0235a4D921F3106475faeba0B5e7ABDD7a) | #### Mainnets | | FlowScheduler | VestingScheduler | diff --git a/packages/automation-contracts/scheduler/hardhat.config.js b/packages/automation-contracts/scheduler/hardhat.config.js index 5711a7e622..93eb9b8e9a 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, }, - mumbai: { - url: process.env.MUMBAI_URL || "", - accounts: - process.env.MUMBAI_PRIVATE_KEY !== undefined ? [process.env.MUMBAI_PRIVATE_KEY] : [], - }, polygon: { url: process.env.POLYGON_URL || "", accounts: diff --git a/packages/ethereum-contracts/contracts/apps/SuperfluidLoaderLibrary.sol b/packages/ethereum-contracts/contracts/apps/SuperfluidLoaderLibrary.sol index 77955699a6..859795406a 100644 --- a/packages/ethereum-contracts/contracts/apps/SuperfluidLoaderLibrary.sol +++ b/packages/ethereum-contracts/contracts/apps/SuperfluidLoaderLibrary.sol @@ -19,7 +19,6 @@ library SuperfluidLoaderLibrary { // testnets uint256 private constant AVALANCHE_FUJI = 43113; - uint256 private constant POLYGON_MUMBAI = 80001; uint256 private constant SCROLL_SEPOLIA = 534351; uint256 private constant ETH_SEPOLIA = 11155111; uint256 private constant OPTIMISM_SEPOLIA = 11155420; @@ -50,8 +49,6 @@ library SuperfluidLoaderLibrary { // 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) { diff --git a/packages/ethereum-contracts/hardhat.config.ts b/packages/ethereum-contracts/hardhat.config.ts index 18b86764fe..6dcb708c69 100644 --- a/packages/ethereum-contracts/hardhat.config.ts +++ b/packages/ethereum-contracts/hardhat.config.ts @@ -64,7 +64,6 @@ const chainIds = { "arbitrum-one": 42161, "polygon-mainnet": 137, - "polygon-mumbai": 80001, "avalanche-c": 43114, "avalanche-fuji": 43113, @@ -127,10 +126,6 @@ const config: HardhatUserConfig = { ...createNetworkConfig("polygon-mainnet"), url: process.env.POLYGON_MAINNET_PROVIDER_URL || "", }, - "polygon-mumbai": { - ...createNetworkConfig("polygon-mumbai"), - url: process.env.POLYGON_MUMBAI_PROVIDER_URL || "", - }, "avalanche-c": { ...createNetworkConfig("avalanche-c"), url: process.env.AVALANCHE_C_PROVIDER_URL || "", diff --git a/packages/ethereum-contracts/truffle-config.js b/packages/ethereum-contracts/truffle-config.js index 01cef495ce..d1f6e93fab 100644 --- a/packages/ethereum-contracts/truffle-config.js +++ b/packages/ethereum-contracts/truffle-config.js @@ -60,7 +60,6 @@ const ALIASES = { "xdai-mainnet": ["xdai"], "polygon-mainnet": ["matic"], - "polygon-mumbai": ["mumbai"], "optimism-mainnet": ["opmainnet"], "optimism-sepolia": ["opsepolia"], @@ -197,11 +196,6 @@ const E = (module.exports = { maxFeePerGas: 500e9, }, - "polygon-mumbai": { - ...createNetworkDefaultConfiguration("polygon-mumbai"), - network_id: 80001, - }, - // // xDAI: https://www.xdaichain.com/for-users/wallets/metamask/metamask-setup diff --git a/packages/ethereum-contracts/utils/supertoken-deployer.html b/packages/ethereum-contracts/utils/supertoken-deployer.html index 836633d9e6..be849eed48 100644 --- a/packages/ethereum-contracts/utils/supertoken-deployer.html +++ b/packages/ethereum-contracts/utils/supertoken-deployer.html @@ -53,7 +53,6 @@ // TODO: replace with external canonical network list networks = [ - { chainId: 80001, hostAddr: "0xEB796bdb90fFA0f28255275e16936D25d3418603" }, // polygon-mumbai { 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 bdd72252e7..98706daf60 100644 --- a/packages/js-sdk/test/getConfig.test.js +++ b/packages/js-sdk/test/getConfig.test.js @@ -6,18 +6,18 @@ describe("getConfig", () => { delete process.env.RESOLVER_ADDRESS; }); - it("mumbai v1", async () => { - const mumbaiConfig = SuperfluidSDK.getConfig(80001, "v1"); - assert.isNotEmpty(mumbaiConfig.resolverAddress); - assert.isNotEmpty(mumbaiConfig.subgraphQueryEndpoint); - assert.isUndefined(mumbaiConfig.versions); + it("polygon v1", async () => { + const config = SuperfluidSDK.getConfig(137, "v1"); + assert.isNotEmpty(config.resolverAddress); + assert.isNotEmpty(config.subgraphQueryEndpoint); + assert.isUndefined(config.versions); }); - it("mumbai test", async () => { - const mumbaiConfig = SuperfluidSDK.getConfig(80001, "test"); - assert.isNotEmpty(mumbaiConfig.resolverAddress); - assert.isUndefined(mumbaiConfig.subgraphQueryEndpoint); - assert.isUndefined(mumbaiConfig.versions); + it("polygon test", async () => { + const config = SuperfluidSDK.getConfig(137, "test"); + assert.isNotEmpty(config.resolverAddress); + assert.isUndefined(config.subgraphQueryEndpoint); + assert.isUndefined(config.versions); }); it("defaultConfig", async () => { diff --git a/packages/sdk-core/package.json b/packages/sdk-core/package.json index 1b0fcff18b..689287748c 100644 --- a/packages/sdk-core/package.json +++ b/packages/sdk-core/package.json @@ -48,9 +48,9 @@ "generate:graphql-types": "graphql-codegen --config subgraph-codegen.yml", "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-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", + "generate-graphql-schema:v1": "get-graphql-schema https://api.thegraph.com/subgraphs/name/superfluid-finance/protocol-v1-optimism-sepolia > src/subgraph/schema.graphql", + "generate-graphql-schema:dev": "get-graphql-schema https://api.thegraph.com/subgraphs/name/superfluid-finance/protocol-dev-optimism-sepolia > src/subgraph/schema.graphql", + "generate-graphql-schema:feature": "get-graphql-schema https://api.thegraph.com/subgraphs/name/superfluid-finance/protocol-feature-matic > 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 2e38fae95f..9d2a43a3e2 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 mumbai + * otherwise, we use OP Sepolia * @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("mumbai")?.chainId ?? 0; + : metadata.getNetworkByShortName("opsepolia")?.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 bad7321ceb..5deb8e10e8 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-mumbai", + "url": "https://api.thegraph.com/subgraphs/name/superfluid-finance/protocol-dev-optimism-sepolia", "headers": { "user-agent": "JS GraphQL" }, diff --git a/packages/sdk-core/tasks/testSchemasAndQueries.sh b/packages/sdk-core/tasks/testSchemasAndQueries.sh index bae1f2f734..69e33841d9 100755 --- a/packages/sdk-core/tasks/testSchemasAndQueries.sh +++ b/packages/sdk-core/tasks/testSchemasAndQueries.sh @@ -6,9 +6,7 @@ JQ="npx --package=node-jq -- jq" set -xe if [ "$SUBGRAPH_RELEASE_TAG" == "feature" ];then - # we only support matic and mumbai feature endpoints - # however, we don't want to be blocked by matic for feature - NETWORKS=("mumbai") + NETWORKS=("matic") fi if [ "$SUBGRAPH_RELEASE_TAG" == "dev" ] || [ "$SUBGRAPH_RELEASE_TAG" == "v1" ];then @@ -31,7 +29,6 @@ for i in "${NETWORKS[@]}";do declare -A LEGACY_NETWORK_NAMES=( ["xdai-mainnet"]="xdai" ["polygon-mainnet"]="matic" - ["polygon-mumbai"]="mumbai" ) GRAPH_NETWORK="${LEGACY_NETWORK_NAMES[$i]:-$i}" diff --git a/packages/sdk-core/test/0_framework.test.ts b/packages/sdk-core/test/0_framework.test.ts index b1590494d6..c218fd03bd 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("polygon-mumbai")!, + chainId: networkNameToChainIdMap.get("polygon-mainnet")!, 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("polygon-mumbai")! + networkNameToChainIdMap.get("polygon-mainnet")! ); } }); diff --git a/packages/subgraph/.env.example b/packages/subgraph/.env.example index 40b56851ad..b2b68d565e 100644 --- a/packages/subgraph/.env.example +++ b/packages/subgraph/.env.example @@ -4,5 +4,4 @@ MATIC_PROVIDER_URL= ARBITRUM_ONE_PROVIDER_URL= AVALANCHE_C_PROVIDER_URL= BSC_MAINNET_PROVIDER_URL= -AVAFUJI_PROVIDER_URL= -MUMBAI_PROVIDER_URL= +AVAFUJI_PROVIDER_URL= \ No newline at end of file diff --git a/packages/subgraph/scripts/balanceValidation.ts b/packages/subgraph/scripts/balanceValidation.ts index a0677a0421..88edf0197d 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-mumbai"; + "https://api.thegraph.com/subgraphs/name/superfluid-finance/protocol-feature-matic"; const endpointB = - "https://api.thegraph.com/subgraphs/name/superfluid-finance/protocol-v1-mumbai"; + "https://api.thegraph.com/subgraphs/name/superfluid-finance/protocol-v1-matic"; const endpointARecentBlock = await getMostRecentIndexedBlockNumber( endpointA ); diff --git a/packages/subgraph/tasks/deploy.sh b/packages/subgraph/tasks/deploy.sh index a1d4f3a79e..70f0a1a233 100755 --- a/packages/subgraph/tasks/deploy.sh +++ b/packages/subgraph/tasks/deploy.sh @@ -74,7 +74,6 @@ deploy_to_graph() { local -A legacyNetworkNames=( ["xdai-mainnet"]="xdai" ["polygon-mainnet"]="matic" - ["polygon-mumbai"]="mumbai" ) local graphNetwork="${legacyNetworkNames[$network]:-$network}" 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 21d2a25c71..ab21df475d 100644 --- a/sdk-redux-examples/sdk-redux-nextjs-typescript/redux/chainIds.ts +++ b/sdk-redux-examples/sdk-redux-nextjs-typescript/redux/chainIds.ts @@ -1,7 +1,7 @@ export const chainIds = [ // 100, // XDAI //TODO(KK): No infura support 137, // MATIC - 80001, // MUMBAI + 43113 , // OP Sepolia ]; export type Network = { @@ -15,8 +15,8 @@ export const networks: Network[] = [ chainId: 137, }, { - name: "mumbai", - chainId: 80001, + name: "fuji", + chainId: 43113 , }, ]; 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 01ab2b7a6a..fa4d560fe5 100644 --- a/sdk-redux-examples/sdk-redux-react-typecript/src/wagmiAndRainbowKit.ts +++ b/sdk-redux-examples/sdk-redux-react-typecript/src/wagmiAndRainbowKit.ts @@ -7,12 +7,12 @@ import { } from 'wagmi'; import { polygon, - polygonMumbai + avalancheFuji } from 'wagmi/chains' import { publicProvider } from 'wagmi/providers/public'; export const { chains, provider } = configureChains( - [polygon, polygonMumbai], + [polygon, avalancheFuji], [ publicProvider() ] @@ -20,6 +20,7 @@ export const { chains, provider } = configureChains( export const { connectors } = getDefaultWallets({ appName: 'SDK-redux example', + projectId: "", chains }); diff --git a/tasks/daily-slack-bot.js b/tasks/daily-slack-bot.js index 72b6b3468b..9584d24530 100644 --- a/tasks/daily-slack-bot.js +++ b/tasks/daily-slack-bot.js @@ -36,10 +36,6 @@ const whiteListedAddresses = [ ]; const networkSpecificData = { - "polygon-mumbai": { - url: "https://api-testnet.polygonscan.com/api", - key: process.env.POLYGONSCAN_API_KEY, - }, "avalanche-fuji": { url: "https://api-testnet.snowtrace.io/api", key: process.env.SNOWTRACE_API_KEY,