Skip to content

Commit

Permalink
fix: Deprecate surplus auctions and the 1inch callee (#612)
Browse files Browse the repository at this point in the history
  • Loading branch information
@KirillDogadin-std
KirillDogadin-std authored Aug 23, 2023
1 parent 632575b commit b73c8e8
Show file tree
Hide file tree
Showing 6 changed files with 19 additions and 133 deletions.
75 changes: 0 additions & 75 deletions core/src/constants/COLLATERALS.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,9 +34,6 @@ const COLLATERALS: Record<string, CollateralConfig> = {
callee: 'UniswapV2CalleeDai',
route: ['ETH'],
},
'1inch': {
callee: 'OneInchCallee',
},
},
oracle: CONFIG_WITH_NEXT_PRICE,
},
Expand All @@ -58,9 +55,6 @@ const COLLATERALS: Record<string, CollateralConfig> = {
callee: 'UniswapV2CalleeDai',
route: ['ETH'],
},
'1inch': {
callee: 'OneInchCallee',
},
},
oracle: CONFIG_WITH_NEXT_PRICE,
},
Expand All @@ -82,9 +76,6 @@ const COLLATERALS: Record<string, CollateralConfig> = {
callee: 'UniswapV2CalleeDai',
route: ['ETH'],
},
'1inch': {
callee: 'OneInchCallee',
},
},
oracle: CONFIG_WITH_NEXT_PRICE,
},
Expand All @@ -106,9 +97,6 @@ const COLLATERALS: Record<string, CollateralConfig> = {
callee: 'UniswapV2CalleeDai',
route: ['ETH'],
},
'1inch': {
callee: 'OneInchCallee',
},
},
oracle: CONFIG_WITH_NEXT_PRICE,
},
Expand Down Expand Up @@ -147,9 +135,6 @@ const COLLATERALS: Record<string, CollateralConfig> = {
callee: 'UniswapV2CalleeDai',
route: [],
},
'1inch': {
callee: 'OneInchCallee',
},
},
oracle: CONFIG_WITH_NEXT_PRICE,
},
Expand All @@ -171,9 +156,6 @@ const COLLATERALS: Record<string, CollateralConfig> = {
callee: 'UniswapV2CalleeDai',
route: [],
},
'1inch': {
callee: 'OneInchCallee',
},
},
oracle: CONFIG_WITH_NEXT_PRICE,
},
Expand All @@ -195,9 +177,6 @@ const COLLATERALS: Record<string, CollateralConfig> = {
callee: 'UniswapV2CalleeDai',
route: [],
},
'1inch': {
callee: 'OneInchCallee',
},
},
oracle: CONFIG_WITH_NEXT_PRICE,
},
Expand All @@ -219,9 +198,6 @@ const COLLATERALS: Record<string, CollateralConfig> = {
callee: 'UniswapV2CalleeDai',
route: ['ETH'],
},
'1inch': {
callee: 'OneInchCallee',
},
},
oracle: CONFIG_WITHOUT_NEXT_PRICE,
},
Expand All @@ -243,9 +219,6 @@ const COLLATERALS: Record<string, CollateralConfig> = {
callee: 'UniswapV2CalleeDai',
route: ['ETH'],
},
'1inch': {
callee: 'OneInchCallee',
},
},
oracle: CONFIG_WITH_NEXT_PRICE,
},
Expand All @@ -267,9 +240,6 @@ const COLLATERALS: Record<string, CollateralConfig> = {
callee: 'UniswapV2CalleeDai',
route: ['ETH'],
},
'1inch': {
callee: 'OneInchCallee',
},
},
oracle: CONFIG_WITH_NEXT_PRICE,
},
Expand All @@ -291,9 +261,6 @@ const COLLATERALS: Record<string, CollateralConfig> = {
callee: 'UniswapV2CalleeDai',
route: ['ETH'],
},
'1inch': {
callee: 'OneInchCallee',
},
},
oracle: CONFIG_WITH_NEXT_PRICE,
},
Expand All @@ -315,9 +282,6 @@ const COLLATERALS: Record<string, CollateralConfig> = {
callee: 'UniswapV2CalleeDai',
route: ['ETH'],
},
'1inch': {
callee: 'OneInchCallee',
},
},
oracle: CONFIG_WITH_NEXT_PRICE,
},
Expand All @@ -339,9 +303,6 @@ const COLLATERALS: Record<string, CollateralConfig> = {
callee: 'UniswapV2CalleeDai',
route: ['ETH'],
},
'1inch': {
callee: 'OneInchCallee',
},
},

oracle: CONFIG_WITHOUT_NEXT_PRICE,
Expand All @@ -364,9 +325,6 @@ const COLLATERALS: Record<string, CollateralConfig> = {
callee: 'UniswapV2CalleeDai',
route: ['ETH'],
},
'1inch': {
callee: 'OneInchCallee',
},
},
oracle: CONFIG_WITH_NEXT_PRICE,
},
Expand All @@ -388,9 +346,6 @@ const COLLATERALS: Record<string, CollateralConfig> = {
callee: 'UniswapV2CalleeDai',
route: ['ETH'],
},
'1inch': {
callee: 'OneInchCallee',
},
},
oracle: CONFIG_WITHOUT_NEXT_PRICE,
},
Expand All @@ -412,9 +367,6 @@ const COLLATERALS: Record<string, CollateralConfig> = {
callee: 'UniswapV2CalleeDai',
route: ['ETH'],
},
'1inch': {
callee: 'OneInchCallee',
},
},
oracle: CONFIG_WITH_NEXT_PRICE,
},
Expand All @@ -436,9 +388,6 @@ const COLLATERALS: Record<string, CollateralConfig> = {
callee: 'UniswapV2CalleeDai',
route: ['ETH'],
},
'1inch': {
callee: 'OneInchCallee',
},
},
oracle: CONFIG_WITHOUT_NEXT_PRICE,
},
Expand All @@ -460,9 +409,6 @@ const COLLATERALS: Record<string, CollateralConfig> = {
callee: 'UniswapV2CalleeDai',
route: ['ETH'],
},
'1inch': {
callee: 'OneInchCallee',
},
},
oracle: CONFIG_WITHOUT_NEXT_PRICE,
},
Expand All @@ -484,9 +430,6 @@ const COLLATERALS: Record<string, CollateralConfig> = {
callee: 'UniswapV2CalleeDai',
route: ['ETH'],
},
'1inch': {
callee: 'OneInchCallee',
},
},
oracle: CONFIG_WITH_NEXT_PRICE,
},
Expand All @@ -508,9 +451,6 @@ const COLLATERALS: Record<string, CollateralConfig> = {
callee: 'UniswapV2CalleeDai',
route: ['ETH'],
},
'1inch': {
callee: 'OneInchCallee',
},
},
oracle: CONFIG_WITH_NEXT_PRICE,
},
Expand All @@ -532,9 +472,6 @@ const COLLATERALS: Record<string, CollateralConfig> = {
callee: 'UniswapV2CalleeDai',
route: ['ETH'],
},
'1inch': {
callee: 'OneInchCallee',
},
},
oracle: CONFIG_WITH_NEXT_PRICE,
},
Expand All @@ -556,9 +493,6 @@ const COLLATERALS: Record<string, CollateralConfig> = {
callee: 'UniswapV2CalleeDai',
route: ['ETH'],
},
'1inch': {
callee: 'OneInchCallee',
},
},
oracle: CONFIG_WITH_NEXT_PRICE,
},
Expand All @@ -580,9 +514,6 @@ const COLLATERALS: Record<string, CollateralConfig> = {
callee: 'UniswapV2CalleeDai',
route: ['ETH'],
},
'1inch': {
callee: 'OneInchCallee',
},
},
oracle: CONFIG_WITH_NEXT_PRICE,
},
Expand All @@ -604,9 +535,6 @@ const COLLATERALS: Record<string, CollateralConfig> = {
callee: 'UniswapV2CalleeDai',
route: ['ETH'],
},
'1inch': {
callee: 'OneInchCallee',
},
},
oracle: CONFIG_WITH_NEXT_PRICE,
},
Expand All @@ -628,9 +556,6 @@ const COLLATERALS: Record<string, CollateralConfig> = {
callee: 'UniswapV2CalleeDai',
route: ['ETH'],
},
'1inch': {
callee: 'OneInchCallee',
},
},
oracle: CONFIG_WITH_NEXT_PRICE,
},
Expand Down
16 changes: 0 additions & 16 deletions frontend/components/unified/AuctionTypeFilter.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,6 @@
>
Collateral auctions
</button>
<button
class="BaseButton"
:class="selectedType === 'surplus' ? 'Selected' : 'Primary'"
@click="selectType('surplus')"
>
System surplus auctions
</button>
<button
class="BaseButton"
:class="selectedType === 'debt' ? 'Selected' : 'Primary'"
Expand All @@ -35,15 +28,6 @@
is transferred to the Protocol. Part of the collateral is then auctioned off to cover the outstanding
debt and a penalty fee.
</TextBlock>
<TextBlock v-show="selectedType == 'surplus'" title="System surplus auctions">
If the Maker Protocol is successfully governed, surplus DAI is accrued. Once this surplus hits a
certain threshold the Protocol will discharge it by buying and burning
<Explain text="Maker tokens (MKR)">
<a href="https://makerdao.com/en/whitepaper/#the-maker-protocol">MKR</a> is a token on the Ethereum
blockchain that has governance rights over the Maker smart contracts
</Explain>
. This process is facilitated by surplus auctions.
</TextBlock>
<TextBlock v-show="selectedType == 'debt'" title="System debt auctions">
If liquidations are not adequate in order to maintain Maker Protocol’s solvency meaning that overall
debt hits a certain threshold and cannot be covered by accrued surplus, the Protocol will reduce its
Expand Down
25 changes: 3 additions & 22 deletions frontend/components/unified/UnifiedAuctionsView.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -83,16 +83,6 @@ export default Vue.extend({
},
filters: ['collateral'],
},
{
title: 'Surplus auctions portal',
description:
'Web tool that supports participation in surplus auctions by bidding on Dai with own MKR',
links: {
source: 'https://github.com/sidestream-tech/unified-auctions-ui',
participate: '/surplus',
},
filters: ['surplus'],
},
{
title: 'Debt auctions portal',
description:
Expand Down Expand Up @@ -121,15 +111,6 @@ export default Vue.extend({
},
filters: ['collateral'],
},
{
title: 'Maker Auction (surplus)',
description:
'Web tool that supports participation in surplus auctions by bidding on Dai with own MKR',
links: {
source: 'https://github.com/makerdao/auctions-ui',
},
filters: ['surplus'],
},
{
title: 'Maker Auction (debt)',
description:
Expand Down Expand Up @@ -158,7 +139,7 @@ export default Vue.extend({
links: {
source: 'https://github.com/makerdao/auction-keeper',
},
filters: ['collateral', 'surplus', 'debt'],
filters: ['collateral', 'debt'],
},
{
title: 'MakerBurn',
Expand All @@ -168,7 +149,7 @@ export default Vue.extend({
links: {
analytics: 'https://makerburn.com/',
},
filters: ['collateral', 'surplus', 'debt'],
filters: ['collateral', 'debt'],
},
{
title: 'Blockanalytica',
Expand Down Expand Up @@ -196,7 +177,7 @@ export default Vue.extend({
links: {
analytics: 'https://daistats.com/#/auctions',
},
filters: ['collateral', 'surplus', 'debt'],
filters: ['collateral', 'debt'],
},
{
title: 'MakerDai Twitter Bot',
Expand Down
34 changes: 16 additions & 18 deletions frontend/pages/surplus.vue
View file
Original file line number Diff line number Diff line change
@@ -1,20 +1,18 @@
<template>
<SurplusContainer :network="network" />
<div class="flex flex-col w-full text-gray-300">
<span> This page has been deprecated </span>
<span>
Note: surplus auctions are deprecated since the introduction of
<a
class="text-blue-300"
href="https://forum.makerdao.com/t/introduction-of-smart-burn-engine-and-initial-parameters/21201"
>smart burn engine</a
>
via the
<a class="text-blue-300" href="https://vote.makerdao.com/polling/QmQmxEZp#poll-detail"
>spell 2023-06-23</a
></span
>
</div>
<!-- <SurplusContainer :network="network" /> -->
</template>

<script lang="ts">
import Vue from 'vue';
import SurplusContainer from '~/containers/SurplusContainer.vue';
export default Vue.extend({
components: {
SurplusContainer,
},
layout: process.env.DEMO_MODE ? 'demoMode' : 'default',
computed: {
network() {
return this.$store.getters['network/getPageNetwork'];
},
},
});
</script>
1 change: 0 additions & 1 deletion frontend/store/network.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,6 @@ export const actions = {
await dispatch('authorizations/setup', undefined, { root: true });
await dispatch('vaults/setup', undefined, { root: true });
await dispatch('auctions/setup', undefined, { root: true });
await dispatch('surplus/setup', undefined, { root: true });
await dispatch('debt/setup', undefined, { root: true });
},
async setupNetworks({ rootGetters, commit, dispatch }: ActionContext<State, State>) {
Expand Down
1 change: 0 additions & 1 deletion frontend/store/wallet.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -295,7 +295,6 @@ export const actions = {
setup({ commit, dispatch }: ActionContext<State, State>): void {
commit('reset');
dispatch('refetch');
dispatch('surplus/setup', undefined, { root: true });
dispatch('debt/setup', undefined, { root: true });
},
};

0 comments on commit b73c8e8

Please sign in to comment.