Skip to content

Commit

Permalink
fix: fix broken gql call, narrow block query range (#4152)
Browse files Browse the repository at this point in the history
daywiss authored Aug 17, 2023

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
1 parent b468c62 commit 030b07d
Showing 2 changed files with 20 additions and 8 deletions.
20 changes: 15 additions & 5 deletions src/plugins/safeSnap/constants.ts
Original file line number Diff line number Diff line change
@@ -421,39 +421,44 @@ export const contractData: ContractData[] = [
name: 'OptimisticOracleV3',
address: '0x072819Bb43B50E7A251c64411e7aA362ce82803B',
subgraph:
'https://api.thegraph.com/subgraphs/name/umaprotocol/optimism-optimistic-oracle-v3'
'https://api.thegraph.com/subgraphs/name/umaprotocol/optimism-optimistic-oracle-v3',
deployBlock: 74537234
},
{
// gnosis
network: '100',
name: 'OptimisticOracleV3',
address: '0x22A9AaAC9c3184f68C7B7C95b1300C4B1D2fB95C',
subgraph:
'https://api.thegraph.com/subgraphs/name/umaprotocol/gnosis-optimistic-oracle-v3'
'https://api.thegraph.com/subgraphs/name/umaprotocol/gnosis-optimistic-oracle-v3',
deployBlock: 27087150
},
{
// polygon
network: '137',
name: 'OptimisticOracleV3',
address: '0x5953f2538F613E05bAED8A5AeFa8e6622467AD3D',
subgraph:
'https://api.thegraph.com/subgraphs/name/umaprotocol/polygon-optimistic-oracle-v3'
'https://api.thegraph.com/subgraphs/name/umaprotocol/polygon-optimistic-oracle-v3',
deployBlock: 39331673
},
{
//arbitrum
network: '42161',
name: 'OptimisticOracleV3',
address: '0xa6147867264374F324524E30C02C331cF28aa879',
subgraph:
'https://api.thegraph.com/subgraphs/name/umaprotocol/arbitrum-optimistic-oracle-v3'
'https://api.thegraph.com/subgraphs/name/umaprotocol/arbitrum-optimistic-oracle-v3',
deployBlock: 61236565
},
{
// avalanche
network: '43114',
name: 'OptimisticOracleV3',
address: '0xa4199d73ae206d49c966cF16c58436851f87d47F',
subgraph:
'https://api.thegraph.com/subgraphs/name/umaprotocol/avalanche-optimistic-oracle-v3'
'https://api.thegraph.com/subgraphs/name/umaprotocol/avalanche-optimistic-oracle-v3',
deployBlock: 27816737
},
{
// mainnet
@@ -480,13 +485,15 @@ export const contractData: ContractData[] = [
network: '10',
name: 'OptimisticGovernor',
address: '0x357fe84E438B3150d2F68AB9167bdb8f881f3b9A',
deployBlock: 83168480,
subgraph:
'https://api.thegraph.com/subgraphs/name/umaprotocol/optimism-optimistic-governor'
},
{
// gnosis
network: '100',
name: 'OptimisticGovernor',
deployBlock: 27102135,
subgraph:
'https://api.thegraph.com/subgraphs/name/umaprotocol/gnosis-optimistic-governor'
},
@@ -495,6 +502,7 @@ export const contractData: ContractData[] = [
network: '137',
name: 'OptimisticGovernor',
address: '0x3Cc4b597E9c3f51288c6Cd0c087DC14c3FfdD966',
deployBlock: 40677035,
subgraph:
'https://api.thegraph.com/subgraphs/name/umaprotocol/polygon-optimistic-governor'
},
@@ -503,6 +511,7 @@ export const contractData: ContractData[] = [
network: '42161',
name: 'OptimisticGovernor',
address: '0x30679ca4ea452d3df8a6c255a806e08810321763',
deployBlock: 72850751,
subgraph:
'https://api.thegraph.com/subgraphs/name/umaprotocol/arbitrum-optimistic-governor'
},
@@ -511,6 +520,7 @@ export const contractData: ContractData[] = [
network: '43114',
name: 'OptimisticGovernor',
address: '0xEF8b46765ae805537053C59f826C3aD61924Db45',
deployBlock: 28050250,
subgraph:
'https://api.thegraph.com/subgraphs/name/umaprotocol/avalanche-optimistic-governor'
}
8 changes: 5 additions & 3 deletions src/plugins/safeSnap/utils/umaModule.ts
Original file line number Diff line number Diff line change
@@ -18,7 +18,7 @@ import filter from 'lodash/filter';

function getDeployBlock(network: string, name: string): number {
const data = filter(contractData, { network, name });
if (data.length === 1) return data[0].deployBlock;
if (data.length === 1) return data[0].deployBlock ?? 0;
return 0;
}
function getContractSubgraph(search: {
@@ -103,7 +103,9 @@ const findProposalGql = async (
const subgraph = getOptimisticGovernorSubgraph(network);
const request = `
{
proposals(where:{proposalHash:"${params.proposalHash}",explanation:"${params.explanation}",ogAddress:"${params.ogAddress}"}){
proposals(where:{proposalHash:"${params.proposalHash}",explanation:"${
params.explanation
}",optimisticGovernor:"${params.ogAddress.toLowerCase()}"}){
id
executed
assertionId
@@ -249,7 +251,7 @@ export const getModuleDetailsUma = async (
// this needs to be optimized to reduce loading time, currently takes a long time to parse 3k blocks at a time.
const oGstartBlock = getDeployBlock(network, 'OptimisticGovernor');
const oOStartBlock = getDeployBlock(network, 'OptimisticOracleV3');
const maxRange = network === '1' || network === '5' ? 3000 : 10000;
const maxRange = 3000;

const [assertionEvents, transactionsProposedEvents, executionEvents] =
await Promise.all([

1 comment on commit 030b07d

@vercel
Copy link

@vercel vercel bot commented on 030b07d Aug 17, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please sign in to comment.