Skip to content

Commit

Permalink
Use new DAO and version of subgraph
Browse files Browse the repository at this point in the history
  • Loading branch information
sembrestels committed Nov 29, 2020
1 parent 5242678 commit cfbf023
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 5 deletions.
7 changes: 7 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
@@ -1 +1,8 @@
# Conviction funding pilot

To install conviction voting on a xDAI DAO, you can use the following command in the built-in console:
```
install/conviction-beta.aragonpm.eth/(0xc4fbe68522ba81a28879763c3ee33e08b13c499e,0x0000000000000000000000000000000000000000,0x0000000000000000000000000000000000000000,9998395,2500000,31250,2500000000000000)/CREATE_PROPOSALS_ROLE:<voting-app>:0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
```

* `0xc4fbe68522ba81a28879763c3ee33e08b13c499e` is the CSTK token
1 change: 0 additions & 1 deletion src/hooks/useFilterProposals.js
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,6 @@ const useFilterProposals = (proposals, myStakes) => {
proposal
)
const proposalTypeStatus = getProposalType(proposal)
console.log(proposal)
return (
testExecutionFilter(executionFilter, proposalExecutionStatus) &&
testTypeFilter(typeFilter, proposalTypeStatus) &&
Expand Down
4 changes: 2 additions & 2 deletions src/networks.js
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,9 @@ const networks = {
ensRegistry: '0xaafca6b0c89521752e559650206d7c925fd0e530',
defaultEthNode: 'https://xdai.poanetwork.dev/',
defaultSubgraphUrl:
'https://api.thegraph.com/subgraphs/name/1hive/aragon-c-v-beta-xdai',
'https://api.thegraph.com/subgraphs/name/1hive/aragon-conviction-voting-xdai',
name: 'xDai',
orgAddress: '0x1D7Ac94b1713E17bFA2e1C96d832329b4B79B404',
orgAddress: '0xEf1dd9ca619C3603a1A0B80345597152D5f8407F',
type: 'xdai',
},
}
Expand Down
4 changes: 2 additions & 2 deletions src/providers/AppState.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import PropTypes from 'prop-types'
import { bigNum } from '../lib/bigNumber'
import {
useAppData,
useVaultBalance,
// useVaultBalance,
useOrganzation,
useTokenBalances,
} from '../hooks/useOrgHooks'
Expand All @@ -28,7 +28,7 @@ function AppStateProvider({ children }) {
...appData
} = useAppData(organization)

const vaultBalance = useVaultBalance(installedApps, requestToken)
const vaultBalance = bigNum(0) // useVaultBalance(installedApps, requestToken)

const { balance, totalSupply } = useTokenBalances(account, stakeToken)

Expand Down

0 comments on commit cfbf023

Please sign in to comment.