diff --git a/.github/workflows/dev-cd.yaml b/.github/workflows/dev-cd.yaml index 500cbb55e..51b68cb7b 100644 --- a/.github/workflows/dev-cd.yaml +++ b/.github/workflows/dev-cd.yaml @@ -14,16 +14,15 @@ env: REACT_APP_SNOWTRACE_KEY: IAST9REKWMIW1QSE2M7K2IKKAZVNQPHC1U REACT_APP_INFURA_KEY: 0de1a96486754f8b98f284d093905198 REACT_APP_ONBOARD_JS_DAPP_ID: 30fd8cd4-93a1-4c0e-a463-b5eceb9a3956 - REACT_APP_SUBGRAPH_BASE_URL: https://api.thegraph.com/subgraphs/name/ - REACT_APP_SUBGRAPH_GOERLI: samepant/zodiac-roles-mod-goerli - REACT_APP_SUBGRAPH_SEPOLIA: samepant/zodiac-roles-mod-sepolia - REACT_APP_SUBGRAPH_GNOSIS_CHAIN: samepant/zodiac-roles-mod-gnosis-chain - REACT_APP_SUBGRAPH_MAINNET: samepant/zodiac-roles-mod-mainnet - REACT_APP_SUBGRAPH_POLYGON: samepant/zodiac-roles-mod-polygon - REACT_APP_SUBGRAPH_ARBITRUM: samepant/zodiac-roles-mod-arbitrum - REACT_APP_SUBGRAPH_OPTIMISM: samepant/zodiac-roles-mod-optimism - REACT_APP_SUBGRAPH_AVALANCHE: samepant/zodiac-roles-mod-avalanche - REACT_APP_SUBGRAPH_BSC: samepant/zodiac-roles-mod-bsc + REACT_APP_SUBGRAPH_BASE_URL: https://airlock.gnosisguild.org/api/v1/subgraph + REACT_APP_SUBGRAPH_SEPOLIA: B1xxjy8WBWLkEo2pD7PDHM2LHLAryMdoWiH4kHLL4buP + REACT_APP_SUBGRAPH_GNOSIS_CHAIN: 9KdeUKvCupvXcRqbNt9HSX3idsiYdmt81XeAvffFEZA6 + REACT_APP_SUBGRAPH_MAINNET: HYArYfPMEAawR5wFbr7qUVAgLbG9fpF91iwPVE6jKfLc + REACT_APP_SUBGRAPH_POLYGON: JDFgdGqUsDci3yv5HgEhFDFT65hmAtnnGgp4tN6nksGG + REACT_APP_SUBGRAPH_ARBITRUM: 5TLTw4whZvjbtQmzomRHJDrCX9VQ32mHSdrPN7oxdn4v + REACT_APP_SUBGRAPH_OPTIMISM: HMJik2c7BEXFy1gp7H3zK8TSqubzeGQ8sfZjgGbLJjwy + REACT_APP_SUBGRAPH_AVALANCHE: 6pVVa2Q53HRqQahiZLovV5AUN48nK28Cym6TRbw4ABP8 + REACT_APP_SUBGRAPH_BSC: 7ffR3tdeVZ2SrHcnzCswBoqX7Zx4P4wkG9V6qEUomdU jobs: deploy: diff --git a/.github/workflows/prod-release-deploy.yaml b/.github/workflows/prod-release-deploy.yaml index 20ad2b404..40e832613 100644 --- a/.github/workflows/prod-release-deploy.yaml +++ b/.github/workflows/prod-release-deploy.yaml @@ -14,16 +14,15 @@ env: REACT_APP_SNOWTRACE_KEY: IAST9REKWMIW1QSE2M7K2IKKAZVNQPHC1U REACT_APP_INFURA_KEY: 0de1a96486754f8b98f284d093905198 REACT_APP_ONBOARD_JS_DAPP_ID: 30fd8cd4-93a1-4c0e-a463-b5eceb9a3956 - REACT_APP_SUBGRAPH_BASE_URL: https://api.thegraph.com/subgraphs/name/ - REACT_APP_SUBGRAPH_GOERLI: samepant/zodiac-roles-mod-goerli - REACT_APP_SUBGRAPH_SEPOLIA: samepant/zodiac-roles-mod-sepolia - REACT_APP_SUBGRAPH_GNOSIS_CHAIN: samepant/zodiac-roles-mod-gnosis-chain - REACT_APP_SUBGRAPH_MAINNET: samepant/zodiac-roles-mod-mainnet - REACT_APP_SUBGRAPH_POLYGON: samepant/zodiac-roles-mod-polygon - REACT_APP_SUBGRAPH_ARBITRUM: samepant/zodiac-roles-mod-arbitrum - REACT_APP_SUBGRAPH_OPTIMISM: samepant/zodiac-roles-mod-optimism - REACT_APP_SUBGRAPH_AVALANCHE: samepant/zodiac-roles-mod-avalanche - REACT_APP_SUBGRAPH_BSC: samepant/zodiac-roles-mod-bsc + REACT_APP_SUBGRAPH_BASE_URL: https://airlock.gnosisguild.org/api/v1/subgraph + REACT_APP_SUBGRAPH_SEPOLIA: B1xxjy8WBWLkEo2pD7PDHM2LHLAryMdoWiH4kHLL4buP + REACT_APP_SUBGRAPH_GNOSIS_CHAIN: 9KdeUKvCupvXcRqbNt9HSX3idsiYdmt81XeAvffFEZA6 + REACT_APP_SUBGRAPH_MAINNET: HYArYfPMEAawR5wFbr7qUVAgLbG9fpF91iwPVE6jKfLc + REACT_APP_SUBGRAPH_POLYGON: JDFgdGqUsDci3yv5HgEhFDFT65hmAtnnGgp4tN6nksGG + REACT_APP_SUBGRAPH_ARBITRUM: 5TLTw4whZvjbtQmzomRHJDrCX9VQ32mHSdrPN7oxdn4v + REACT_APP_SUBGRAPH_OPTIMISM: HMJik2c7BEXFy1gp7H3zK8TSqubzeGQ8sfZjgGbLJjwy + REACT_APP_SUBGRAPH_AVALANCHE: 6pVVa2Q53HRqQahiZLovV5AUN48nK28Cym6TRbw4ABP8 + REACT_APP_SUBGRAPH_BSC: 7ffR3tdeVZ2SrHcnzCswBoqX7Zx4P4wkG9V6qEUomdU jobs: deploy: diff --git a/packages/app/.env.sample b/packages/app/.env.sample index 158b2e0c3..54c4c66a4 100644 --- a/packages/app/.env.sample +++ b/packages/app/.env.sample @@ -11,14 +11,12 @@ REACT_APP_OPTIMISTICSCAN_KEY= REACT_APP_SNOWTRACE_KEY= # Subgraphs -REACT_APP_SUBGRAPH_BASE_URL=https://api.thegraph.com/subgraphs/name/ -REACT_APP_SUBGRAPH_GOERLI=samepant/zodiac-roles-mod-goerli -REACT_APP_SUBGRAPH_SEPOLIA=samepant/zodiac-roles-mod-sepolia -REACT_APP_SUBGRAPH_GNOSIS_CHAIN=samepant/zodiac-roles-mod-gnosis-chain -REACT_APP_SUBGRAPH_MAINNET=samepant/zodiac-roles-mod-mainnet -REACT_APP_SUBGRAPH_POLYGON=samepant/zodiac-roles-mod-polygon -REACT_APP_SUBGRAPH_ARBITRUM=samepant/zodiac-roles-mod-arbitrum -REACT_APP_SUBGRAPH_OPTIMISM=samepant/zodiac-roles-mod-optimism -REACT_APP_SUBGRAPH_AVALANCHE=samepant/zodiac-roles-mod-avalanche -REACT_APP_SUBGRAPH_BSC=samepant/zodiac-roles-mod-bsc -# REACT_APP_SUBGRAPH_OPTIMISM_ON_GNOSIS_CHAIN=samepant/zodiac-roles-mod_optimism-on-gnosis-chain +REACT_APP_SUBGRAPH_BASE_URL=https://airlock.gnosisguild.org/api/v1/subgraph +REACT_APP_SUBGRAPH_SEPOLIA=B1xxjy8WBWLkEo2pD7PDHM2LHLAryMdoWiH4kHLL4buP +REACT_APP_SUBGRAPH_GNOSIS_CHAIN=9KdeUKvCupvXcRqbNt9HSX3idsiYdmt81XeAvffFEZA6 +REACT_APP_SUBGRAPH_MAINNET=HYArYfPMEAawR5wFbr7qUVAgLbG9fpF91iwPVE6jKfLc +REACT_APP_SUBGRAPH_POLYGON=JDFgdGqUsDci3yv5HgEhFDFT65hmAtnnGgp4tN6nksGG +REACT_APP_SUBGRAPH_ARBITRUM=5TLTw4whZvjbtQmzomRHJDrCX9VQ32mHSdrPN7oxdn4v +REACT_APP_SUBGRAPH_OPTIMISM=HMJik2c7BEXFy1gp7H3zK8TSqubzeGQ8sfZjgGbLJjwy +REACT_APP_SUBGRAPH_AVALANCHE=6pVVa2Q53HRqQahiZLovV5AUN48nK28Cym6TRbw4ABP8 +REACT_APP_SUBGRAPH_BSC=7ffR3tdeVZ2SrHcnzCswBoqX7Zx4P4wkG9V6qEUomdU diff --git a/packages/sdk/src/presets/mainnet/ENS/test_payload_kpk.ts b/packages/sdk/src/presets/mainnet/ENS/test_payload_kpk.ts index 696df98de..a3a8fa71c 100644 --- a/packages/sdk/src/presets/mainnet/ENS/test_payload_kpk.ts +++ b/packages/sdk/src/presets/mainnet/ENS/test_payload_kpk.ts @@ -1,16 +1,11 @@ -import { - ZERO_ADDRESS, - aura, - balancer, - cowswap -} from "../addresses" -import { staticEqual, staticOneOf } from "../../helpers/utils" -import { allowErc20Approve } from "../../helpers/erc20" -import { lidoExitStrategy1 } from "../../helpers/ExitStrategies/LidoExitStrategies" +import { allow } from "../../allow" import { auraExitStrategy2 } from "../../helpers/ExitStrategies/AuraExitStrategies" +import { lidoExitStrategy1 } from "../../helpers/ExitStrategies/LidoExitStrategies" +import { allowErc20Approve } from "../../helpers/erc20" +import { staticEqual, staticOneOf } from "../../helpers/utils" import { AVATAR } from "../../placeholders" import { RolePreset } from "../../types" -import { allow } from "../../allow" +import { ZERO_ADDRESS, aura, balancer, cowswap } from "../addresses" const preset = { network: 1, diff --git a/packages/sdk/src/subgraph.ts b/packages/sdk/src/subgraph.ts index c6e0428b7..fa541ec48 100644 --- a/packages/sdk/src/subgraph.ts +++ b/packages/sdk/src/subgraph.ts @@ -1,18 +1,18 @@ const SUBGRAPH = { - [1]: "https://api.thegraph.com/subgraphs/name/samepant/zodiac-roles-mod-mainnet", - [5]: "https://api.thegraph.com/subgraphs/name/samepant/zodiac-roles-mod-goerli", + [1]: "https://airlock.gnosisguild.org/api/v1/subgraph/HYArYfPMEAawR5wFbr7qUVAgLbG9fpF91iwPVE6jKfLc", + [11155111]: - "https://api.thegraph.com/subgraphs/name/samepant/zodiac-roles-mod-sepolia", - // [10]: "https://api.thegraph.com/subgraphs/name/samepant/zodiac-roles-mod-optimism", - [56]: "https://api.thegraph.com/subgraphs/name/samepant/zodiac-roles-mod-bsc", + "https://airlock.gnosisguild.org/api/v1/subgraph/B1xxjy8WBWLkEo2pD7PDHM2LHLAryMdoWiH4kHLL4buP", + // [10]: "https://airlock.gnosisguild.org/api/v1/subgraph/HMJik2c7BEXFy1gp7H3zK8TSqubzeGQ8sfZjgGbLJjwy", + [56]: "https://airlock.gnosisguild.org/api/v1/subgraph/7ffR3tdeVZ2SrHcnzCswBoqX7Zx4P4wkG9V6qEUomdU", [100]: - "https://api.thegraph.com/subgraphs/name/samepant/zodiac-roles-mod-gnosis-chain", + "https://airlock.gnosisguild.org/api/v1/subgraph/9KdeUKvCupvXcRqbNt9HSX3idsiYdmt81XeAvffFEZA6", [137]: - "https://api.thegraph.com/subgraphs/name/samepant/zodiac-roles-mod-polygon", + "https://airlock.gnosisguild.org/api/v1/subgraph/JDFgdGqUsDci3yv5HgEhFDFT65hmAtnnGgp4tN6nksGG", [42161]: - "https://api.thegraph.com/subgraphs/name/samepant/zodiac-roles-mod-arbitrum", + "https://airlock.gnosisguild.org/api/v1/subgraph/5TLTw4whZvjbtQmzomRHJDrCX9VQ32mHSdrPN7oxdn4v", // [43114]: - // "https://api.thegraph.com/subgraphs/name/samepant/zodiac-roles-mod-avalanche", + // "https://airlock.gnosisguild.org/api/v1/subgraph/6pVVa2Q53HRqQahiZLovV5AUN48nK28Cym6TRbw4ABP8", } export default SUBGRAPH