From 491dcb235475a54780f566b64baa8c125c1c1c07 Mon Sep 17 00:00:00 2001 From: Doug Petkanics Date: Tue, 1 Nov 2016 14:34:38 -0400 Subject: [PATCH] Breaking out migrations and updating etherscan contract address. --- app/javascripts/createAuction.js | 2 +- contracts/Migrations.sol | 5 ++++- migrations/2_deploy_contracts.js | 2 -- migrations/3_deploy_auctionhouse.js | 3 +++ truffle.js | 2 +- 5 files changed, 9 insertions(+), 5 deletions(-) create mode 100644 migrations/3_deploy_auctionhouse.js diff --git a/app/javascripts/createAuction.js b/app/javascripts/createAuction.js index 47201d2..05d5472 100644 --- a/app/javascripts/createAuction.js +++ b/app/javascripts/createAuction.js @@ -5,7 +5,7 @@ var currentBlockNumber; var auctionHouseContract; var sampleNameContract; -var infoBoxHTMLCreate = "

Here's where you can create an auction to auction off any on-chain item you own that conforms to the Asset contract. Since this is a prototype and very few contracts adhere to this, you have the chance to register a 'name' that does, so you can create a test auction. First register any name, such as myname.address, and when that transaction confirms, create an auction for that same name.

After successful auction creation, you can visit the page for that auction to activate it.

"; +var infoBoxHTMLCreate = "

Here's where you can create an auction to auction off any on-chain item you own that conforms to the Asset contract. Since this is a prototype and very few contracts adhere to this, you have the chance to register a 'name' that does, so you can create a test auction. First register any name, such as myname.address, and when that transaction confirms, create an auction for that same name.

After successful auction creation, you can visit the page for that auction to activate it.

"; function updateAuctions() { var auctionSection = document.getElementById("userAuctions"); diff --git a/contracts/Migrations.sol b/contracts/Migrations.sol index 132f325..0e09fe1 100644 --- a/contracts/Migrations.sol +++ b/contracts/Migrations.sol @@ -1,9 +1,12 @@ +pragma solidity ^0.4.2; + contract Migrations { address public owner; uint public last_completed_migration; modifier restricted() { - if (msg.sender == owner) _ + if (msg.sender == owner) + _; } function Migrations() { diff --git a/migrations/2_deploy_contracts.js b/migrations/2_deploy_contracts.js index 31f3d57..e7b12eb 100644 --- a/migrations/2_deploy_contracts.js +++ b/migrations/2_deploy_contracts.js @@ -1,5 +1,3 @@ module.exports = function(deployer) { deployer.deploy(SampleName) - deployer.autolink(); - deployer.deploy(AuctionHouse) }; diff --git a/migrations/3_deploy_auctionhouse.js b/migrations/3_deploy_auctionhouse.js new file mode 100644 index 0000000..e955d49 --- /dev/null +++ b/migrations/3_deploy_auctionhouse.js @@ -0,0 +1,3 @@ +module.exports = function(deployer) { + deployer.deploy(AuctionHouse) +}; diff --git a/truffle.js b/truffle.js index 21bf361..073f06d 100644 --- a/truffle.js +++ b/truffle.js @@ -53,7 +53,7 @@ module.exports = { }, "modern": { network_id: 2, - gas: 500000 + gas: 4612388 }, "live": { network_id: 1