Skip to content

Commit 3661eed

Browse files
okwmeokwme
committed
only good changes from this branch
1 parent 6ff86a6 commit 3661eed

10 files changed

+246
-244
lines changed

‎helpers/migVals.js‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ async function deployCloversController({
5050
}
5151
async function updateCloversController({
5252
cloversController,
53-
curationMarket,
53+
// curationMarket,
5454
simpleCloversMarket
5555
}) {
5656
// Update CloversController.sol
@@ -60,8 +60,8 @@ async function updateCloversController({
6060
// -w stakeAmount
6161
// -w stakePeriod
6262
// -w payMultiplier
63-
console.log('cloversController.updateCurationMarket')
64-
var tx = await cloversController.updateCurationMarket(curationMarket.address)
63+
// console.log('cloversController.updateCurationMarket')
64+
// var tx = await cloversController.updateCurationMarket(curationMarket.address)
6565

6666
console.log('cloversController.updateSimpleCloversMarket')
6767
var tx = await cloversController.updateSimpleCloversMarket(
@@ -89,7 +89,7 @@ async function updateCloversController({
8989

9090
async function updateClubTokenController({
9191
clubTokenController,
92-
curationMarket,
92+
// curationMarket,
9393
simpleCloversMarket
9494
}) {
9595
// Update ClubTokenController.sol
@@ -104,10 +104,10 @@ async function updateClubTokenController({
104104
var tx = await clubTokenController.updateSimpleCloversMarket(
105105
simpleCloversMarket.address
106106
)
107-
console.log('clubTokenController.updateCurationMarket')
108-
var tx = await clubTokenController.updateCurationMarket(
109-
curationMarket.address
110-
)
107+
// console.log('clubTokenController.updateCurationMarket')
108+
// var tx = await clubTokenController.updateCurationMarket(
109+
// curationMarket.address
110+
// )
111111

112112
console.log('clubTokenController.updateReserveRatio')
113113
var tx = await clubTokenController.updateReserveRatio(vals.reserveRatio)

‎migrations/10_move_to_curation_market.js‎

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ var Clovers = artifacts.require('./Clovers.sol')
44
var CloversController = artifacts.require('./CloversController.sol')
55
var ClubTokenController = artifacts.require('./ClubTokenController.sol')
66
var SimpleCloversMarket = artifacts.require('./SimpleCloversMarket.sol')
7-
var CurationMarket = artifacts.require('./CurationMarket.sol')
7+
// var CurationMarket = artifacts.require('./CurationMarket.sol')
88
var ClubToken = artifacts.require('./ClubToken.sol')
99
const Reversi = require('clovers-reversi').default
1010

@@ -41,7 +41,7 @@ module.exports = (deployer, network, accounts) => {
4141

4242
clubToken = await ClubToken.deployed()
4343
clubTokenController = await ClubTokenController.deployed()
44-
curationMarket = await CurationMarket.deployed()
44+
// curationMarket = await CurationMarket.deployed()
4545
simpleCloversMarket = await SimpleCloversMarket.deployed()
4646

4747
let user = accounts[6]
@@ -105,24 +105,24 @@ module.exports = (deployer, network, accounts) => {
105105
console.log(error)
106106
}
107107
}
108-
if ((await clovers.ownerOf(tokenId)) === accounts[0].toLowerCase()) {
109-
console.log('is owner')
110-
await curationMarket.addCloverToMarket(tokenId, '0')
111-
} else {
112-
console.log('is not ownder')
113-
}
114-
let value = await getLowestPrice(curationMarket, oneGwei, tokenId)
115-
console.log(
116-
'must spend ' + value.toString(16) + ' to buy ' + oneGwei.toString(16)
117-
)
118-
// function buy(address _to, uint256 _tokenId, uint256 _spendAmount) public payable
119-
await curationMarket.buy(accounts[0], tokenId, oneGwei, {
120-
value
121-
})
108+
// if ((await clovers.ownerOf(tokenId)) === accounts[0].toLowerCase()) {
109+
// console.log('is owner')
110+
// await curationMarket.addCloverToMarket(tokenId, '0')
111+
// } else {
112+
// console.log('is not ownder')
113+
// }
114+
// let value = await getLowestPrice(curationMarket, oneGwei, tokenId)
115+
// console.log(
116+
// 'must spend ' + value.toString(16) + ' to buy ' + oneGwei.toString(16)
117+
// )
118+
// // function buy(address _to, uint256 _tokenId, uint256 _spendAmount) public payable
119+
// await curationMarket.buy(accounts[0], tokenId, oneGwei, {
120+
// value
121+
// })
122122

123-
let balanceOf = await curationMarket.balanceOf(tokenId, accounts[0])
124-
await curationMarket.sell(tokenId, balanceOf)
125-
// function sell(uint256 _tokenId, uint256 sellAmount) public
123+
// let balanceOf = await curationMarket.balanceOf(tokenId, accounts[0])
124+
// await curationMarket.sell(tokenId, balanceOf)
125+
// // function sell(uint256 _tokenId, uint256 sellAmount) public
126126
} catch (error) {
127127
console.log(error)
128128
}

‎migrations/2_deploy_contracts.js‎

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ var CloversMetadata = artifacts.require('./CloversMetadata.sol')
44
var CloversController = artifacts.require('./CloversController.sol')
55
var ClubTokenController = artifacts.require('./ClubTokenController.sol')
66
var SimpleCloversMarket = artifacts.require('./SimpleCloversMarket.sol')
7-
var CurationMarket = artifacts.require('./CurationMarket.sol')
7+
// var CurationMarket = artifacts.require('./CurationMarket.sol')
88
var ClubToken = artifacts.require('./ClubToken.sol')
99

1010
const overwrites = {
@@ -14,7 +14,7 @@ const overwrites = {
1414
CloversController: true,
1515
ClubTokenController: true,
1616
SimpleCloversMarket: true,
17-
CurationMarket: true,
17+
// CurationMarket: true,
1818
ClubToken: true
1919
}
2020

@@ -113,26 +113,26 @@ module.exports = (deployer, network, accounts) => {
113113
)
114114
simpleCloversMarket = await SimpleCloversMarket.deployed()
115115

116-
// Deploy CurationMarket.sol
117-
// -w virtualSupply
118-
// -w virtualBalance
119-
// -w reserveRatio
120-
// -w Clovers address
121-
// -w CloversController address
122-
// -w ClubToken address
123-
// -w ClubTokenController address
124-
await deployer.deploy(
125-
CurationMarket,
126-
virtualSupplyCM,
127-
virtualBalanceCM,
128-
reserveRatio,
129-
clovers.address,
130-
cloversController.address,
131-
clubToken.address,
132-
clubTokenController.address,
133-
{ overwrite: overwrites['CurationMarket'] }
134-
)
135-
curationMarket = await CurationMarket.deployed()
116+
// // Deploy CurationMarket.sol
117+
// // -w virtualSupply
118+
// // -w virtualBalance
119+
// // -w reserveRatio
120+
// // -w Clovers address
121+
// // -w CloversController address
122+
// // -w ClubToken address
123+
// // -w ClubTokenController address
124+
// await deployer.deploy(
125+
// CurationMarket,
126+
// virtualSupplyCM,
127+
// virtualBalanceCM,
128+
// reserveRatio,
129+
// clovers.address,
130+
// cloversController.address,
131+
// clubToken.address,
132+
// clubTokenController.address,
133+
// { overwrite: overwrites['CurationMarket'] }
134+
// )
135+
// curationMarket = await CurationMarket.deployed()
136136
} catch (error) {
137137
console.log(error)
138138
}

‎migrations/3_update_contracts.js‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ var CloversController = artifacts.require('./CloversController.sol')
55
var ClubTokenController = artifacts.require('./ClubTokenController.sol')
66
var ClubToken = artifacts.require('./ClubToken.sol')
77
var SimpleCloversMarket = artifacts.require('./SimpleCloversMarket.sol')
8-
var CurationMarket = artifacts.require('./CurationMarket.sol')
8+
// var CurationMarket = artifacts.require('./CurationMarket.sol')
99

1010
const gasToCash = require('../helpers/utils').gasToCash
1111
const _ = require('../helpers/utils')._
@@ -39,7 +39,7 @@ module.exports = (deployer, network, accounts) => {
3939
clubTokenController = await ClubTokenController.deployed()
4040
cloversController = await CloversController.deployed()
4141
simpleCloversMarket = await SimpleCloversMarket.deployed()
42-
curationMarket = await CurationMarket.deployed()
42+
// curationMarket = await CurationMarket.deployed()
4343

4444
// Update Clovers.sol
4545
// -w CloversController address
@@ -68,14 +68,14 @@ module.exports = (deployer, network, accounts) => {
6868
// Update CloversController
6969
await updateCloversController({
7070
cloversController,
71-
curationMarket,
71+
// curationMarket,
7272
simpleCloversMarket
7373
})
7474

7575
// Update ClubTokenController
7676
await updateClubTokenController({
7777
clubTokenController,
78-
curationMarket,
78+
// curationMarket,
7979
simpleCloversMarket
8080
})
8181
} catch (error) {

‎migrations/5_update_clovers_controller.js‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ var Clovers = artifacts.require('./Clovers.sol')
44
var CloversController = artifacts.require('./CloversController.sol')
55
var ClubTokenController = artifacts.require('./ClubTokenController.sol')
66
var SimpleCloversMarket = artifacts.require('./SimpleCloversMarket.sol')
7-
var CurationMarket = artifacts.require('./CurationMarket.sol')
7+
// var CurationMarket = artifacts.require('./CurationMarket.sol')
88
var ClubToken = artifacts.require('./ClubToken.sol')
99

1010
const gasToCash = require('../helpers/utils').gasToCash
@@ -36,7 +36,7 @@ module.exports = (deployer, network, accounts) => {
3636
reversi = await Reversi.deployed()
3737
clovers = await Clovers.deployed()
3838
clubToken = await ClubToken.deployed()
39-
curationMarket = await CurationMarket.deployed()
39+
// curationMarket = await CurationMarket.deployed()
4040
simpleCloversMarket = await SimpleCloversMarket.deployed()
4141
clubTokenController = await ClubTokenController.deployed()
4242

@@ -54,13 +54,13 @@ module.exports = (deployer, network, accounts) => {
5454
await simpleCloversMarket.updateCloversController(
5555
cloversController.address
5656
)
57-
await curationMarket.updateCloversController(cloversController.address)
57+
// await curationMarket.updateCloversController(cloversController.address)
5858
await clovers.updateCloversControllerAddress(cloversController.address)
5959
await clubToken.updateCloversControllerAddress(cloversController.address)
6060

6161
await updateCloversController({
6262
cloversController,
63-
curationMarket,
63+
// curationMarket,
6464
simpleCloversMarket
6565
})
6666
} catch (error) {

‎migrations/6_update_club_token_controller.js‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ var Clovers = artifacts.require('./Clovers.sol')
44
var CloversController = artifacts.require('./CloversController.sol')
55
var ClubTokenController = artifacts.require('./ClubTokenController.sol')
66
var SimpleCloversMarket = artifacts.require('./SimpleCloversMarket.sol')
7-
var CurationMarket = artifacts.require('./CurationMarket.sol')
7+
// var CurationMarket = artifacts.require('./CurationMarket.sol')
88
var ClubToken = artifacts.require('./ClubToken.sol')
99

1010
const gasToCash = require('../helpers/utils').gasToCash
@@ -37,7 +37,7 @@ module.exports = (deployer, network, accounts) => {
3737
cloversController = await CloversController.deployed()
3838
clubToken = await ClubToken.deployed()
3939
// clubTokenController = await ClubTokenController.deployed()
40-
curationMarket = await CurationMarket.deployed()
40+
// curationMarket = await CurationMarket.deployed()
4141
simpleCloversMarket = await SimpleCloversMarket.deployed()
4242

4343
await deployer.deploy(ClubTokenController, clubToken.address, {
@@ -51,17 +51,17 @@ module.exports = (deployer, network, accounts) => {
5151
await simpleCloversMarket.updateClubTokenController(
5252
clubTokenController.address
5353
)
54-
await curationMarket.updateClubTokenController(
55-
clubTokenController.address
56-
)
54+
// await curationMarket.updateClubTokenController(
55+
// clubTokenController.address
56+
// )
5757
await clovers.updateClubTokenController(clubTokenController.address)
5858
await clubToken.updateClubTokenControllerAddress(
5959
clubTokenController.address
6060
)
6161

6262
await updateClubTokenController({
6363
clubTokenController,
64-
curationMarket,
64+
// curationMarket,
6565
simpleCloversMarket
6666
})
6767
} catch (error) {

‎migrations/7_update_curation_market.js‎

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ var Clovers = artifacts.require('./Clovers.sol')
44
var CloversController = artifacts.require('./CloversController.sol')
55
var ClubTokenController = artifacts.require('./ClubTokenController.sol')
66
var SimpleCloversMarket = artifacts.require('./SimpleCloversMarket.sol')
7-
var CurationMarket = artifacts.require('./CurationMarket.sol')
7+
// var CurationMarket = artifacts.require('./CurationMarket.sol')
88
var ClubToken = artifacts.require('./ClubToken.sol')
99

1010
const gasToCash = require('../helpers/utils').gasToCash
@@ -51,33 +51,33 @@ module.exports = (deployer, network, accounts) => {
5151
// -w CloversController address
5252
// -w ClubToken address
5353
// -w ClubTokenController address
54-
await deployer.deploy(
55-
CurationMarket,
56-
virtualSupplyCM,
57-
virtualBalanceCM,
58-
reserveRatio,
59-
clovers.address,
60-
cloversController.address,
61-
clubToken.address,
62-
clubTokenController.address,
63-
{ overwrite }
64-
)
65-
curationMarket = await CurationMarket.deployed()
54+
// await deployer.deploy(
55+
// CurationMarket,
56+
// virtualSupplyCM,
57+
// virtualBalanceCM,
58+
// reserveRatio,
59+
// clovers.address,
60+
// cloversController.address,
61+
// clubToken.address,
62+
// clubTokenController.address,
63+
// { overwrite }
64+
// )
65+
// curationMarket = await CurationMarket.deployed()
6666
if (!overwrite) {
67-
console.log('curationMarket.updateVirtualSupply')
68-
var tx = await curationMarket.updateVirtualSupply(virtualSupplyCM)
67+
// console.log('curationMarket.updateVirtualSupply')
68+
// var tx = await curationMarket.updateVirtualSupply(virtualSupplyCM)
6969

70-
console.log('curationMarket.updateVirtualBalanceCM')
71-
var tx = await curationMarket.updateVirtualBalance(virtualBalanceCM)
70+
// console.log('curationMarket.updateVirtualBalanceCM')
71+
// var tx = await curationMarket.updateVirtualBalance(virtualBalanceCM)
7272
} else {
73-
console.log('clubTokenController.updateCurationMarket')
74-
var tx = await clubTokenController.updateCurationMarket(
75-
curationMarket.address
76-
)
77-
console.log('cloversController.updateCurationMarket')
78-
var tx = await cloversController.updateCurationMarket(
79-
curationMarket.address
80-
)
73+
// console.log('clubTokenController.updateCurationMarket')
74+
// var tx = await clubTokenController.updateCurationMarket(
75+
// curationMarket.address
76+
// )
77+
// console.log('cloversController.updateCurationMarket')
78+
// var tx = await cloversController.updateCurationMarket(
79+
// curationMarket.address
80+
// )
8181
}
8282
} catch (error) {
8383
console.log(error)

‎migrations/8_update_simple_market.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ var Clovers = artifacts.require('./Clovers.sol')
44
var CloversController = artifacts.require('./CloversController.sol')
55
var ClubTokenController = artifacts.require('./ClubTokenController.sol')
66
var SimpleCloversMarket = artifacts.require('./SimpleCloversMarket.sol')
7-
var CurationMarket = artifacts.require('./CurationMarket.sol')
7+
// var CurationMarket = artifacts.require('./CurationMarket.sol')
88
var ClubToken = artifacts.require('./ClubToken.sol')
99

1010
const gasToCash = require('../helpers/utils').gasToCash
@@ -41,7 +41,7 @@ module.exports = (deployer, network, accounts) => {
4141

4242
clubToken = await ClubToken.deployed()
4343
clubTokenController = await ClubTokenController.deployed()
44-
curationMarket = await CurationMarket.deployed()
44+
// curationMarket = await CurationMarket.deployed()
4545
// simpleCloversMarket = await SimpleCloversMarket.deployed()
4646

4747
// Deploy SimpleCloversMarket.sol

‎migrations/9_test_buy_sells.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ var Clovers = artifacts.require('./Clovers.sol')
44
var CloversController = artifacts.require('./CloversController.sol')
55
var ClubTokenController = artifacts.require('./ClubTokenController.sol')
66
var SimpleCloversMarket = artifacts.require('./SimpleCloversMarket.sol')
7-
var CurationMarket = artifacts.require('./CurationMarket.sol')
7+
// var CurationMarket = artifacts.require('./CurationMarket.sol')
88
var ClubToken = artifacts.require('./ClubToken.sol')
99

1010
const gasToCash = require('../helpers/utils').gasToCash
@@ -38,7 +38,7 @@ module.exports = (deployer, network, accounts) => {
3838

3939
clubToken = await ClubToken.deployed()
4040
clubTokenController = await ClubTokenController.deployed()
41-
curationMarket = await CurationMarket.deployed()
41+
// curationMarket = await CurationMarket.deployed()
4242
simpleCloversMarket = await SimpleCloversMarket.deployed()
4343

4444
// let rev = new Rev()

0 commit comments

Comments
 (0)