Skip to content

Commit b73c8e8

Browse files
KirillDogadin-stdKirillDogadin-std
authored
fix: Deprecate surplus auctions and the 1inch callee (#612)
1 parent 632575b commit b73c8e8

File tree

6 files changed

+19
-133
lines changed

6 files changed

+19
-133
lines changed

‎core/src/constants/COLLATERALS.ts

-75
Original file line numberDiff line numberDiff line change
@@ -34,9 +34,6 @@ const COLLATERALS: Record<string, CollateralConfig> = {
3434
callee: 'UniswapV2CalleeDai',
3535
route: ['ETH'],
3636
},
37-
'1inch': {
38-
callee: 'OneInchCallee',
39-
},
4037
},
4138
oracle: CONFIG_WITH_NEXT_PRICE,
4239
},
@@ -58,9 +55,6 @@ const COLLATERALS: Record<string, CollateralConfig> = {
5855
callee: 'UniswapV2CalleeDai',
5956
route: ['ETH'],
6057
},
61-
'1inch': {
62-
callee: 'OneInchCallee',
63-
},
6458
},
6559
oracle: CONFIG_WITH_NEXT_PRICE,
6660
},
@@ -82,9 +76,6 @@ const COLLATERALS: Record<string, CollateralConfig> = {
8276
callee: 'UniswapV2CalleeDai',
8377
route: ['ETH'],
8478
},
85-
'1inch': {
86-
callee: 'OneInchCallee',
87-
},
8879
},
8980
oracle: CONFIG_WITH_NEXT_PRICE,
9081
},
@@ -106,9 +97,6 @@ const COLLATERALS: Record<string, CollateralConfig> = {
10697
callee: 'UniswapV2CalleeDai',
10798
route: ['ETH'],
10899
},
109-
'1inch': {
110-
callee: 'OneInchCallee',
111-
},
112100
},
113101
oracle: CONFIG_WITH_NEXT_PRICE,
114102
},
@@ -147,9 +135,6 @@ const COLLATERALS: Record<string, CollateralConfig> = {
147135
callee: 'UniswapV2CalleeDai',
148136
route: [],
149137
},
150-
'1inch': {
151-
callee: 'OneInchCallee',
152-
},
153138
},
154139
oracle: CONFIG_WITH_NEXT_PRICE,
155140
},
@@ -171,9 +156,6 @@ const COLLATERALS: Record<string, CollateralConfig> = {
171156
callee: 'UniswapV2CalleeDai',
172157
route: [],
173158
},
174-
'1inch': {
175-
callee: 'OneInchCallee',
176-
},
177159
},
178160
oracle: CONFIG_WITH_NEXT_PRICE,
179161
},
@@ -195,9 +177,6 @@ const COLLATERALS: Record<string, CollateralConfig> = {
195177
callee: 'UniswapV2CalleeDai',
196178
route: [],
197179
},
198-
'1inch': {
199-
callee: 'OneInchCallee',
200-
},
201180
},
202181
oracle: CONFIG_WITH_NEXT_PRICE,
203182
},
@@ -219,9 +198,6 @@ const COLLATERALS: Record<string, CollateralConfig> = {
219198
callee: 'UniswapV2CalleeDai',
220199
route: ['ETH'],
221200
},
222-
'1inch': {
223-
callee: 'OneInchCallee',
224-
},
225201
},
226202
oracle: CONFIG_WITHOUT_NEXT_PRICE,
227203
},
@@ -243,9 +219,6 @@ const COLLATERALS: Record<string, CollateralConfig> = {
243219
callee: 'UniswapV2CalleeDai',
244220
route: ['ETH'],
245221
},
246-
'1inch': {
247-
callee: 'OneInchCallee',
248-
},
249222
},
250223
oracle: CONFIG_WITH_NEXT_PRICE,
251224
},
@@ -267,9 +240,6 @@ const COLLATERALS: Record<string, CollateralConfig> = {
267240
callee: 'UniswapV2CalleeDai',
268241
route: ['ETH'],
269242
},
270-
'1inch': {
271-
callee: 'OneInchCallee',
272-
},
273243
},
274244
oracle: CONFIG_WITH_NEXT_PRICE,
275245
},
@@ -291,9 +261,6 @@ const COLLATERALS: Record<string, CollateralConfig> = {
291261
callee: 'UniswapV2CalleeDai',
292262
route: ['ETH'],
293263
},
294-
'1inch': {
295-
callee: 'OneInchCallee',
296-
},
297264
},
298265
oracle: CONFIG_WITH_NEXT_PRICE,
299266
},
@@ -315,9 +282,6 @@ const COLLATERALS: Record<string, CollateralConfig> = {
315282
callee: 'UniswapV2CalleeDai',
316283
route: ['ETH'],
317284
},
318-
'1inch': {
319-
callee: 'OneInchCallee',
320-
},
321285
},
322286
oracle: CONFIG_WITH_NEXT_PRICE,
323287
},
@@ -339,9 +303,6 @@ const COLLATERALS: Record<string, CollateralConfig> = {
339303
callee: 'UniswapV2CalleeDai',
340304
route: ['ETH'],
341305
},
342-
'1inch': {
343-
callee: 'OneInchCallee',
344-
},
345306
},
346307

347308
oracle: CONFIG_WITHOUT_NEXT_PRICE,
@@ -364,9 +325,6 @@ const COLLATERALS: Record<string, CollateralConfig> = {
364325
callee: 'UniswapV2CalleeDai',
365326
route: ['ETH'],
366327
},
367-
'1inch': {
368-
callee: 'OneInchCallee',
369-
},
370328
},
371329
oracle: CONFIG_WITH_NEXT_PRICE,
372330
},
@@ -388,9 +346,6 @@ const COLLATERALS: Record<string, CollateralConfig> = {
388346
callee: 'UniswapV2CalleeDai',
389347
route: ['ETH'],
390348
},
391-
'1inch': {
392-
callee: 'OneInchCallee',
393-
},
394349
},
395350
oracle: CONFIG_WITHOUT_NEXT_PRICE,
396351
},
@@ -412,9 +367,6 @@ const COLLATERALS: Record<string, CollateralConfig> = {
412367
callee: 'UniswapV2CalleeDai',
413368
route: ['ETH'],
414369
},
415-
'1inch': {
416-
callee: 'OneInchCallee',
417-
},
418370
},
419371
oracle: CONFIG_WITH_NEXT_PRICE,
420372
},
@@ -436,9 +388,6 @@ const COLLATERALS: Record<string, CollateralConfig> = {
436388
callee: 'UniswapV2CalleeDai',
437389
route: ['ETH'],
438390
},
439-
'1inch': {
440-
callee: 'OneInchCallee',
441-
},
442391
},
443392
oracle: CONFIG_WITHOUT_NEXT_PRICE,
444393
},
@@ -460,9 +409,6 @@ const COLLATERALS: Record<string, CollateralConfig> = {
460409
callee: 'UniswapV2CalleeDai',
461410
route: ['ETH'],
462411
},
463-
'1inch': {
464-
callee: 'OneInchCallee',
465-
},
466412
},
467413
oracle: CONFIG_WITHOUT_NEXT_PRICE,
468414
},
@@ -484,9 +430,6 @@ const COLLATERALS: Record<string, CollateralConfig> = {
484430
callee: 'UniswapV2CalleeDai',
485431
route: ['ETH'],
486432
},
487-
'1inch': {
488-
callee: 'OneInchCallee',
489-
},
490433
},
491434
oracle: CONFIG_WITH_NEXT_PRICE,
492435
},
@@ -508,9 +451,6 @@ const COLLATERALS: Record<string, CollateralConfig> = {
508451
callee: 'UniswapV2CalleeDai',
509452
route: ['ETH'],
510453
},
511-
'1inch': {
512-
callee: 'OneInchCallee',
513-
},
514454
},
515455
oracle: CONFIG_WITH_NEXT_PRICE,
516456
},
@@ -532,9 +472,6 @@ const COLLATERALS: Record<string, CollateralConfig> = {
532472
callee: 'UniswapV2CalleeDai',
533473
route: ['ETH'],
534474
},
535-
'1inch': {
536-
callee: 'OneInchCallee',
537-
},
538475
},
539476
oracle: CONFIG_WITH_NEXT_PRICE,
540477
},
@@ -556,9 +493,6 @@ const COLLATERALS: Record<string, CollateralConfig> = {
556493
callee: 'UniswapV2CalleeDai',
557494
route: ['ETH'],
558495
},
559-
'1inch': {
560-
callee: 'OneInchCallee',
561-
},
562496
},
563497
oracle: CONFIG_WITH_NEXT_PRICE,
564498
},
@@ -580,9 +514,6 @@ const COLLATERALS: Record<string, CollateralConfig> = {
580514
callee: 'UniswapV2CalleeDai',
581515
route: ['ETH'],
582516
},
583-
'1inch': {
584-
callee: 'OneInchCallee',
585-
},
586517
},
587518
oracle: CONFIG_WITH_NEXT_PRICE,
588519
},
@@ -604,9 +535,6 @@ const COLLATERALS: Record<string, CollateralConfig> = {
604535
callee: 'UniswapV2CalleeDai',
605536
route: ['ETH'],
606537
},
607-
'1inch': {
608-
callee: 'OneInchCallee',
609-
},
610538
},
611539
oracle: CONFIG_WITH_NEXT_PRICE,
612540
},
@@ -628,9 +556,6 @@ const COLLATERALS: Record<string, CollateralConfig> = {
628556
callee: 'UniswapV2CalleeDai',
629557
route: ['ETH'],
630558
},
631-
'1inch': {
632-
callee: 'OneInchCallee',
633-
},
634559
},
635560
oracle: CONFIG_WITH_NEXT_PRICE,
636561
},

‎frontend/components/unified/AuctionTypeFilter.vue

-16
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,6 @@
88
>
99
Collateral auctions
1010
</button>
11-
<button
12-
class="BaseButton"
13-
:class="selectedType === 'surplus' ? 'Selected' : 'Primary'"
14-
@click="selectType('surplus')"
15-
>
16-
System surplus auctions
17-
</button>
1811
<button
1912
class="BaseButton"
2013
:class="selectedType === 'debt' ? 'Selected' : 'Primary'"
@@ -35,15 +28,6 @@
3528
is transferred to the Protocol. Part of the collateral is then auctioned off to cover the outstanding
3629
debt and a penalty fee.
3730
</TextBlock>
38-
<TextBlock v-show="selectedType == 'surplus'" title="System surplus auctions">
39-
If the Maker Protocol is successfully governed, surplus DAI is accrued. Once this surplus hits a
40-
certain threshold the Protocol will discharge it by buying and burning
41-
<Explain text="Maker tokens (MKR)">
42-
<a href="https://makerdao.com/en/whitepaper/#the-maker-protocol">MKR</a> is a token on the Ethereum
43-
blockchain that has governance rights over the Maker smart contracts
44-
</Explain>
45-
. This process is facilitated by surplus auctions.
46-
</TextBlock>
4731
<TextBlock v-show="selectedType == 'debt'" title="System debt auctions">
4832
If liquidations are not adequate in order to maintain Maker Protocol’s solvency meaning that overall
4933
debt hits a certain threshold and cannot be covered by accrued surplus, the Protocol will reduce its

‎frontend/components/unified/UnifiedAuctionsView.vue

+3-22
Original file line numberDiff line numberDiff line change
@@ -83,16 +83,6 @@ export default Vue.extend({
8383
},
8484
filters: ['collateral'],
8585
},
86-
{
87-
title: 'Surplus auctions portal',
88-
description:
89-
'Web tool that supports participation in surplus auctions by bidding on Dai with own MKR',
90-
links: {
91-
source: 'https://github.com/sidestream-tech/unified-auctions-ui',
92-
participate: '/surplus',
93-
},
94-
filters: ['surplus'],
95-
},
9686
{
9787
title: 'Debt auctions portal',
9888
description:
@@ -121,15 +111,6 @@ export default Vue.extend({
121111
},
122112
filters: ['collateral'],
123113
},
124-
{
125-
title: 'Maker Auction (surplus)',
126-
description:
127-
'Web tool that supports participation in surplus auctions by bidding on Dai with own MKR',
128-
links: {
129-
source: 'https://github.com/makerdao/auctions-ui',
130-
},
131-
filters: ['surplus'],
132-
},
133114
{
134115
title: 'Maker Auction (debt)',
135116
description:
@@ -158,7 +139,7 @@ export default Vue.extend({
158139
links: {
159140
source: 'https://github.com/makerdao/auction-keeper',
160141
},
161-
filters: ['collateral', 'surplus', 'debt'],
142+
filters: ['collateral', 'debt'],
162143
},
163144
{
164145
title: 'MakerBurn',
@@ -168,7 +149,7 @@ export default Vue.extend({
168149
links: {
169150
analytics: 'https://makerburn.com/',
170151
},
171-
filters: ['collateral', 'surplus', 'debt'],
152+
filters: ['collateral', 'debt'],
172153
},
173154
{
174155
title: 'Blockanalytica',
@@ -196,7 +177,7 @@ export default Vue.extend({
196177
links: {
197178
analytics: 'https://daistats.com/#/auctions',
198179
},
199-
filters: ['collateral', 'surplus', 'debt'],
180+
filters: ['collateral', 'debt'],
200181
},
201182
{
202183
title: 'MakerDai Twitter Bot',

‎frontend/pages/surplus.vue

+16-18
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,18 @@
11
<template>
2-
<SurplusContainer :network="network" />
2+
<div class="flex flex-col w-full text-gray-300">
3+
<span> This page has been deprecated </span>
4+
<span>
5+
Note: surplus auctions are deprecated since the introduction of
6+
<a
7+
class="text-blue-300"
8+
href="https://forum.makerdao.com/t/introduction-of-smart-burn-engine-and-initial-parameters/21201"
9+
>smart burn engine</a
10+
>
11+
via the
12+
<a class="text-blue-300" href="https://vote.makerdao.com/polling/QmQmxEZp#poll-detail"
13+
>spell 2023-06-23</a
14+
></span
15+
>
16+
</div>
17+
<!-- <SurplusContainer :network="network" /> -->
318
</template>
4-
5-
<script lang="ts">
6-
import Vue from 'vue';
7-
import SurplusContainer from '~/containers/SurplusContainer.vue';
8-
9-
export default Vue.extend({
10-
components: {
11-
SurplusContainer,
12-
},
13-
layout: process.env.DEMO_MODE ? 'demoMode' : 'default',
14-
computed: {
15-
network() {
16-
return this.$store.getters['network/getPageNetwork'];
17-
},
18-
},
19-
});
20-
</script>

‎frontend/store/network.ts

-1
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,6 @@ export const actions = {
112112
await dispatch('authorizations/setup', undefined, { root: true });
113113
await dispatch('vaults/setup', undefined, { root: true });
114114
await dispatch('auctions/setup', undefined, { root: true });
115-
await dispatch('surplus/setup', undefined, { root: true });
116115
await dispatch('debt/setup', undefined, { root: true });
117116
},
118117
async setupNetworks({ rootGetters, commit, dispatch }: ActionContext<State, State>) {

‎frontend/store/wallet.ts

-1
Original file line numberDiff line numberDiff line change
@@ -295,7 +295,6 @@ export const actions = {
295295
setup({ commit, dispatch }: ActionContext<State, State>): void {
296296
commit('reset');
297297
dispatch('refetch');
298-
dispatch('surplus/setup', undefined, { root: true });
299298
dispatch('debt/setup', undefined, { root: true });
300299
},
301300
};

0 commit comments

Comments
 (0)