From f172ad87cfb34143781aa563fccc1cc96f236b36 Mon Sep 17 00:00:00 2001 From: ealeksandrov-LimeChain <92088769+ealeksandrov-LimeChain@users.noreply.github.com> Date: Thu, 22 Dec 2022 15:18:27 +0200 Subject: [PATCH 1/2] non-functional changes --- .gitignore | 5 +++ solidity/hardhat.config.ts | 53 ++++++++++++++------------- solidity/scripts/contract-deployer.sh | 6 ++- 3 files changed, 37 insertions(+), 27 deletions(-) mode change 100644 => 100755 solidity/scripts/contract-deployer.sh diff --git a/.gitignore b/.gitignore index f8cec2d06..e5d98f351 100644 --- a/.gitignore +++ b/.gitignore @@ -4,8 +4,13 @@ target tests/test-runner/Cargo.lock tests/dockerfile/gravity.tar.gz solidity/dist +solidity/build +solidity/artifacts/ orchestrator/bins +# OS files +.DS_Store + # IDE files .idea/ diff --git a/solidity/hardhat.config.ts b/solidity/hardhat.config.ts index 137935802..cd7be28de 100644 --- a/solidity/hardhat.config.ts +++ b/solidity/hardhat.config.ts @@ -31,37 +31,40 @@ module.exports = { // This is a sample solc configuration that specifies which version of solc to use solidity: { compilers: [ - { - version: "0.6.6", - settings: { - optimizer: { - enabled: true - } - } - }, - { - version: "0.6.12", - settings: { - optimizer: { - enabled: true - } - } - }, - { - version: "0.8.1", - settings: { - optimizer: { - enabled: true + { + version: "0.6.6", + settings: { + optimizer: { + enabled: true + } + } + }, + { + version: "0.6.12", + settings: { + optimizer: { + enabled: true + } + } + }, + { + version: "0.8.1", + settings: { + optimizer: { + enabled: true + } + } } - } - } -] + ] }, defaultNetwork: process.env.DEFAULT_NETWORK, networks: { rinkeby: { url: `${process.env.ETH_NODE}` }, + sepolia: { + url: `${process.env.ETH_NODE}` + }, mainnet: { url: `${process.env.ETH_NODE}` }, @@ -1022,7 +1025,7 @@ module.exports = { mocha: { timeout: 2000000 }, - etherscan:{ + etherscan: { apiKey: `${process.env.ETHERSCAN_API_KEY}` } }; diff --git a/solidity/scripts/contract-deployer.sh b/solidity/scripts/contract-deployer.sh old mode 100644 new mode 100755 index 62714abe2..ad1ae648f --- a/solidity/scripts/contract-deployer.sh +++ b/solidity/scripts/contract-deployer.sh @@ -4,5 +4,7 @@ contract-deployer.ts \ --cosmos-node="http://localhost:26657" \ --eth-node="http://localhost:8545" \ --eth-privkey="0xb1bab011e03a9862664706fc3bbaa1b16651528e5f0e7fbfcbfdd8be302a13e7" \ ---contract=Gravity.json \ ---test-mode=true \ No newline at end of file +--contract="artifacts/contracts/Gravity.sol/Gravity.json" \ +--test-mode=true \ +--cudos-access-control="0x0412C7c846bb6b7DC462CF6B453f76D8440b2609" \ +--cudos-token-address="0x9676519d99E390A180Ab1445d5d857E3f6869065" \ No newline at end of file From 19c9dc20c032a873b4d9d04bbf742dc50f27a76e Mon Sep 17 00:00:00 2001 From: ealeksandrov-LimeChain <92088769+ealeksandrov-LimeChain@users.noreply.github.com> Date: Thu, 22 Dec 2022 17:14:52 +0200 Subject: [PATCH 2/2] Update contract-deployer.sh --- solidity/scripts/contract-deployer.sh | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/solidity/scripts/contract-deployer.sh b/solidity/scripts/contract-deployer.sh index ad1ae648f..732d01f18 100755 --- a/solidity/scripts/contract-deployer.sh +++ b/solidity/scripts/contract-deployer.sh @@ -1,10 +1,10 @@ #!/bin/bash npx ts-node \ contract-deployer.ts \ ---cosmos-node="http://localhost:26657" \ ---eth-node="http://localhost:8545" \ ---eth-privkey="0xb1bab011e03a9862664706fc3bbaa1b16651528e5f0e7fbfcbfdd8be302a13e7" \ +--cosmos-node="${COSMOS_NODE}" \ +--eth-node="${ETH_NODE}" \ +--eth-privkey="${ETH_PRIV_KEY_HEX}" \ --contract="artifacts/contracts/Gravity.sol/Gravity.json" \ --test-mode=true \ ---cudos-access-control="0x0412C7c846bb6b7DC462CF6B453f76D8440b2609" \ ---cudos-token-address="0x9676519d99E390A180Ab1445d5d857E3f6869065" \ No newline at end of file +--cudos-access-control="${CUDOS_ACCESS_CONTROL_ADDRESS}" \ +--cudos-token-address="${CUDOS_TOKEN_ADDRESS}" \ No newline at end of file