Skip to content

Commit b27825e

Browse files
gorgosgorgos
authored
Merge pull request #121 from laminar-protocol/deploy-to-kovan
Deploy new version to Kovan
2 parents 8a30fdc + 1d3cf11 commit b27825e

13 files changed

+352
-581
lines changed

‎artifacts/kovan/abi/MarginFlowProtocol.json‎

Lines changed: 199 additions & 330 deletions
Large diffs are not rendered by default.

‎artifacts/kovan/abi/MarginFlowProtocolConfig.json‎

Lines changed: 74 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -67,22 +67,22 @@
6767
},
6868
{
6969
"inputs": [],
70-
"name": "isOwner",
70+
"name": "liquidityPoolELLLiquidateThreshold",
7171
"outputs": [
7272
{
73-
"internalType": "bool",
73+
"internalType": "uint256",
7474
"name": "",
75-
"type": "bool"
75+
"type": "uint256"
7676
}
7777
],
7878
"stateMutability": "view",
7979
"type": "function",
8080
"constant": true,
81-
"signature": "0x8f32d59b"
81+
"signature": "0xd345d2b3"
8282
},
8383
{
8484
"inputs": [],
85-
"name": "liquidityPoolELLLiquidateThreshold",
85+
"name": "liquidityPoolELLMarginThreshold",
8686
"outputs": [
8787
{
8888
"internalType": "uint256",
@@ -93,11 +93,11 @@
9393
"stateMutability": "view",
9494
"type": "function",
9595
"constant": true,
96-
"signature": "0xd345d2b3"
96+
"signature": "0x2fa86769"
9797
},
9898
{
9999
"inputs": [],
100-
"name": "liquidityPoolELLMarginThreshold",
100+
"name": "liquidityPoolENPLiquidateThreshold",
101101
"outputs": [
102102
{
103103
"internalType": "uint256",
@@ -108,11 +108,11 @@
108108
"stateMutability": "view",
109109
"type": "function",
110110
"constant": true,
111-
"signature": "0x2fa86769"
111+
"signature": "0x62e81cac"
112112
},
113113
{
114114
"inputs": [],
115-
"name": "liquidityPoolENPLiquidateThreshold",
115+
"name": "liquidityPoolENPMarginThreshold",
116116
"outputs": [
117117
{
118118
"internalType": "uint256",
@@ -123,11 +123,11 @@
123123
"stateMutability": "view",
124124
"type": "function",
125125
"constant": true,
126-
"signature": "0x62e81cac"
126+
"signature": "0xd25b3ec3"
127127
},
128128
{
129129
"inputs": [],
130-
"name": "liquidityPoolENPMarginThreshold",
130+
"name": "maxSpread",
131131
"outputs": [
132132
{
133133
"internalType": "uint256",
@@ -138,11 +138,11 @@
138138
"stateMutability": "view",
139139
"type": "function",
140140
"constant": true,
141-
"signature": "0xd25b3ec3"
141+
"signature": "0x796e8f90"
142142
},
143143
{
144144
"inputs": [],
145-
"name": "maxSpread",
145+
"name": "maxTradingPairCount",
146146
"outputs": [
147147
{
148148
"internalType": "uint256",
@@ -153,7 +153,7 @@
153153
"stateMutability": "view",
154154
"type": "function",
155155
"constant": true,
156-
"signature": "0x796e8f90"
156+
"signature": "0xfabc3326"
157157
},
158158
{
159159
"inputs": [],
@@ -315,6 +315,11 @@
315315
"name": "_maxSpread",
316316
"type": "uint256"
317317
},
318+
{
319+
"internalType": "uint256",
320+
"name": "_maxTradingPairCount",
321+
"type": "uint256"
322+
},
318323
{
319324
"internalType": "uint256",
320325
"name": "_initialTraderRiskMarginCallThreshold",
@@ -350,21 +355,7 @@
350355
"outputs": [],
351356
"stateMutability": "nonpayable",
352357
"type": "function",
353-
"signature": "0xb6610ace"
354-
},
355-
{
356-
"inputs": [
357-
{
358-
"internalType": "address",
359-
"name": "sender",
360-
"type": "address"
361-
}
362-
],
363-
"name": "initialize",
364-
"outputs": [],
365-
"stateMutability": "nonpayable",
366-
"type": "function",
367-
"signature": "0xc4d66de8"
358+
"signature": "0x6d55160c"
368359
},
369360
{
370361
"inputs": [
@@ -409,6 +400,20 @@
409400
"type": "function",
410401
"signature": "0xbef648db"
411402
},
403+
{
404+
"inputs": [
405+
{
406+
"internalType": "uint256",
407+
"name": "_maxTradingPairCount",
408+
"type": "uint256"
409+
}
410+
],
411+
"name": "setMaxTradingPairCount",
412+
"outputs": [],
413+
"stateMutability": "nonpayable",
414+
"type": "function",
415+
"signature": "0xdca450de"
416+
},
412417
{
413418
"inputs": [
414419
{
@@ -554,6 +559,46 @@
554559
"constant": true,
555560
"signature": "0xcd2ce4ae"
556561
},
562+
{
563+
"inputs": [],
564+
"name": "getEnpAndEllMarginThresholds",
565+
"outputs": [
566+
{
567+
"internalType": "uint256",
568+
"name": "",
569+
"type": "uint256"
570+
},
571+
{
572+
"internalType": "uint256",
573+
"name": "",
574+
"type": "uint256"
575+
}
576+
],
577+
"stateMutability": "view",
578+
"type": "function",
579+
"constant": true,
580+
"signature": "0x084e6acf"
581+
},
582+
{
583+
"inputs": [],
584+
"name": "getEnpAndEllLiquidateThresholds",
585+
"outputs": [
586+
{
587+
"internalType": "uint256",
588+
"name": "",
589+
"type": "uint256"
590+
},
591+
{
592+
"internalType": "uint256",
593+
"name": "",
594+
"type": "uint256"
595+
}
596+
],
597+
"stateMutability": "view",
598+
"type": "function",
599+
"constant": true,
600+
"signature": "0x584fb8ab"
601+
},
557602
{
558603
"inputs": [
559604
{

‎artifacts/kovan/abi/MarginFlowProtocolSafety.json‎

Lines changed: 15 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -188,14 +188,6 @@
188188
"constant": true,
189189
"signature": "0x0d3cc84c"
190190
},
191-
{
192-
"inputs": [],
193-
"name": "initialize",
194-
"outputs": [],
195-
"stateMutability": "nonpayable",
196-
"type": "function",
197-
"signature": "0x8129fc1c"
198-
},
199191
{
200192
"inputs": [
201193
{
@@ -230,6 +222,11 @@
230222
"name": "protocolLiquidated",
231223
"type": "address"
232224
},
225+
{
226+
"internalType": "contract MarginFlowProtocolAccPositions",
227+
"name": "protocolAcc",
228+
"type": "address"
229+
},
233230
{
234231
"internalType": "contract MarginLiquidityPoolRegistry",
235232
"name": "liquidityPoolRegistry",
@@ -255,7 +252,7 @@
255252
"outputs": [],
256253
"stateMutability": "nonpayable",
257254
"type": "function",
258-
"signature": "0xa596ddef"
255+
"signature": "0x078da5b0"
259256
},
260257
{
261258
"inputs": [
@@ -506,25 +503,19 @@
506503
"internalType": "contract MarginLiquidityPoolInterface",
507504
"name": "_pool",
508505
"type": "address"
509-
},
510-
{
511-
"internalType": "address",
512-
"name": "_trader",
513-
"type": "address"
514506
}
515507
],
516-
"name": "getLeveragedDebitsOfTrader",
508+
"name": "getEquityOfPool",
517509
"outputs": [
518510
{
519-
"internalType": "uint256",
511+
"internalType": "int256",
520512
"name": "",
521-
"type": "uint256"
513+
"type": "int256"
522514
}
523515
],
524-
"stateMutability": "view",
516+
"stateMutability": "nonpayable",
525517
"type": "function",
526-
"constant": true,
527-
"signature": "0x76fd7cec"
518+
"signature": "0x4dd283b2"
528519
},
529520
{
530521
"inputs": [
@@ -534,17 +525,17 @@
534525
"type": "address"
535526
}
536527
],
537-
"name": "getEquityOfPool",
528+
"name": "getEstimatedRequiredDepositForPool",
538529
"outputs": [
539530
{
540-
"internalType": "int256",
531+
"internalType": "uint256",
541532
"name": "",
542-
"type": "int256"
533+
"type": "uint256"
543534
}
544535
],
545536
"stateMutability": "nonpayable",
546537
"type": "function",
547-
"signature": "0x4dd283b2"
538+
"signature": "0xe76511a7"
548539
},
549540
{
550541
"inputs": [

‎artifacts/kovan/abi/MarginLiquidityPoolInterface.json‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -39,28 +39,28 @@
3939
},
4040
{
4141
"inputs": [],
42-
"name": "moneyMarket",
42+
"name": "getOwner",
4343
"outputs": [
4444
{
45-
"internalType": "contract MoneyMarketInterface",
45+
"internalType": "address",
4646
"name": "",
4747
"type": "address"
4848
}
4949
],
50-
"stateMutability": "nonpayable",
50+
"stateMutability": "view",
5151
"type": "function"
5252
},
5353
{
5454
"inputs": [],
55-
"name": "owner",
55+
"name": "moneyMarket",
5656
"outputs": [
5757
{
58-
"internalType": "address",
58+
"internalType": "contract MoneyMarketInterface",
5959
"name": "",
6060
"type": "address"
6161
}
6262
],
63-
"stateMutability": "view",
63+
"stateMutability": "nonpayable",
6464
"type": "function"
6565
},
6666
{

‎artifacts/kovan/abi/MarginLiquidityPoolRegistry.json‎

Lines changed: 6 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -40,21 +40,6 @@
4040
"constant": true,
4141
"signature": "0x9201010a"
4242
},
43-
{
44-
"inputs": [],
45-
"name": "isOwner",
46-
"outputs": [
47-
{
48-
"internalType": "bool",
49-
"name": "",
50-
"type": "bool"
51-
}
52-
],
53-
"stateMutability": "view",
54-
"type": "function",
55-
"constant": true,
56-
"signature": "0x8f32d59b"
57-
},
5843
{
5944
"inputs": [
6045
{
@@ -176,28 +161,6 @@
176161
"type": "function",
177162
"signature": "0xf2fde38b"
178163
},
179-
{
180-
"inputs": [],
181-
"name": "initialize",
182-
"outputs": [],
183-
"stateMutability": "nonpayable",
184-
"type": "function",
185-
"signature": "0x8129fc1c"
186-
},
187-
{
188-
"inputs": [
189-
{
190-
"internalType": "address",
191-
"name": "sender",
192-
"type": "address"
193-
}
194-
],
195-
"name": "initialize",
196-
"outputs": [],
197-
"stateMutability": "nonpayable",
198-
"type": "function",
199-
"signature": "0xc4d66de8"
200-
},
201164
{
202165
"inputs": [
203166
{
@@ -232,6 +195,11 @@
232195
"name": "protocolLiquidated",
233196
"type": "address"
234197
},
198+
{
199+
"internalType": "contract MarginFlowProtocolAccPositions",
200+
"name": "protocolAcc",
201+
"type": "address"
202+
},
235203
{
236204
"internalType": "contract MarginLiquidityPoolRegistry",
237205
"name": "liquidityPoolRegistry",
@@ -252,7 +220,7 @@
252220
"outputs": [],
253221
"stateMutability": "nonpayable",
254222
"type": "function",
255-
"signature": "0xf2da6d6c"
223+
"signature": "0x08e0355c"
256224
},
257225
{
258226
"inputs": [

0 commit comments

Comments
 (0)