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..732d01f18 --- a/solidity/scripts/contract-deployer.sh +++ b/solidity/scripts/contract-deployer.sh @@ -1,8 +1,10 @@ #!/bin/bash npx ts-node \ 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 +--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="${CUDOS_ACCESS_CONTROL_ADDRESS}" \ +--cudos-token-address="${CUDOS_TOKEN_ADDRESS}" \ No newline at end of file