Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Feature] - Integration ssv-keys in ssv-network for generating keyshares #276

Merged
merged 33 commits into from
Dec 5, 2023
Merged
Show file tree
Hide file tree
Changes from 30 commits
Commits
Show all changes
33 commits
Select commit Hold shift + click to select a range
5f23870
Remove registerAuth implementation (#257)
mtabasco Aug 30, 2023
530dd5d
remove pending registerAuth
mtabasco Aug 30, 2023
50db186
deploy stage-dev 30082023
mtabasco Aug 30, 2023
b8e03e7
deploy stage v1.0.0.rc4
mtabasco Aug 31, 2023
a0c2914
Fix network withdrawals (#262)
mtabasco Sep 29, 2023
8324ce8
A validator can voluntarily exit (#263)
mtabasco Sep 29, 2023
3da66d3
Update local-dev.md (#260)
andrew-blox Sep 29, 2023
c8679b3
Fix Types.shrink() (#265)
mtabasco Oct 2, 2023
e6db598
v1.0.0.rc5
mtabasco Oct 2, 2023
16e2da5
goerli_dev deployment
mtabasco Oct 4, 2023
9e6d64b
Remove validator gas costs metrics (#266)
mtabasco Oct 23, 2023
2bc27cc
holesky dev (#267)
mtabasco Oct 25, 2023
fa9173b
Get Network total validators count (#270)
mtabasco Oct 30, 2023
756f01e
testnet holesky (#268)
mtabasco Oct 31, 2023
97407a1
change input modifiers
mtabasco Oct 31, 2023
c70a513
Merge branch 'jato-v2' of https://github.com/bloxapp/ssv-network into…
mtabasco Oct 31, 2023
7220109
rename __gap (#269)
mtabasco Oct 31, 2023
4cb7bbf
OperatorLib gas optimizations (#273)
mtabasco Nov 2, 2023
670a075
remove named return params (#272)
mtabasco Nov 2, 2023
4331945
add msg.sender to ValidatorExited event (#271)
mtabasco Nov 2, 2023
f7e59b9
remove storage checks
mtabasco Nov 2, 2023
8479582
test: added registerValidatorsWithKeystore
Mohsen-T Nov 8, 2023
f74b717
feat: updated params of registerValidatorsWithKeyStores
Mohsen-T Nov 8, 2023
3137476
Merge branch 'main' into mohsen-feature-generate-shares-using-ssvkeys
Mohsen-T Nov 8, 2023
27051cf
feat: updated validators & operators management using ssv-keys
Mohsen-T Nov 15, 2023
bae3f81
fix slither CI
mtabasco Nov 16, 2023
09f7921
fix: changed json path and version
Mohsen-T Nov 17, 2023
7d0b940
Merge branch 'main' into mohsen-feature-generate-shares-using-ssvkeys
Mohsen-T Nov 17, 2023
36ba81a
fix: changed gas group constant
Mohsen-T Nov 17, 2023
94071be
fix: added ownerNonce in DB for ssv-keys
Mohsen-T Nov 27, 2023
5b0d3be
fix: updated ssv-keys latest stable version
Mohsen-T Nov 29, 2023
5c87625
merge with v1.0.0
mtabasco Dec 5, 2023
10c77f6
fix package.lock
mtabasco Dec 5, 2023
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/slither.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@ jobs:
uses: actions/checkout@v3

- name: Run Slither
uses: crytic/slither-action@v0.2.0
uses: crytic/slither-action@v0.3.0
id: slither
with:
node-version: 16
node-version: 18
fail-on: high
slither-args: --exclude controlled-delegatecall
80 changes: 53 additions & 27 deletions hardhat.config.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import 'dotenv/config';

import { HardhatUserConfig } from 'hardhat/config';
import { NetworkUserConfig } from "hardhat/types";
import { NetworkUserConfig } from 'hardhat/types';
import '@nomicfoundation/hardhat-toolbox';
import '@openzeppelin/hardhat-upgrades';
import 'hardhat-tracer';
Expand All @@ -14,60 +14,65 @@ import './tasks/upgrade';

type SSVNetworkConfig = NetworkUserConfig & {
ssvToken: string;
}

};

const config: HardhatUserConfig = {
// Your type-safe config goes here
mocha: {
timeout: 40000000000000000
timeout: 40000000000000000,
},
solidity: {
compilers: [
{
version: "0.8.4",
version: '0.8.4',
},
{
version: '0.8.18',
settings: {
optimizer: {
enabled: true,
runs: 10000
}
}
}
runs: 10000,
},
},
},
],
},
networks: {
ganache: {
chainId: 1337,
url: "http://127.0.0.1:8585",
ssvToken: process.env.SSVTOKEN_ADDRESS // if empty, deploy SSV mock token
url: 'http://127.0.0.1:8585',
ssvToken: process.env.SSVTOKEN_ADDRESS, // if empty, deploy SSV mock token
} as SSVNetworkConfig,
hardhat: {
allowUnlimitedContractSize: true
}
allowUnlimitedContractSize: true,
},
},
etherscan: {
// Your API key for Etherscan
// Obtain one at https://etherscan.io/
apiKey: process.env.ETHERSCAN_KEY,
customChains: [
{
network: "holesky",
network: 'holesky',
chainId: 17000,
urls: {
apiURL: "https://api-holesky.etherscan.io/api",
browserURL: "https://holesky.etherscan.io"
}
}
]
apiURL: 'https://api-holesky.etherscan.io/api',
browserURL: 'https://holesky.etherscan.io',
},
},
],
},
gasReporter: {
enabled: true,
currency: 'USD',
gasPrice: 0.3
}
gasPrice: 0.3,
},
contractSizer: {
alphaSort: true,
disambiguatePaths: false,
runOnCompile: true,
strict: false,
},
};

if (process.env.GOERLI_ETH_NODE_URL) {
Expand All @@ -82,13 +87,34 @@ if (process.env.GOERLI_ETH_NODE_URL) {
...config.networks,
goerli_development: {
...sharedConfig,
ssvToken: '0x6471F70b932390f527c6403773D082A0Db8e8A9F'
ssvToken: '0x6471F70b932390f527c6403773D082A0Db8e8A9F',
} as SSVNetworkConfig,
goerli_testnet: {
...sharedConfig,
ssvToken: '0x3a9f01091C446bdE031E39ea8354647AFef091E7'
ssvToken: '0x3a9f01091C446bdE031E39ea8354647AFef091E7',
} as SSVNetworkConfig,
}
};
}

if (process.env.HOLESKY_ETH_NODE_URL) {
const sharedConfig = {
url: process.env.HOLESKY_ETH_NODE_URL,
accounts: [`0x${process.env.HOLESKY_OWNER_PRIVATE_KEY}`],
gasPrice: +(process.env.GAS_PRICE || ''),
gas: +(process.env.GAS || ''),
};
//@ts-ignore
config.networks = {
...config.networks,
holesky_development: {
...sharedConfig,
ssvToken: '0x68A8DDD7a59A900E0657e9f8bbE02B70c947f25F',
} as SSVNetworkConfig,
holesky_testnet: {
...sharedConfig,
ssvToken: '0xad45A78180961079BFaeEe349704F411dfF947C6',
} as SSVNetworkConfig,
};
}

if (process.env.HOLESKY_ETH_NODE_URL) {
Expand Down Expand Up @@ -121,9 +147,9 @@ if (process.env.MAINNET_ETH_NODE_URL) {
accounts: [`0x${process.env.MAINNET_OWNER_PRIVATE_KEY}`],
gasPrice: +(process.env.GAS_PRICE || ''),
gas: +(process.env.GAS || ''),
ssvToken: '0x9D65fF81a3c488d585bBfb0Bfe3c7707c7917f54'
} as SSVNetworkConfig
}
ssvToken: '0x9D65fF81a3c488d585bBfb0Bfe3c7707c7917f54',
} as SSVNetworkConfig,
};
}

export default config;
Loading
Loading