-
Notifications
You must be signed in to change notification settings - Fork 10
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #179 from makerdao/staging
Staging -> Master
- Loading branch information
Showing
11 changed files
with
198 additions
and
96 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,3 @@ | ||
| -- Add optional version column as a number to dschief.vote_delegate_created_event table | ||
| ALTER TABLE dschief.vote_delegate_created_event | ||
| ADD COLUMN delegate_version INTEGER NULL; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,102 @@ | ||
| -- Dropping function as the return type changed | ||
| drop function if exists api.delegates; | ||
|
|
||
| drop type delegate_entry; | ||
|
|
||
| create type delegate_entry as ( | ||
| delegate character varying(66), | ||
| vote_delegate character varying(66), | ||
| creation_date timestamp with time zone, | ||
| expiration_date timestamp with time zone, | ||
| expired boolean, | ||
| last_voted timestamp with time zone, | ||
| delegator_count int, | ||
| total_mkr numeric(78,18), | ||
| delegate_version int | ||
| ); | ||
|
|
||
| -- Same function, but also return the delegate version | ||
| create or replace function api.delegates(_first int, order_by delegate_order_by_type default 'DATE', order_direction order_direction_type default 'DESC', include_expired boolean default false, seed double precision default random(), constitutional_delegates char[] default '{}') | ||
| returns setof delegate_entry as $$ | ||
| declare | ||
| max_page_size_value int := (select api.max_page_size()); | ||
| begin | ||
| if _first > max_page_size_value then | ||
| raise exception 'Parameter FIRST cannot be greater than %.', max_page_size_value; | ||
| elsif seed > 1 or seed < -1 then | ||
| raise exception 'Parameter SEED must have a value between -1 and 1'; | ||
| else | ||
| return query | ||
| -- Merge poll votes from Mainnet and Arbitrum and attach the timestamp to them | ||
| with merged_vote_events as ( | ||
| select voter, vote_timestamp | ||
| from ( | ||
| select voter, timestamp as vote_timestamp | ||
| from polling.voted_event A | ||
| left join vulcan2x.block B | ||
| on A.block_id = B.id | ||
| ) AB | ||
| union all | ||
| select voter, vote_timestamp | ||
| from ( | ||
| select voter, timestamp as vote_timestamp | ||
| from polling.voted_event_arbitrum C | ||
| left join vulcan2xarbitrum.block D | ||
| on C.block_id = D.id | ||
| ) CD | ||
| ), | ||
| delegates_table as ( | ||
| select E.delegate, E.vote_delegate, F.timestamp as creation_date, F.timestamp + '1 year' as expiration_date, now() > F.timestamp + '1 year' as expired, E.delegate_version | ||
| from dschief.vote_delegate_created_event E | ||
| left join vulcan2x.block F | ||
| on E.block_id = F.id | ||
| -- Filter out expired delegates if include_expired is false | ||
| where include_expired or now() < F.timestamp + '1 year' | ||
| ), | ||
| -- Merge delegates with their last votes | ||
| delegates_with_last_vote as ( | ||
| select G.*, max(H.vote_timestamp) as last_voted | ||
| from delegates_table G | ||
| left join merged_vote_events H | ||
| on G.vote_delegate = H.voter | ||
| group by G.vote_delegate, G.delegate, G.creation_date, G.expiration_date, G.expired, G.delegate_version | ||
| ), | ||
| delegations_table as ( | ||
| select contract_address, count(immediate_caller) as delegators, sum(delegations) as delegations | ||
| from ( | ||
| select immediate_caller, sum(lock) as delegations, contract_address | ||
| from dschief.delegate_lock | ||
| group by contract_address, immediate_caller | ||
| ) as I | ||
| where delegations > 0 | ||
| group by contract_address | ||
| ) | ||
| select delegate::character varying(66), vote_delegate::character varying(66), creation_date, expiration_date, expired, last_voted, coalesce(delegators, 0)::int as delegator_count, coalesce(delegations, 0)::numeric(78,18) as total_mkr, delegate_version | ||
| from ( | ||
| -- We call setseed here to make sure it's executed before the main select statement and the order by random clause. | ||
| -- By appending it to the delegates_with_last_vote table and then removing the row with offset 1, we make sure the table remains unmodified. | ||
| select setseed(seed), null delegate, null vote_delegate, null creation_date, null expiration_date, null expired, null last_voted, null delegate_version | ||
| union all | ||
| select null, delegate, vote_delegate, creation_date, expiration_date, expired, last_voted, delegate_version from delegates_with_last_vote | ||
| offset 1 | ||
| ) sd | ||
| left join delegations_table | ||
| on sd.vote_delegate::character varying(66) = delegations_table.contract_address | ||
| order by | ||
| -- Ordering first by expiration: expired at the end, second by delegate type: constitutional delegates first | ||
| -- and third by the sorting criterion selected. | ||
| case when expired then 1 else 0 end, | ||
| case when vote_delegate = ANY (constitutional_delegates) then 0 else 1 end, | ||
| case | ||
| when order_by = 'DELEGATORS' then | ||
| case when order_direction = 'ASC' then coalesce(delegators, 0)::int else -coalesce(delegators, 0)::int end | ||
| when order_by = 'MKR' then | ||
| case when order_direction = 'ASC' then coalesce(delegations, 0)::numeric(78,18) else -coalesce(delegations, 0)::numeric(78,18) end | ||
| when order_by = 'DATE' then | ||
| case when order_direction = 'ASC' then extract(epoch from creation_date) else -extract(epoch from creation_date) end | ||
| else | ||
| random() | ||
| end; | ||
| end if; | ||
| end; | ||
| $$ language plpgsql stable strict; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,28 @@ | ||
| -- Drop existing functions | ||
| DROP FUNCTION IF EXISTS dschief.all_delegates(); | ||
| DROP FUNCTION IF EXISTS api.all_delegates(); | ||
|
|
||
| CREATE OR REPLACE FUNCTION dschief.all_delegates() | ||
| RETURNS TABLE ( | ||
| delegate character varying(66), | ||
| vote_delegate character varying(66), | ||
| delegate_version int | ||
| ) AS $$ | ||
| SELECT delegate, vote_delegate, delegate_version | ||
| FROM dschief.vote_delegate_created_event | ||
| $$ LANGUAGE sql STABLE STRICT; | ||
|
|
||
|
|
||
| --This query would be called by allDelegates() in the sdk | ||
| CREATE OR REPLACE FUNCTION api.all_delegates() | ||
| RETURNS TABLE ( | ||
| delegate character varying(66), | ||
| vote_delegate character varying(66), | ||
| delegate_version int, | ||
| block_timestamp TIMESTAMP WITH TIME ZONE | ||
| ) AS $$ | ||
| SELECT delegate, vote_delegate, delegate_version, b.timestamp | ||
| FROM dschief.vote_delegate_created_event d | ||
| LEFT JOIN vulcan2x.block b | ||
| ON d.block_id = b.id; | ||
| $$ LANGUAGE sql STABLE STRICT; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -4,6 +4,7 @@ query allDelegates { | |
| delegate | ||
| voteDelegate | ||
| blockTimestamp | ||
| delegateVersion | ||
| } | ||
| } | ||
| } | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -36,6 +36,7 @@ query delegates( | |
| lastVoted | ||
| delegatorCount | ||
| totalMkr | ||
| delegateVersion | ||
| } | ||
| } | ||
| } | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,37 @@ | ||
| const { | ||
| getExtractorName, | ||
| } = require('@makerdao-dux/spock-utils/dist/extractors/rawEventDataExtractor'); | ||
|
|
||
| const { | ||
| handleEvents, | ||
| } = require('@makerdao-dux/spock-utils/dist/transformers/common'); | ||
|
|
||
| // @ts-ignore | ||
| const abi = require('../abis/vote_delegate_factory.json'); | ||
|
|
||
| module.exports = (voteDelegateFactoryAddress, nameSuffix = '') => ({ | ||
| name: `V2_vote_delegate_factory_transformer${nameSuffix}`, | ||
| dependencies: [getExtractorName(voteDelegateFactoryAddress)], | ||
| transform: async (services, logs) => { | ||
| await handleEvents(services, abi, logs[0], handlers); | ||
| }, | ||
| }); | ||
|
|
||
| const handlers = { | ||
| async CreateVoteDelegate(services, info) { | ||
| const sql = `INSERT INTO dschief.vote_delegate_created_event | ||
| (delegate, vote_delegate, log_index, tx_id, block_id, delegate_version) | ||
| VALUES(\${delegate}, \${vote_delegate}, \${log_index}, \${tx_id}, \${block_id}, \${delegate_version});`; | ||
|
|
||
| const delegate = info.event.params.usr || info.event.params.delegate; //TODO: why isn't it just usr? | ||
|
|
||
| await services.tx.none(sql, { | ||
| delegate: delegate.toLowerCase(), | ||
| vote_delegate: info.event.params.voteDelegate.toLowerCase(), | ||
| log_index: info.log.log_index, | ||
| tx_id: info.log.tx_id, | ||
| block_id: info.log.block_id, | ||
| delegate_version: 2, | ||
| }); | ||
| }, | ||
| }; |
Oops, something went wrong.