diff --git a/packages/ethereum-contracts/package.json b/packages/ethereum-contracts/package.json index 0a26e992c8..186554ba62 100644 --- a/packages/ethereum-contracts/package.json +++ b/packages/ethereum-contracts/package.json @@ -86,7 +86,7 @@ "hardhat": "^2.19.5" }, "devDependencies": { - "@d10r/truffle-plugin-verify": "0.6.9", + "@d10r/truffle-plugin-verify": "^0.6.10", "@nomiclabs/hardhat-truffle5": "^2.0.7", "@safe-global/safe-core-sdk": "^3.3.5", "@safe-global/safe-service-client": "^2.0.3", diff --git a/packages/ethereum-contracts/truffle-config.js b/packages/ethereum-contracts/truffle-config.js index d1f6e93fab..359f1aa42d 100644 --- a/packages/ethereum-contracts/truffle-config.js +++ b/packages/ethereum-contracts/truffle-config.js @@ -74,6 +74,7 @@ const ALIASES = { "celo-mainnet": ["celo"], "base-mainnet": ["base"], + "base-sepolia": ["bsepolia"], "scroll-sepolia": ["scrsepolia"], "scroll-mainnet": ["scroll"], @@ -266,6 +267,10 @@ const E = (module.exports = { maxPriorityFeePerGas: 1e6, // 0.001 gwei - even 0 may do maxFeePerGas: 1e9, // 1 gwei }, + "base-sepolia": { + ...createNetworkDefaultConfiguration("base-sepolia"), + network_id: 84532, + }, // // Scroll: https://docs.scroll.xyz/en/getting-started/overview/ diff --git a/packages/metadata/main/networks/list.cjs b/packages/metadata/main/networks/list.cjs index 10c53e5fd6..9ac7fb3a35 100644 --- a/packages/metadata/main/networks/list.cjs +++ b/packages/metadata/main/networks/list.cjs @@ -174,6 +174,38 @@ module.exports = }, "publicRPCs": ["https://sepolia-rpc.scroll.io"] }, + { + "name": "base-sepolia", + "isTestnet": true, + "networkId": 84532, + "chainId": 84532, + "sfId": 111, + "shortName": "bsepolia", + "uppercaseName": "BASE_SEPOLIA", + "humanReadableName": "Base Sepolia", + "nativeTokenSymbol": "ETH", + "nativeTokenWrapper": "", + "contractsV1": { + "resolver": "0x21d4E9fbB9DB742E6ef4f29d189a7C18B0b59136", + "host": "0x109412E3C84f0539b43d39dB691B08c90f58dC7c", + "cfaV1": "0x6836F23d6171D74Ef62FcF776655aBcD2bcd62Ef", + "cfaV1Forwarder": "0xcfA132E353cB4E398080B9700609bb008eceB125", + "idaV1": "0x9358C7dCCc6B8CA6F526311e8ac266F8C861B7ea", + "gdaV1": "0x53F4f44C813Dc380182d0b2b67fe5832A12B97f8", + "gdaV1Forwarder": "0x6DA13Bde224A05a288748d857b9e7DDEffd1dE08", + "superTokenFactory": "0x7447E94Dfe3d804a9f46Bf12838d467c912C8F6C", + "superfluidLoader": "0x777Be25F9fdcA87e8a0E06Ad4be93d65429FCb9f" + }, + "startBlockV1": 10604500, + "logsQueryRange": 50000, + "explorer": "https://sepolia.basescan.org", + "subgraphV1": { + "cliName": "base-sepolia" + }, + "publicRPCs": [ + "https://sepolia.base.org" + ] + }, { "name": "xdai-mainnet", "isTestnet": false, diff --git a/packages/metadata/module/networks/list.js b/packages/metadata/module/networks/list.js index a67ffd741c..2fc78c4906 100644 --- a/packages/metadata/module/networks/list.js +++ b/packages/metadata/module/networks/list.js @@ -174,6 +174,38 @@ export default }, "publicRPCs": ["https://sepolia-rpc.scroll.io"] }, + { + "name": "base-sepolia", + "isTestnet": true, + "networkId": 84532, + "chainId": 84532, + "sfId": 111, + "shortName": "bsepolia", + "uppercaseName": "BASE_SEPOLIA", + "humanReadableName": "Base Sepolia", + "nativeTokenSymbol": "ETH", + "nativeTokenWrapper": "", + "contractsV1": { + "resolver": "0x21d4E9fbB9DB742E6ef4f29d189a7C18B0b59136", + "host": "0x109412E3C84f0539b43d39dB691B08c90f58dC7c", + "cfaV1": "0x6836F23d6171D74Ef62FcF776655aBcD2bcd62Ef", + "cfaV1Forwarder": "0xcfA132E353cB4E398080B9700609bb008eceB125", + "idaV1": "0x9358C7dCCc6B8CA6F526311e8ac266F8C861B7ea", + "gdaV1": "0x53F4f44C813Dc380182d0b2b67fe5832A12B97f8", + "gdaV1Forwarder": "0x6DA13Bde224A05a288748d857b9e7DDEffd1dE08", + "superTokenFactory": "0x7447E94Dfe3d804a9f46Bf12838d467c912C8F6C", + "superfluidLoader": "0x777Be25F9fdcA87e8a0E06Ad4be93d65429FCb9f" + }, + "startBlockV1": 10604500, + "logsQueryRange": 50000, + "explorer": "https://sepolia.basescan.org", + "subgraphV1": { + "cliName": "base-sepolia" + }, + "publicRPCs": [ + "https://sepolia.base.org" + ] + }, { "name": "xdai-mainnet", "isTestnet": false, diff --git a/packages/metadata/networks.json b/packages/metadata/networks.json index 090df19389..311f4080ca 100644 --- a/packages/metadata/networks.json +++ b/packages/metadata/networks.json @@ -172,6 +172,38 @@ }, "publicRPCs": ["https://sepolia-rpc.scroll.io"] }, + { + "name": "base-sepolia", + "isTestnet": true, + "networkId": 84532, + "chainId": 84532, + "sfId": 111, + "shortName": "bsepolia", + "uppercaseName": "BASE_SEPOLIA", + "humanReadableName": "Base Sepolia", + "nativeTokenSymbol": "ETH", + "nativeTokenWrapper": "", + "contractsV1": { + "resolver": "0x21d4E9fbB9DB742E6ef4f29d189a7C18B0b59136", + "host": "0x109412E3C84f0539b43d39dB691B08c90f58dC7c", + "cfaV1": "0x6836F23d6171D74Ef62FcF776655aBcD2bcd62Ef", + "cfaV1Forwarder": "0xcfA132E353cB4E398080B9700609bb008eceB125", + "idaV1": "0x9358C7dCCc6B8CA6F526311e8ac266F8C861B7ea", + "gdaV1": "0x53F4f44C813Dc380182d0b2b67fe5832A12B97f8", + "gdaV1Forwarder": "0x6DA13Bde224A05a288748d857b9e7DDEffd1dE08", + "superTokenFactory": "0x7447E94Dfe3d804a9f46Bf12838d467c912C8F6C", + "superfluidLoader": "0x777Be25F9fdcA87e8a0E06Ad4be93d65429FCb9f" + }, + "startBlockV1": 10604500, + "logsQueryRange": 50000, + "explorer": "https://sepolia.basescan.org", + "subgraphV1": { + "cliName": "base-sepolia" + }, + "publicRPCs": [ + "https://sepolia.base.org" + ] + }, { "name": "xdai-mainnet", "isTestnet": false, diff --git a/packages/metadata/package.json b/packages/metadata/package.json index 60c969a359..c6c1d5ab51 100644 --- a/packages/metadata/package.json +++ b/packages/metadata/package.json @@ -1,6 +1,6 @@ { "name": "@superfluid-finance/metadata", - "version": "1.2.3", + "version": "1.2.4", "description": "Superfluid Metadata", "main": "main/index.cjs", "module": "module/index.js", diff --git a/packages/sdk-core/tasks/testSchemasAndQueries.sh b/packages/sdk-core/tasks/testSchemasAndQueries.sh index 2b8c64cc6f..ba0519fac0 100755 --- a/packages/sdk-core/tasks/testSchemasAndQueries.sh +++ b/packages/sdk-core/tasks/testSchemasAndQueries.sh @@ -35,7 +35,7 @@ for i in "${NETWORKS[@]}";do if [ "$SUBGRAPH_RELEASE_TAG" == "v1" ]; then # No need for the legacy name here - SUBGRAPH_ENDPOINT="https://${NETWORKS[$i]}.subgraph.x.superfluid.dev" + SUBGRAPH_ENDPOINT="https://$i.subgraph.x.superfluid.dev" else SUBGRAPH_ENDPOINT="https://api.thegraph.com/subgraphs/name/superfluid-finance/protocol-$SUBGRAPH_RELEASE_TAG-$GRAPH_NETWORK" fi diff --git a/packages/subgraph/tasks/deploy.sh b/packages/subgraph/tasks/deploy.sh index 71f96e37d7..06486d7c2a 100755 --- a/packages/subgraph/tasks/deploy.sh +++ b/packages/subgraph/tasks/deploy.sh @@ -17,7 +17,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-mainnet" "xdai-mainnet" "base-mainnet" "optimism-mainnet" "arbitrum-one" "celo-mainnet" "bsc-mainnet" "avalanche-c" "optimism-sepolia" "scroll-sepolia" "scroll-mainnet" "degenchain") +SUPERFLUID_NETWORKS=( "polygon-mainnet" "xdai-mainnet" "base-mainnet" "optimism-mainnet" "arbitrum-one" "celo-mainnet" "bsc-mainnet" "avalanche-c" "optimism-sepolia" "scroll-sepolia" "scroll-mainnet" "degenchain" "base-sepolia") # shellcheck disable=SC2034 GOLDSKY_NETWORKS=( "polygon-mainnet" "xdai-mainnet" "eth-mainnet" "base-mainnet" "optimism-mainnet" "arbitrum-one" "bsc-mainnet" "avalanche-c" "optimism-sepolia" "scroll-sepolia" "scroll-mainnet" "eth-sepolia") # shellcheck disable=SC2034 diff --git a/yarn.lock b/yarn.lock index 121b372b9b..a91339e0bc 100644 --- a/yarn.lock +++ b/yarn.lock @@ -893,10 +893,10 @@ dependencies: "@jridgewell/trace-mapping" "0.3.9" -"@d10r/truffle-plugin-verify@0.6.9": - version "0.6.9" - resolved "https://registry.yarnpkg.com/@d10r/truffle-plugin-verify/-/truffle-plugin-verify-0.6.9.tgz#fc826ada251f82a7f276d80e1d572eaf573d1555" - integrity sha512-E5YG+YYrbDSJlRK5590xdV6g8855pztzAKUSUZqtidq/DUXOdcbt8VjFli+H7zsFru0cywM38G7z+rWoPdolGA== +"@d10r/truffle-plugin-verify@^0.6.10": + version "0.6.10" + resolved "https://registry.yarnpkg.com/@d10r/truffle-plugin-verify/-/truffle-plugin-verify-0.6.10.tgz#f37d0b50ea3ec3e9ce5e8beed4bdb6df59404fd6" + integrity sha512-aCqotcE3usTImVRM9DW9z1nyR6LA+0t5GSlgivTnHYonWpBChkz5rFHAoHwyKsZU9BeJbPwLYwpB9K2ldWojdg== dependencies: "@truffle/resolver" "^9.0.35" axios "^0.26.1" @@ -13668,7 +13668,34 @@ mnemonist@^0.38.0: dependencies: obliterator "^2.0.0" -mocha@10.1.0, mocha@^10.0.0, mocha@^10.2.0: +mocha@10.1.0: + version "10.1.0" + resolved "https://registry.yarnpkg.com/mocha/-/mocha-10.1.0.tgz#dbf1114b7c3f9d0ca5de3133906aea3dfc89ef7a" + integrity sha512-vUF7IYxEoN7XhQpFLxQAEMtE4W91acW4B6En9l97MwE9stL1A9gusXfoHZCLVHDUJ/7V5+lbCM6yMqzo5vNymg== + dependencies: + ansi-colors "4.1.1" + browser-stdout "1.3.1" + chokidar "3.5.3" + debug "4.3.4" + diff "5.0.0" + escape-string-regexp "4.0.0" + find-up "5.0.0" + glob "7.2.0" + he "1.2.0" + js-yaml "4.1.0" + log-symbols "4.1.0" + minimatch "5.0.1" + ms "2.1.3" + nanoid "3.3.3" + serialize-javascript "6.0.0" + strip-json-comments "3.1.1" + supports-color "8.1.1" + workerpool "6.2.1" + yargs "16.2.0" + yargs-parser "20.2.4" + yargs-unparser "2.0.0" + +mocha@^10.0.0, mocha@^10.2.0: version "10.2.0" resolved "https://registry.yarnpkg.com/mocha/-/mocha-10.2.0.tgz#1fd4a7c32ba5ac372e03a17eef435bd00e5c68b8" integrity sha512-IDY7fl/BecMwFHzoqF2sg/SHHANeBoMMXFlS9r0OXKDssYE1M5O43wUY/9BVPeIvfH2zmEbBfseqN9gBQZzXkg==