From 1ac9b830778f568d6c2843199ba1d0fe7b1f2a0c Mon Sep 17 00:00:00 2001 From: Antonio Juliano Date: Mon, 30 Jul 2018 12:04:33 -0700 Subject: [PATCH] 0.1.5 (#386) * v0.1.5 * deploy to kovan --- migrations/deployments.md | 31 ++++++++++++++++++++++++++++++- package-lock.json | 2 +- package.json | 4 ++-- src/index.js | 2 +- truffle.js | 4 ++-- 5 files changed, 36 insertions(+), 7 deletions(-) diff --git a/migrations/deployments.md b/migrations/deployments.md index cc1fc0a2..25b27eaa 100644 --- a/migrations/deployments.md +++ b/migrations/deployments.md @@ -1,4 +1,33 @@ -## Kovan Deployment - 6/4/18: +## Kovan Deployment - 7/30/18 [v0.1.5]: + +### Main +- Margin: [0xe97da4a12ee7feafddfdd4766d2705f2ee993d6a](https://kovan.etherscan.io/address/0xe97da4a12ee7feafddfdd4766d2705f2ee993d6a) +- TokenProxy: [0x12262ee5a32b3892a3fce087ff7a3299c0f8813f](https://kovan.etherscan.io/address/0x12262ee5a32b3892a3fce087ff7a3299c0f8813f) +- Vault: [0x4fdc15f9e00316cf114bc4389c12c79ae0344175](https://kovan.etherscan.io/address/0x4fdc15f9e00316cf114bc4389c12c79ae0344175) + +### Second Layer +- DutchAuctionCloser: [0x4e338944afbace1f1095b1fde436f91e79d11486](https://kovan.etherscan.io/address/0x4e338944afbace1f1095b1fde436f91e79d11486) +- ERC721MarginPosition: [0x3d1720538d31c5a396deb00ab9956dec072a6423](https://kovan.etherscan.io/address/0x3d1720538d31c5a396deb00ab9956dec072a6423) +- ZeroExExchangeWrapper: [0x721976badf842a263f8d1a5d64c5578a4368f330](https://kovan.etherscan.io/address/0x721976badf842a263f8d1a5d64c5578a4368f330) +- OpenDirectlyExchangeWrapper: [0x5aab90bacc2d3d6eb1d208920bdb0b3c3278e24d](https://kovan.etherscan.io/address/0x5aab90bacc2d3d6eb1d208920bdb0b3c3278e24d) +- ERC20ShortCreator: [0x1979bb1aa89b8f35ce1a891b4e7508faca07c01c](https://kovan.etherscan.io/address/0x1979bb1aa89b8f35ce1a891b4e7508faca07c01c) +- ERC20LongCreator: [0x8adf53551449c56394c2952ed8f01604e0de2683](https://kovan.etherscan.io/address/0x8adf53551449c56394c2952ed8f01604e0de2683) +- SharedLoanCreator: [0x49f2bff73a6c47391133022522725b9d2b62498c](https://kovan.etherscan.io/address/0x49f2bff73a6c47391133022522725b9d2b62498c) + +### Impl +- TransferImpl: [0xfdf8cb392ec70bb0752165fda3961dc3ac55af17](https://kovan.etherscan.io/address/0xfdf8cb392ec70bb0752165fda3961dc3ac55af17) +- LoanImpl: [0xef4f4be07b3d5141c4566caff3567191948d669c](https://kovan.etherscan.io/address/0xef4f4be07b3d5141c4566caff3567191948d669c) +- InterestImpl: [0x4313cca8f702e67dfc784f4778c939c6b3620514](https://kovan.etherscan.io/address/0x4313cca8f702e67dfc784f4778c939c6b3620514) +- ForceRecoverCollateralImpl: [0xb984fdf85b814b465eff2396d18b7b78163da029](https://kovan.etherscan.io/address/0xb984fdf85b814b465eff2396d18b7b78163da029) +- OpenPositionImpl: [0xc57f874e8fd9c4b063f74b34b8ee1daddc19a225](https://kovan.etherscan.io/address/0xc57f874e8fd9c4b063f74b34b8ee1daddc19a225) +- DepositCollateralImpl: [0xa2710483fb528f3b11f20be6e3f701633dcfbaf4](https://kovan.etherscan.io/address/0xa2710483fb528f3b11f20be6e3f701633dcfbaf4) +- ClosePositionImpl: [0xede8bf43e1c3cb8dd13c480f54b843d6736ae6b6](https://kovan.etherscan.io/address/0xede8bf43e1c3cb8dd13c480f54b843d6736ae6b6) +- CloseWithoutCounterpartyImpl: [0xda75cc2749264046c14b5b7a9fa1a7d56ed72e2e](https://kovan.etherscan.io/address/0xda75cc2749264046c14b5b7a9fa1a7d56ed72e2e) +- IncreasePositionImpl: [0x70a93396b17f623df4c4c9d222252829055f892a](https://kovan.etherscan.io/address/0x70a93396b17f623df4c4c9d222252829055f892a) +- OpenWithoutCounterpartyImpl: [0x24751749816ba6c0f6d0b2066208e78e8d6553c5](https://kovan.etherscan.io/address/0x24751749816ba6c0f6d0b2066208e78e8d6553c5) + + +## Kovan Deployment - 6/4/18 [v0.1.2]: ### Main - Margin: [0xeec4c7032ecddc47182134933662f9b06b4fdc64](https://kovan.etherscan.io/address/0xeec4c7032ecddc47182134933662f9b06b4fdc64) diff --git a/package-lock.json b/package-lock.json index a2ebd203..7e02a756 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "@dydxprotocol/protocol", - "version": "0.1.4", + "version": "0.1.5", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index 8f4e363b..1d94f30a 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@dydxprotocol/protocol", - "version": "0.1.4", + "version": "0.1.5", "description": "Ethereum Smart Contracts for the dYdX Margin Trading Protocol", "main": "build/index.js", "files": [ @@ -47,7 +47,7 @@ }, "homepage": "https://github.com/dydxprotocol/protocol#readme", "dependencies": { - "zeppelin-solidity": "^1.11.0" + "zeppelin-solidity": "1.11.0" }, "devDependencies": { "0x.js": "^0.37.2", diff --git a/src/index.js b/src/index.js index 45d83f0e..45f5cc72 100644 --- a/src/index.js +++ b/src/index.js @@ -1,6 +1,6 @@ const Margin = require('../build/contracts/Margin.json'); const Vault = require('../build/contracts/Vault.json'); -const TokenProxy = require('../build/contracts../TokenProxy.json'); +const TokenProxy = require('../build/contracts../TokenProxy.json'); const DutchAuctionCloser = require('../build/contracts/DutchAuctionCloser.json'); const SharedLoan = require('../build/contracts/SharedLoan.json'); const SharedLoanCreator = require('../build/contracts/SharedLoanCreator.json'); diff --git a/truffle.js b/truffle.js index 75f49618..830f70b4 100644 --- a/truffle.js +++ b/truffle.js @@ -17,9 +17,9 @@ if (process.env.TRUFFLE_REPORTER) { module.exports = { networks: { kovan: { - host: "localhost", + host: "127.0.0.1", port: 8545, - network_id: "*", + network_id: "42", gas:4700000 }, dev: {