Skip to content

Commit 385cd40

Browse files
TacitvsXITacitvsXI
authored
Merge pull request #1 from ILESKOV/master
Master
2 parents 20a9f22 + 188899f commit 385cd40

17 files changed

Lines changed: 1215 additions & 27456 deletions

‎README.md‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ List the ready features here:
3838
- User can see ETH / ESKO price action in integrated chart
3939

4040
## Screenshots
41-
![Example screenshot](./Screenshot.png)
41+
![Example screenshot](./helpers/Screenshot.png)
4242

4343

4444
## Setup
@@ -79,7 +79,3 @@ Room for improvement:
7979
## Contact
8080
Created by [@LESKOV](https://www.linkedin.com/in/ivan-leskov-4b5664189/) - feel free to contact me!
8181

82-
83-
84-
85-

Screenshot.png renamed to helpers/Screenshot.png

File renamed without changes.

‎package.json‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
"node": "8.11.1"
1010
},
1111
"dependencies": {
12+
"@openzeppelin/contracts": "^4.7.3",
1213
"@truffle/hdwallet-provider": "^2.0.0",
1314
"apexcharts": "3.6.3",
1415
"babel-polyfill": "6.26.0",

‎scripts/seed-exchange.js‎

Lines changed: 112 additions & 79 deletions
Original file line numberDiff line numberDiff line change
@@ -1,140 +1,173 @@
11
//Utils
22

3-
const ETH_ADDRESS = '0x0000000000000000000000000000000000000000'
3+
const ETH_ADDRESS = "0x0000000000000000000000000000000000000000";
44

5-
const ether = (n)=> {
6-
return new web3.utils.BN(
7-
web3.utils.toWei(n.toString(), 'ether')
8-
)
9-
}
10-
11-
const tokens = (n) => ether(n)
12-
13-
const wait =(seconds) =>{
14-
const milliseconds = seconds * 1000
15-
return new Promise(resolve => setTimeout(resolve, milliseconds))
16-
}
5+
const ether = (n) => {
6+
return new web3.utils.BN(web3.utils.toWei(n.toString(), "ether"));
7+
};
178

9+
const tokens = (n) => ether(n);
1810

11+
const wait = (seconds) => {
12+
const milliseconds = seconds * 1000;
13+
return new Promise((resolve) => setTimeout(resolve, milliseconds));
14+
};
1915

2016
//Contracts
21-
const Token = artifacts.require("Token")
22-
const Exchange = artifacts.require("Exchange")
17+
const Token = artifacts.require("ESKO");
18+
const Exchange = artifacts.require("LESKOdex");
2319

24-
module.exports = async function(callback){
25-
try{
20+
module.exports = async function (callback) {
21+
try {
2622
//Fetch accounts from wallet - these are unlocked
27-
const accounts = await web3.eth.getAccounts()
23+
const accounts = await web3.eth.getAccounts();
2824

2925
//Fetch the deployed token
30-
const token = await Token.deployed()
31-
console.log('Token fetched', token.address)
26+
const token = await Token.deployed();
27+
console.log("Token fetched", token.address);
3228

3329
//Fetch the deployed exchange
34-
const exchange = await Exchange.deployed()
35-
console.log('Exchange fetched', exchange.address)
30+
const exchange = await Exchange.deployed();
31+
console.log("Exchange fetched", exchange.address);
3632

3733
//Give tokens to account[1]
38-
const sender = accounts[0]
39-
const receiver = accounts[1]
40-
let amount = web3.utils.toWei('10000', 'ether')//10,000tokens
34+
const sender = accounts[0];
35+
const receiver = accounts[1];
36+
let amount = web3.utils.toWei("10000", "ether"); //10,000tokens
4137

42-
await token.transfer(receiver, amount, { from: sender})
43-
console.log('Transferred '+ amount + ' tokens from '+ sender + ' to '+ receiver)
38+
await token.transfer(receiver, amount, { from: sender });
39+
console.log(
40+
"Transferred " + amount + " tokens from " + sender + " to " + receiver
41+
);
4442

4543
//Set up exchange users
46-
const user1 = accounts[0]
47-
const user2 = accounts[1]
44+
const user1 = accounts[0];
45+
const user2 = accounts[1];
4846

4947
//User 1 Deposits Ether
50-
amount = 10
51-
await exchange.depositEther({ from: user1, value: ether(amount)})
52-
console.log('Deposited '+ amount + ' Ether from ' + user1)
48+
amount = 10;
49+
await exchange.depositEther({ from: user1, value: ether(amount) });
50+
console.log("Deposited " + amount + " Ether from " + user1);
5351

5452
//User 2 Approves Tokens
55-
amount = 10000
56-
await token.approve(exchange.address, tokens(amount), { from: user2 })
57-
console.log('Approved ' + amount + ' tokens from ' + user2)
53+
amount = 10000;
54+
await token.approve(exchange.address, tokens(amount), { from: user2 });
55+
console.log("Approved " + amount + " tokens from " + user2);
5856

5957
//User 2 Deposits Tokens
60-
await exchange.depositToken(token.address, tokens(amount), { from: user2 })
61-
console.log('Deposited ' + amount + ' tokens from ' + user2)
58+
await exchange.depositToken(token.address, tokens(amount), { from: user2 });
59+
console.log("Deposited " + amount + " tokens from " + user2);
6260

6361
///////////////////////////////////////////////////////////////////////////
6462
//Seed a Cancelled order
6563
//
6664

6765
//User 1 makes order to get tokens
68-
let result
69-
let orderId
70-
result = await exchange.makeOrder(token.address, tokens(100), ETH_ADDRESS, ether(0.1), { from: user1})
71-
console.log('Made order from ' + user1)
66+
let result;
67+
let orderId;
68+
result = await exchange.makeOrder(
69+
token.address,
70+
tokens(100),
71+
ETH_ADDRESS,
72+
ether(0.1),
73+
{ from: user1 }
74+
);
75+
console.log("Made order from " + user1);
7276

7377
//User 1 cancells order
74-
orderId = result.logs[0].args.id
75-
await exchange.cancelOrder(orderId, { from: user1})
76-
console.log('Cancelled order from ' + user1)
78+
orderId = result.logs[0].args.id;
79+
await exchange.cancelOrder(orderId, { from: user1 });
80+
console.log("Cancelled order from " + user1);
7781
///////////////////////////////////////////////////////////////////////////
7882
//Seed Filled Orders
7983
//
8084

8185
//User 1 makes order
82-
result = await exchange.makeOrder(token.address, tokens(100), ETH_ADDRESS, ether(0.1), { from: user1})
83-
console.log('Made order from ' + user1)
86+
result = await exchange.makeOrder(
87+
token.address,
88+
tokens(100),
89+
ETH_ADDRESS,
90+
ether(0.1),
91+
{ from: user1 }
92+
);
93+
console.log("Made order from " + user1);
8494

8595
//User 2 fills order
86-
orderId = result.logs[0].args.id
87-
await exchange.fillOrder(orderId, { from: user2 })
88-
console.log('Filled order from ' + user1)
96+
orderId = result.logs[0].args.id;
97+
await exchange.fillOrder(orderId, { from: user2 });
98+
console.log("Filled order from " + user1);
8999

90100
//Wait 1 second
91-
await wait(1)
101+
await wait(1);
92102

93103
//User 1 makes another order
94-
result = await exchange.makeOrder(token.address, tokens(50), ETH_ADDRESS, ether(0.01), { from: user1})
95-
console.log('Made order from ' + user1)
104+
result = await exchange.makeOrder(
105+
token.address,
106+
tokens(50),
107+
ETH_ADDRESS,
108+
ether(0.01),
109+
{ from: user1 }
110+
);
111+
console.log("Made order from " + user1);
96112

97113
//User 2 fills another order
98-
orderId = result.logs[0].args.id
99-
await exchange.fillOrder(orderId, { from: user2 })
100-
console.log('Filled order from ' + user1)
101-
114+
orderId = result.logs[0].args.id;
115+
await exchange.fillOrder(orderId, { from: user2 });
116+
console.log("Filled order from " + user1);
117+
102118
//Wait 1 second
103-
await wait(1)
119+
await wait(1);
104120

105121
//User 1 makes final order
106-
result = await exchange.makeOrder(token.address, tokens(200), ETH_ADDRESS, ether(0.15), { from: user1})
107-
console.log('Made order from ' + user1)
122+
result = await exchange.makeOrder(
123+
token.address,
124+
tokens(200),
125+
ETH_ADDRESS,
126+
ether(0.15),
127+
{ from: user1 }
128+
);
129+
console.log("Made order from " + user1);
108130

109131
//User 2 fills final order
110-
orderId = result.logs[0].args.id
111-
await exchange.fillOrder(orderId, { from: user2 })
112-
console.log('Filled order from ' + user1)
132+
orderId = result.logs[0].args.id;
133+
await exchange.fillOrder(orderId, { from: user2 });
134+
console.log("Filled order from " + user1);
113135

114136
//Wait 1 second
115-
await wait(1)
137+
await wait(1);
116138
///////////////////////////////////////////////////////////////////////////
117139
//Seed Open Orders
118140
//
119141

120142
//User 1 makes 10 orders
121-
for(let i = 1; i <= 10; i++){
122-
result = await exchange.makeOrder(token.address, tokens(10*i), ETH_ADDRESS, ether(0.01), { from: user1 })
123-
console.log('Made order from ' + user1)
124-
//Wait 1 second
125-
await wait(1)
143+
for (let i = 1; i <= 10; i++) {
144+
result = await exchange.makeOrder(
145+
token.address,
146+
tokens(10 * i),
147+
ETH_ADDRESS,
148+
ether(0.01),
149+
{ from: user1 }
150+
);
151+
console.log("Made order from " + user1);
152+
//Wait 1 second
153+
await wait(1);
126154
}
127155

128156
//User 2 makes 10 orders
129-
for(let i = 1; i <= 10; i++){
130-
result = await exchange.makeOrder(ETH_ADDRESS, ether(0.01), token.address, tokens(10*i), { from: user2 })
131-
console.log('Made order from ' + user2)
132-
//Wait 1 second
133-
await wait(1)
134-
}
135-
136-
}catch(error){
137-
console.log(error)
157+
for (let i = 1; i <= 10; i++) {
158+
result = await exchange.makeOrder(
159+
ETH_ADDRESS,
160+
ether(0.01),
161+
token.address,
162+
tokens(10 * i),
163+
{ from: user2 }
164+
);
165+
console.log("Made order from " + user2);
166+
//Wait 1 second
167+
await wait(1);
138168
}
139-
callback()
140-
}
169+
} catch (error) {
170+
console.log(error);
171+
}
172+
callback();
173+
};

0 commit comments

Comments
 (0)