merge dev

superfluid-finance · May 21, 2024 · 40e0e39 · 40e0e39
2 parents c1f97dc + d791b50
commit 40e0e39
Show file tree

Hide file tree

Showing 33 changed files with 181 additions and 273 deletions.
diff --git a/.github/workflows/cd.packages-stable.create-release-drafts.yml b/.github/workflows/cd.packages-stable.create-release-drafts.yml
@@ -163,8 +163,6 @@ jobs:
     needs:
       [
         check-sdk-core-version,
-        test-sdk-core-query-schema-against-deployed-v1-subgraphs,
-        test-sdk-core-with-v1-release-subgraph,
       ]
 
     permissions: write-all

diff --git 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
@@ -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/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 <manager_address> --strategy <strategy_address
 #### Testnets
 |          | Manager                                                                                                                              | WrapStrategy                                                                                                                         |
 |----------|--------------------------------------------------------------------------------------------------------------------------------------|--------------------------------------------------------------------------------------------------------------------------------------|
-| Mumbai   | [0x3eAB3c6207F488E475b7955B631B564F0E6317B9](https://mumbai.polygonscan.com/address/0x3eAB3c6207F488E475b7955B631B564F0E6317B9#code) | [0x544728AFDBeEafBeC9e1329031788edb53017bC4](https://mumbai.polygonscan.com/address/0x544728AFDBeEafBeC9e1329031788edb53017bC4#code) |
+| OP Sepolia   | [0xe567b32C10B0dB72d9490eB1B9A409C5ADed192C](https://sepolia-optimism.etherscan.io/address/0xe567b32C10B0dB72d9490eB1B9A409C5ADed192C) | [0xf232f1fd34CE12e24F4391865c2D6E374D2C34d9](https://sepolia-optimism.etherscan.io/address/0xf232f1fd34CE12e24F4391865c2D6E374D2C34d9) |
 
 #### Mainnets
 

diff --git a/packages/automation-contracts/autowrap/hardhat.config.js b/packages/automation-contracts/autowrap/hardhat.config.js
@@ -26,13 +26,6 @@ module.exports = {
             url: "http://127.0.0.1:8545/",
             chainId: 31337,
         },
-        mumbai: {
-            url: process.env.MUMBAI_URL || "",
-            accounts:
-                process.env.PRIVATE_KEY !== undefined
-                    ? [process.env.PRIVATE_KEY]
-                    : [],
-        },
         polygon: {
             url: process.env.POLYGON_URL || "",
             accounts:

diff --git a/packages/automation-contracts/scheduler/README.md b/packages/automation-contracts/scheduler/README.md
@@ -25,11 +25,9 @@ The Vesting Scheduler allows you to schedule the vesting of tokens to a receiver
 ```bash
 # .env-example
 
-MUMBAI_PRIVATE_KEY=
 POLYGON_PRIVATE_KEY=
 BSC_PRIVATE_KEY=
 
-MUMBAI_URL=
 POLYGON_URL=
 BSC_URL=
 
@@ -58,7 +56,7 @@ npx hardhat deploy --network <network>
 #### 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
@@ -25,13 +25,6 @@ module.exports = {
             url: "http://127.0.0.1:8545/",
             chainId: 31337,
         },
-        mumbai: {
-            url: process.env.MUMBAI_URL || "",
-            accounts:
-                process.env.PRIVATE_KEY !== undefined
-                    ? [process.env.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
@@ -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
@@ -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
@@ -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
@@ -53,7 +53,6 @@ <h3 id="loader" style="text-align: center; display: none;">Loading...</h3>
 
             // 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
@@ -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/metadata/CHANGELOG.md b/packages/metadata/CHANGELOG.md
@@ -3,6 +3,19 @@ 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.2.2]
+### Added
+- Added Base v1 subgraph endpoint
+
+## [v1.2.1]
+### Added
+- Added Base automation contracts
+- Added OP Sepolia automation contracts
+
+## [v1.2.0]
+### Changed
+- Removed Polygon Mumbai
+
 ## [v1.1.30]
 ### Added
 - Degen Chain deployment

diff --git a/packages/metadata/main/networks/list.cjs b/packages/metadata/main/networks/list.cjs
@@ -1,70 +1,6 @@
 /* eslint-disable */
 module.exports =
 [
-    {
-        "name": "polygon-mumbai",
-        "isTestnet": true,
-        "networkId": 80001,
-        "chainId": 80001,
-        "sfId": 102,
-        "shortName": "mumbai",
-        "uppercaseName": "POLYGON_MUMBAI",
-        "humanReadableName": "Polygon Mumbai",
-        "nativeTokenSymbol": "MATIC",
-        "nativeTokenWrapper": "0x96B82B65ACF7072eFEb00502F45757F254c2a0D4",
-        "contractsV1": {
-            "resolver": "0x2feFd8B23e4770B674b0d2fAda5EE8a2bE0B525F",
-            "host": "0xEB796bdb90fFA0f28255275e16936D25d3418603",
-            "cfaV1": "0x49e565Ed1bdc17F3d220f72DF0857C26FA83F873",
-            "cfaV1Forwarder": "0xcfA132E353cB4E398080B9700609bb008eceB125",
-            "idaV1": "0x804348D4960a61f2d5F9ce9103027A3E849E09b8",
-            "gdaV1": "0x63ab406B6eF6c8be732c1edbd15464de16a8F46D",
-            "gdaV1Forwarder": "0x6DA13Bde224A05a288748d857b9e7DDEffd1dE08",
-            "superTokenFactory": "0xB798553db6EB3D3C56912378409370145E97324B",
-            "constantOutflowNFT": "0x502CC982947216C0f94e433BC78c413806301C07",
-            "constantInflowNFT": "0x9906A7e948C642B6bc74b9A5EAfCddB3580b44e0",
-            "superfluidLoader": "0xFcc617a382988a6d081B1821c8d17C47DFF9EDE1",
-            "toga": "0x38DD80876DBA048d0050D28828522c313967D073",
-            "superSpreader": "0x74CDF863b00789c29734F8dFd9F83423Bc55E4cE",
-            "flowScheduler": "0x59A3Ba9d34c387FB70b4f4e4Fbc9eD7519194139",
-            "vestingScheduler": "0x3962EE56c9f7176215D149938BA685F91aBB633B",
-            "autowrap": {
-                "manager": "0x3eAB3c6207F488E475b7955B631B564F0E6317B9",
-                "wrapStrategy": "0x544728AFDBeEafBeC9e1329031788edb53017bC4"
-            },
-            "existentialNFTCloneFactory": "0xfC4E49AfcDDDcc2B90794DC214cc324d17B15619"
-        },
-        "startBlockV1": 8100000,
-        "logsQueryRange": 10000,
-        "explorer": "https://mumbai.polygonscan.com",
-        "subgraphV1": {
-            "cliName": "mumbai",
-            "name": "protocol-v1-mumbai",
-            "hostedEndpoint": "https://api.thegraph.com/subgraphs/name/superfluid-finance/protocol-v1-mumbai"
-        },
-        "subgraphVesting": {
-            "name": "vesting-v1-polygon-mumbai",
-            "hostedEndpoint": "https://api.thegraph.com/subgraphs/name/superfluid-finance/vesting-v1-polygon-mumbai"
-        },
-        "subgraphFlowScheduler": {
-            "name": "scheduling-v1-polygon-mumbai",
-            "hostedEndpoint": "https://api.thegraph.com/subgraphs/name/superfluid-finance/scheduling-v1-polygon-mumbai"
-        },
-        "subgraphAutoWrap": {
-            "name": "auto-wrap-v1-polygon-mumbai",
-            "hostedEndpoint": "https://api.thegraph.com/subgraphs/name/superfluid-finance/auto-wrap-v1-polygon-mumbai"
-        },
-        "publicRPCs": [
-            "https://rpc.ankr.com/polygon_mumbai",
-            "https://matic-mumbai.chainstacklabs.com"
-        ],
-        "trustedForwarders": [
-            "0x9399bb24dbb5c4b782c70c2969f58716ebbd6a3b",
-            "0x69015912AA33720b842dCD6aC059Ed623F28d9f7",
-            "0xb539068872230f20456CF38EC52EF2f91AF4AE49",
-            "0xd8253782c45a12053594b9deB72d8e8aB2Fca54c"
-        ]
-    },
     {
         "name": "avalanche-fuji",
         "isTestnet": true,
@@ -172,6 +108,12 @@ module.exports =
             "superTokenFactory": "0xfcF0489488397332579f35b0F711BE570Da0E8f5",
             "constantOutflowNFT": "0xda6db863cb2EE39b196edB8159c38A1ed5c55344",
             "constantInflowNFT": "0x87E00Dced5670e01BEe33a9a724B1dac790937eF",
+            "flowScheduler": "0x73B1Ce21d03ad389C2A291B1d1dc4DAFE7B5Dc68",
+            "vestingScheduler": "0x27444c0235a4D921F3106475faeba0B5e7ABDD7a",
+            "autowrap": {
+                "manager": "0xe567b32C10B0dB72d9490eB1B9A409C5ADed192C",
+                "wrapStrategy": "0xf232f1fd34CE12e24F4391865c2D6E374D2C34d9"
+            },
             "superfluidLoader": "0x109412E3C84f0539b43d39dB691B08c90f58dC7c"
         },
         "startBlockV1": 6886559,
@@ -182,6 +124,18 @@ module.exports =
             "name": "protocol-v1-optimism-sepolia",
             "hostedEndpoint": "https://api.thegraph.com/subgraphs/name/superfluid-finance/protocol-v1-optimism-sepolia"
         },
+        "subgraphVesting": {
+            "name": "vesting-v1-optimism-sepolia",
+            "hostedEndpoint": "https://api.goldsky.com/api/public/project_clsnd6xsoma5j012qepvucfpp/subgraphs/vesting-v1-optimism-sepolia/prod/gn"
+        },
+        "subgraphFlowScheduler": {
+            "name": "scheduling-v1-optimism-sepolia",
+            "hostedEndpoint": "https://api.goldsky.com/api/public/project_clsnd6xsoma5j012qepvucfpp/subgraphs/scheduling-v1-optimism-sepolia/prod/gn"
+        },
+        "subgraphAutoWrap": {
+            "name": "auto-wrap-v1-optimism-sepolia",
+            "hostedEndpoint": "https://api.goldsky.com/api/public/project_clsnd6xsoma5j012qepvucfpp/subgraphs/auto-wrap-v1-optimism-sepolia/prod/gn"
+        },
         "publicRPCs": [
             "https://sepolia.optimism.io"
         ],
@@ -714,6 +668,12 @@ module.exports =
             "superfluidLoader": "0x9F9EEd9Bbc38E9e0514fD9dFcc0Bca9869A9c534",
             "toga": "0xA87F76e99f6C8Ff8996d14f550ceF47f193D9A09",
             "batchLiquidator": "0x889ebeCaD5F8C34Fd96023456d0fC5cE54eb74Cb",
+            "flowScheduler": "0xC72CEd15204d02183c83fEbb918b183E400811Ee",
+            "vestingScheduler": "0xDF92D0E6Bcb9385FDe99aD21Ff5e47Fb47E3c6b2",
+            "autowrap": {
+                "manager": "0x5D0acD0864Ad07ba4E1E0474AE69Da87482e14A9",
+                "wrapStrategy": "0xB29005319B0caB24cF6D4d24e8420E54BB29Cb0d"
+            },
             "existentialNFTCloneFactory": "0x642332562BC60a4Bd9681E7bb1588f7456A497aC"
         },
         "startBlockV1": 1000000,
@@ -723,6 +683,18 @@ module.exports =
             "cliName": "base",
             "name": "protocol-v1-base-mainnet"
         },
+        "subgraphVesting": {
+            "name": "vesting-v1-base-mainnet",
+            "hostedEndpoint": "https://api.goldsky.com/api/public/project_clsnd6xsoma5j012qepvucfpp/subgraphs/vesting-v1-base-mainnet/prod/gn"
+        },
+        "subgraphFlowScheduler": {
+            "name": "scheduling-v1-base-mainnet",
+            "hostedEndpoint": "https://api.goldsky.com/api/public/project_clsnd6xsoma5j012qepvucfpp/subgraphs/scheduling-v1-base-mainnet/prod/gn"
+        },
+        "subgraphAutoWrap": {
+            "name": "auto-wrap-v1-base-mainnet",
+            "hostedEndpoint": "https://api.goldsky.com/api/public/project_clsnd6xsoma5j012qepvucfpp/subgraphs/auto-wrap-v1-base-mainnet/prod/gn"
+        },
         "publicRPCs": ["https://developer-access-mainnet.base.org"],
         "coinGeckoId": "base"
     },

diff --git a/packages/metadata/module/networks/list.d.ts b/packages/metadata/module/networks/list.d.ts
@@ -49,6 +49,9 @@ export interface NetworkMetaData {
     readonly publicRPCs?: string[];
     readonly coinGeckoId?: string;
     readonly trustedForwarders?: string[]; // list of additional trusted forwarders
+    readonly subgraphVesting?: { name: string, hostedEndpoint: string }
+    readonly subgraphFlowScheduler?: { name: string, hostedEndpoint: string }
+    readonly subgraphAutoWrap?: { name: string, hostedEndpoint: string },
 }
 declare const _default: NetworkMetaData[];
 export default _default;