From 5e7806e9517cb3f885b4747b4324e65d584a0567 Mon Sep 17 00:00:00 2001 From: m-kus Date: Wed, 23 Sep 2020 13:51:00 +0300 Subject: [PATCH] Update readme --- Makefile | 12 +++++++++--- README.md | 6 +++--- package.json | 4 ++-- truffle-config.js | 8 +++++++- 4 files changed, 21 insertions(+), 9 deletions(-) diff --git a/Makefile b/Makefile index 00744d4..7cd358b 100644 --- a/Makefile +++ b/Makefile @@ -10,20 +10,26 @@ test: deploy-ropsten: npm run deploy_ropsten 2>&1| tee deploy.output +deploy-mainnet: + npm run deploy_mainnet 2>&1| tee deploy.output + +verify-mainnet: + npm run verify_mainnet + github-deployment: CONTRACT_ADDRESS=$$(cat deploy.output | grep "contract address" | awk '{ print $$4 }' | tail -1) - ETHERSCAN_URL=https://ropsten.etherscan.io/address/$$CONTRACT_ADDRESS + ETHERSCAN_URL=https://etherscan.io/address/$$CONTRACT_ADDRESS echo "Check out deployed contract at $$ETHERSCAN_URL" curl -0 -X POST https://api.github.com/repos/$$TRAVIS_REPO_SLUG/deployments \ -H "Accept: application/vnd.github.ant-man-preview+json" \ -H "Authorization: token $$GH_TOKEN" \ - -d "{ \"ref\": \"master\", \"environment\": \"ropsten\", \"required_contexts\": [] }" \ + -d "{ \"ref\": \"master\", \"environment\": \"mainnet\", \"required_contexts\": [] }" \ 2>&1| tee deployment.output STATUSES_URL="$$(cat deployment.output | grep statuses_url | awk -F\" '{ print $$4 }')" curl -0 -X POST $$STATUSES_URL \ -H "Accept: application/vnd.github.ant-man-preview+json" \ -H "Authorization: token $$GH_TOKEN" \ - -d "{ \"state\": \"success\", \"environment\": \"ropsten\", \"environment_url\": \"$$ETHERSCAN_URL\" }" + -d "{ \"state\": \"success\", \"environment\": \"mainnet\", \"environment_url\": \"$$ETHERSCAN_URL\" }" ropsten: $(MAKE) deploy-ropsten diff --git a/README.md b/README.md index 0697ac7..fc3c07d 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # Atomex.sol [![Build Status](https://travis-ci.org/atomex-me/atomex-solidity.svg?branch=master)](https://travis-ci.org/atomex-me/atomex-solidity) -[![ethereum mainnet](https://img.shields.io/badge/ethereum-mainnet-yellow.svg)](https://etherscan.io/address/0xE9C251cbB4881f9e056e40135E7d3EA9A7d037df) +[![ethereum mainnet](https://img.shields.io/badge/ethereum-mainnet-yellow.svg)](https://etherscan.io/address/0x993E67d0A90ed59aA65756099eB5d7857E56021b) [![License: GPL v3](https://img.shields.io/badge/License-GPLv3-blue.svg)](https://www.gnu.org/licenses/gpl-3.0) Atomex protocol implementation for Ethereum blockchain @@ -17,8 +17,8 @@ Atomex protocol implementation for Ethereum blockchain * Trading APIs for wallets/traders ## Deployed contracts -* Ethereum mainnet: [0xE9C251cbB4881f9e056e40135E7d3EA9A7d037df](https://etherscan.io/address/0xE9C251cbB4881f9e056e40135E7d3EA9A7d037df) -* Ethereum ropsten: [0x527d1049837edf5f99c287a41a87702686082bf8](https://ropsten.etherscan.io/address/0x527d1049837edf5f99c287a41a87702686082bf8) +* Ethereum mainnet: [0x993E67d0A90ed59aA65756099eB5d7857E56021b](https://etherscan.io/address/0x993E67d0A90ed59aA65756099eB5d7857E56021b) +* Ethereum ropsten: [0x66eC93ab6CC5a08c077a92055F5409bf82C47e83](https://ropsten.etherscan.io/address/0x66eC93ab6CC5a08c077a92055F5409bf82C47e83) ## Resources Last version of desktop client is available at [atomex.me](https://atomex.me) diff --git a/package.json b/package.json index 2a64a15..8c2529d 100644 --- a/package.json +++ b/package.json @@ -11,8 +11,8 @@ "truffle": "./node_modules/.bin/truffle test", "deploy_ropsten": "./node_modules/.bin/truffle migrate --network ropsten", "deploy_mainnet": "./node_modules/.bin/truffle migrate --network mainnet", - "verify_ropsten": "./node_modules/.bin/truffle run verify --network ropsten --delay 30000 --verbose ./build/contracts/Atomex.json", - "verify_mainnet": "./node_modules/.bin/truffle run verify --network mainnet --delay 30000 --verbose ./build/contracts/Atomex.json" + "verify_ropsten": "./node_modules/.bin/truffle run verify --network ropsten --delay 30000 ./build/contracts/Atomex.json", + "verify_mainnet": "./node_modules/.bin/truffle run verify --network mainnet --delay 30000 ./build/contracts/Atomex.json" }, "repository": { "type": "git", diff --git a/truffle-config.js b/truffle-config.js index 9d18fe6..8f771d2 100644 --- a/truffle-config.js +++ b/truffle-config.js @@ -1,6 +1,9 @@ require('dotenv').config(); var HDWalletProvider = require("truffle-hdwallet-provider"); +const Web3 = require("web3"); +const web3 = new Web3(); + module.exports = { networks: { "dev_truffle": { @@ -21,7 +24,10 @@ module.exports = { }, "mainnet": { provider: () => new HDWalletProvider(process.env.MNEMONIC_MAINNET, `https://mainnet.infura.io/v3/${process.env.INFURA_TOKEN}`), - network_id: 1 + gasPrice: web3.utils.toWei('103', 'gwei'), + gas: 2000000, + network_id: 1, + from: '0xF6E592dfC4445dC3536fa94de33b8A5E1071CAAa' } }, plugins: ["verify-on-etherscan"]