Skip to content

Chaosnet: update ecdsa contracts #3299

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.

Sign up for GitHub

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

Merged
nkuba merged 4 commits into from
Sep 23, 2022
Merged

Chaosnet: update ecdsa contracts #3299

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
869e24b
Updated random-beacon and sortition-pools dependencies for ecdsa
pdyraga Sep 23, 2022
2bf9d80
Transfer chaosnet owner role when deploying ecdsa sortition pool
pdyraga Sep 23, 2022
10d933f
Deactivate chaosnet for ecdsa contract unit tests
pdyraga Sep 23, 2022
46e889b
Updated values for ecdsa wallet registry gas assertions
pdyraga Sep 23, 2022
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
16 changes: 12 additions & 4 deletions solidity/ecdsa/deploy/01_deploy_ecdsa_sortition_pool.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,29 +3,37 @@ import type { DeployFunction } from "hardhat-deploy/types"

const func: DeployFunction = async (hre: HardhatRuntimeEnvironment) => {
const { getNamedAccounts, deployments, helpers } = hre
const { deployer } = await getNamedAccounts()
const { deployer, chaosnetOwner } = await getNamedAccounts()
const { execute } = deployments
const { to1e18 } = helpers.number

const POOL_WEIGHT_DIVISOR = to1e18(1) // TODO: Update value

const T = await deployments.get("T")

const SortitionPool = await deployments.deploy("EcdsaSortitionPool", {
const EcdsaSortitionPool = await deployments.deploy("EcdsaSortitionPool", {
contract: "SortitionPool",
from: deployer,
args: [T.address, POOL_WEIGHT_DIVISOR],
log: true,
waitConfirmations: 1,
})

await execute(
"EcdsaSortitionPool",
{ from: deployer },
"transferChaosnetOwnerRole",
chaosnetOwner
)

if (hre.network.tags.etherscan) {
await helpers.etherscan.verify(SortitionPool)
await helpers.etherscan.verify(EcdsaSortitionPool)
}

if (hre.network.tags.tenderly) {
await hre.tenderly.verify({
name: "EcdsaSortitionPool",
address: SortitionPool.address,
address: EcdsaSortitionPool.address,
})
}
}
Expand Down
4 changes: 2 additions & 2 deletions solidity/ecdsa/deploy/02_deploy_dkg_validator.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@ const func: DeployFunction = async (hre: HardhatRuntimeEnvironment) => {
const { getNamedAccounts, deployments, helpers } = hre
const { deployer } = await getNamedAccounts()

const SortitionPool = await deployments.get("EcdsaSortitionPool")
const EcdsaSortitionPool = await deployments.get("EcdsaSortitionPool")

const EcdsaDkgValidator = await deployments.deploy("EcdsaDkgValidator", {
from: deployer,
args: [SortitionPool.address],
args: [EcdsaSortitionPool.address],
log: true,
waitConfirmations: 1,
})
Expand Down
4 changes: 2 additions & 2 deletions solidity/ecdsa/deploy/03_deploy_wallet_registry.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ const func: DeployFunction = async (hre: HardhatRuntimeEnvironment) => {
const { getNamedAccounts, deployments, ethers, helpers } = hre
const { deployer } = await getNamedAccounts()

const SortitionPool = await deployments.get("EcdsaSortitionPool")
const EcdsaSortitionPool = await deployments.get("EcdsaSortitionPool")
const TokenStaking = await deployments.get("TokenStaking")
const ReimbursementPool = await deployments.get("ReimbursementPool")
const RandomBeacon = await deployments.get("RandomBeacon")
Expand Down Expand Up @@ -36,7 +36,7 @@ const func: DeployFunction = async (hre: HardhatRuntimeEnvironment) => {
},
},
proxyOpts: {
constructorArgs: [SortitionPool.address, TokenStaking.address],
constructorArgs: [EcdsaSortitionPool.address, TokenStaking.address],
unsafeAllow: ["external-library-linking"],
kind: "transparent",
},
Expand Down
7 changes: 6 additions & 1 deletion solidity/ecdsa/hardhat.config.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,11 +132,16 @@ const config: HardhatUserConfig = {
goerli: 0,
// mainnet: ""
},
esdm: {
chaosnetOwner: {
default: 3,
goerli: 0,
// mainnet: ""
},
esdm: {
default: 4,
goerli: 0,
// mainnet: ""
},
},
external: {
contracts:
Expand Down
2 changes: 1 addition & 1 deletion solidity/ecdsa/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@
"dependencies": {
"@keep-network/hardhat-helpers": "^0.6.0-pre.15",
"@keep-network/random-beacon": "development",
"@keep-network/sortition-pools": "^2.0.0-pre.13",
"@keep-network/sortition-pools": "^2.0.0-pre.15",
"@openzeppelin/contracts": "^4.6.0",
"@openzeppelin/contracts-upgradeable": "^4.6.0",
"@threshold-network/solidity-contracts": "development"
Expand Down
3 changes: 3 additions & 0 deletions solidity/ecdsa/test/WalletRegistry.Authorization.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,9 @@ describe("WalletRegistry - Authorization", () => {
thirdParty = await ethers.getSigner(accounts[6])
;({ deployer, governance } = await helpers.signers.getNamedSigners())

const { chaosnetOwner } = await helpers.signers.getNamedSigners()
await sortitionPool.connect(chaosnetOwner).deactivateChaosnet()

walletOwner = await initializeWalletOwner(
walletRegistryGovernance,
governance
Expand Down
12 changes: 6 additions & 6 deletions solidity/ecdsa/test/WalletRegistry.WalletCreation.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1674,8 +1674,8 @@ describe("WalletRegistry - Wallet Creation", async () => {
)
})

it("should use close to 272 000 gas", async () => {
await assertGasUsed(tx, 272_000)
it("should use close to 274 000 gas", async () => {
await assertGasUsed(tx, 274_000)
})
})

Expand Down Expand Up @@ -3450,8 +3450,8 @@ describe("WalletRegistry - Wallet Creation", async () => {
)
})

it("should use close to 80 000 gas", async () => {
await assertGasUsed(tx, 80_000)
it("should use close to 82 000 gas", async () => {
await assertGasUsed(tx, 82_000)
})
})

Expand Down Expand Up @@ -3605,8 +3605,8 @@ describe("WalletRegistry - Wallet Creation", async () => {
)
})

it("should use close to 74 000 gas", async () => {
await assertGasUsed(tx, 74_000)
it("should use close to 76 000 gas", async () => {
await assertGasUsed(tx, 76_000)
})
})
})
Expand Down
5 changes: 4 additions & 1 deletion solidity/ecdsa/test/fixtures/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,10 @@ export const walletRegistryFixture = deployments.createFixture(
walletRegistry
)

const { deployer, governance } = await helpers.signers.getNamedSigners()
const { deployer, governance, chaosnetOwner } =
await helpers.signers.getNamedSigners()

await sortitionPool.connect(chaosnetOwner).deactivateChaosnet()

const [thirdParty] = await helpers.signers.getUnnamedSigners()

Expand Down
27 changes: 14 additions & 13 deletions solidity/ecdsa/yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -687,19 +687,20 @@
openzeppelin-solidity "2.4.0"

"@keep-network/random-beacon@development":
version "2.0.0-dev.56"
resolved "https://registry.yarnpkg.com/@keep-network/random-beacon/-/random-beacon-2.0.0-dev.56.tgz#70999781d6fa93e67b47e953472fa72f6f312455"
integrity sha512-eoqwSFeFIoR2NI0/5TutqRHHom91nJtoCNtdPMGK1eqH+Jo6SAZh9jAbz9KIEoX0bnhOoMQhyJdbdOv3Nr4S7w==
version "2.0.0-dev.72"
resolved "https://registry.yarnpkg.com/@keep-network/random-beacon/-/random-beacon-2.0.0-dev.72.tgz#0e96714628ac4fb5a3cdf67d5a7f56c6b67b4f50"
integrity sha512-mx7lUf9sdtK/9/dYV0TBXPM2zA3xeKqkspII2T9LZ1BxX8IhELvmjrgErzg5Za5IXUDQYFUco4BHU/fpjR+Q+w==
dependencies:
"@keep-network/sortition-pools" "^2.0.0-pre.13"
"@keep-network/hardhat-helpers" "^0.6.0-pre.15"
"@keep-network/sortition-pools" "^2.0.0-pre.15"
"@openzeppelin/contracts" "^4.6.0"
"@thesis/solidity-contracts" "github:thesis/solidity-contracts#4985bcf"
"@threshold-network/solidity-contracts" "1.2.0-dev.18"
"@threshold-network/solidity-contracts" "1.2.0-dev.22"

"@keep-network/sortition-pools@^2.0.0-pre.13":
version "2.0.0-pre.13"
resolved "https://registry.yarnpkg.com/@keep-network/sortition-pools/-/sortition-pools-2.0.0-pre.13.tgz#80dbe8066ce378ae4242c3aef6864224477a9e41"
integrity sha512-+6VXCJyYT3+HApDExeySHjOgezg+umvdpm5lZXIUlhSx7xmbXSK/YwLXkdeWkGyVdyfwRO4ZXo1CbscbC0XGnA==
"@keep-network/sortition-pools@^2.0.0-pre.15":
version "2.0.0-pre.15"
resolved "https://registry.yarnpkg.com/@keep-network/sortition-pools/-/sortition-pools-2.0.0-pre.15.tgz#3a289f7cd502e5d6c629f2fb625d390b77c02950"
integrity sha512-FuEk6uvIL5n82LnxyP6piV8Y7eRae3Vp7n1yQcSK2M9+gaZqzT1eaxX6FtZrXMzAOz3M+aQ8X3DVEyTScQOO2Q==
dependencies:
"@openzeppelin/contracts" "^4.3.2"
"@thesis/solidity-contracts" "github:thesis/solidity-contracts#4985bcf"
Expand Down Expand Up @@ -1109,10 +1110,10 @@
dependencies:
"@openzeppelin/contracts" "^4.1.0"

"@threshold-network/[email protected].18":
version "1.2.0-dev.18"
resolved "https://registry.yarnpkg.com/@threshold-network/solidity-contracts/-/solidity-contracts-1.2.0-dev.18.tgz#814721dea03e47c3fe2f21644802e99d49dd9260"
integrity sha512-ao6Kngc8Q9rPg42/DlSlsOi2k/GH0DfdAOB4fmzcQSBl4H4D+dP0k0ymqvK6zfeMgxYmjRYP2KI5kDLPpaF2jg==
"@threshold-network/[email protected].22":
version "1.2.0-dev.22"
resolved "https://registry.yarnpkg.com/@threshold-network/solidity-contracts/-/solidity-contracts-1.2.0-dev.22.tgz#c82da61b51d0086fb6fd2d662db74ec278b7ffcf"
integrity sha512-QpJXl0ViOMbWeGQ1m02cM//UwedjMKG4Vm9JILyn0VZiFxoMo0Jtcdm0V1+4+j+cAXbGjWFQGKMvSFYh34ONCw==
dependencies:
"@keep-network/keep-core" ">1.8.1-dev <1.8.1-goerli"
"@openzeppelin/contracts" "~4.5.0"
Expand Down