Skip to content

Commit f4e4a9f

Browse files
pdyragapdyraga
authored
Merge pull request #49 from keep-network/prettier
Added prettier configuration Here we added prettier configuration so Visual Studio Code can pull it and format code consistently
2 parents 77b1e7c + 49b93ce commit f4e4a9f

7 files changed

Lines changed: 357 additions & 281 deletions

File tree

‎.prettierrc.yaml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
semi: false
2+
trailingComma: "all"

‎inspector/scripts/inspect-beacon.js‎

Lines changed: 76 additions & 69 deletions
Original file line numberDiff line numberDiff line change
@@ -3,84 +3,91 @@ const KeepRandomBeaconOperatorJson = require("@keep-network/keep-core/artifacts/
33

44
const contractHelper = require("./lib/contract-helper")
55

6-
module.exports = async function() {
7-
try {
8-
const deploymentBlock = await contractHelper.getDeploymentBlockNumber(KeepRandomBeaconOperatorJson, web3)
9-
10-
const KeepRandomBeaconOperator = truffleContract(KeepRandomBeaconOperatorJson)
11-
KeepRandomBeaconOperator.setProvider(web3.currentProvider)
6+
module.exports = async function () {
7+
try {
8+
const deploymentBlock = await contractHelper.getDeploymentBlockNumber(
9+
KeepRandomBeaconOperatorJson,
10+
web3,
11+
)
1212

13-
const keepRandomBeaconOperator = await KeepRandomBeaconOperator.deployed()
13+
const KeepRandomBeaconOperator = truffleContract(
14+
KeepRandomBeaconOperatorJson,
15+
)
16+
KeepRandomBeaconOperator.setProvider(web3.currentProvider)
1417

15-
const numberOfGroups = await keepRandomBeaconOperator.numberOfGroups()
16-
const entryRequestedEvents = await keepRandomBeaconOperator.getPastEvents(
17-
"RelayEntryRequested",
18-
{
19-
fromBlock: deploymentBlock,
20-
toBlock: "latest",
21-
}
22-
)
23-
const entrySubmittedEvents = await keepRandomBeaconOperator.getPastEvents(
24-
"RelayEntrySubmitted",
25-
{
26-
fromBlock: deploymentBlock,
27-
toBlock: "latest",
28-
}
29-
)
30-
const timeoutEvents = await keepRandomBeaconOperator.getPastEvents(
31-
"RelayEntryTimeoutReported",
32-
{
33-
fromBlock: deploymentBlock,
34-
toBlock: "latest",
35-
}
36-
)
18+
const keepRandomBeaconOperator = await KeepRandomBeaconOperator.deployed()
3719

38-
console.log(`Number of groups: ${numberOfGroups}`)
39-
console.log(`Relay entries requested: ${entryRequestedEvents.length}`)
40-
console.log(`Relay entries submitted: ${entrySubmittedEvents.length}`)
41-
console.log(`Number of timed-out entries: ${timeoutEvents.length}`)
42-
console.log(``)
20+
const numberOfGroups = await keepRandomBeaconOperator.numberOfGroups()
21+
const entryRequestedEvents = await keepRandomBeaconOperator.getPastEvents(
22+
"RelayEntryRequested",
23+
{
24+
fromBlock: deploymentBlock,
25+
toBlock: "latest",
26+
},
27+
)
28+
const entrySubmittedEvents = await keepRandomBeaconOperator.getPastEvents(
29+
"RelayEntrySubmitted",
30+
{
31+
fromBlock: deploymentBlock,
32+
toBlock: "latest",
33+
},
34+
)
35+
const timeoutEvents = await keepRandomBeaconOperator.getPastEvents(
36+
"RelayEntryTimeoutReported",
37+
{
38+
fromBlock: deploymentBlock,
39+
toBlock: "latest",
40+
},
41+
)
4342

44-
const dkgSubmittedEvents = (await keepRandomBeaconOperator.getPastEvents(
45-
"DkgResultSubmittedEvent",
46-
{
47-
fromBlock: deploymentBlock,
48-
toBlock: "latest",
49-
}
50-
))
43+
console.log(`Number of groups: ${numberOfGroups}`)
44+
console.log(`Relay entries requested: ${entryRequestedEvents.length}`)
45+
console.log(`Relay entries submitted: ${entrySubmittedEvents.length}`)
46+
console.log(`Number of timed-out entries: ${timeoutEvents.length}`)
47+
console.log(``)
5148

52-
const allOperators = new Set()
49+
const dkgSubmittedEvents = await keepRandomBeaconOperator.getPastEvents(
50+
"DkgResultSubmittedEvent",
51+
{
52+
fromBlock: deploymentBlock,
53+
toBlock: "latest",
54+
},
55+
)
5356

54-
for (i = 0; i < numberOfGroups; i++) {
55-
const groupPubKey = await keepRandomBeaconOperator.getGroupPublicKey(i)
56-
const groupMembers = await keepRandomBeaconOperator.getGroupMembers(groupPubKey)
57+
const allOperators = new Set()
5758

58-
const uniqueMembers = new Set()
59-
groupMembers.forEach((member) => {
60-
uniqueMembers.add(member)
61-
allOperators.add(member)
62-
})
59+
for (i = 0; i < numberOfGroups; i++) {
60+
const groupPubKey = await keepRandomBeaconOperator.getGroupPublicKey(i)
61+
const groupMembers = await keepRandomBeaconOperator.getGroupMembers(
62+
groupPubKey,
63+
)
6364

64-
const dkgSubmittedEvent = dkgSubmittedEvents.find((event) => {
65-
return event.returnValues.groupPubKey == groupPubKey
66-
})
65+
const uniqueMembers = new Set()
66+
groupMembers.forEach((member) => {
67+
uniqueMembers.add(member)
68+
allOperators.add(member)
69+
})
6770

68-
const {memberIndex, misbehaved} = dkgSubmittedEvent.returnValues
69-
70-
console.log(`Group ${groupPubKey}:`)
71-
console.log(` - has index ${i}`)
72-
console.log(` - has ${groupMembers.length} members`)
73-
console.log(` - its DKG result was submitted by member ${memberIndex}`)
74-
console.log(` - misbehaved members bytes: ${misbehaved}`)
75-
console.log(` - has ${uniqueMembers.size} unique members`)
76-
console.log(``)
77-
}
71+
const dkgSubmittedEvent = dkgSubmittedEvents.find((event) => {
72+
return event.returnValues.groupPubKey == groupPubKey
73+
})
7874

79-
console.log(`There are ${allOperators.size} unique operators in all groups`)
75+
const { memberIndex, misbehaved } = dkgSubmittedEvent.returnValues
8076

81-
process.exit()
82-
} catch (error) {
83-
console.log(error)
84-
process.exit()
77+
console.log(`Group ${groupPubKey}:`)
78+
console.log(` - has index ${i}`)
79+
console.log(` - has ${groupMembers.length} members`)
80+
console.log(` - its DKG result was submitted by member ${memberIndex}`)
81+
console.log(` - misbehaved members bytes: ${misbehaved}`)
82+
console.log(` - has ${uniqueMembers.size} unique members`)
83+
console.log(``)
8584
}
86-
}
85+
86+
console.log(`There are ${allOperators.size} unique operators in all groups`)
87+
88+
process.exit()
89+
} catch (error) {
90+
console.log(error)
91+
process.exit()
92+
}
93+
}

‎inspector/scripts/inspect-ecdsa-keep.js‎

Lines changed: 93 additions & 83 deletions
Original file line numberDiff line numberDiff line change
@@ -5,95 +5,105 @@ const BondedECDSAKeepJson = require("@keep-network/keep-ecdsa/artifacts/BondedEC
55
const contractHelper = require("./lib/contract-helper")
66

77
module.exports = async function () {
8-
try {
9-
const BondedECDSAKeepFactory = truffleContract(BondedECDSAKeepFactoryJson)
10-
const BondedECDSAKeep = truffleContract(BondedECDSAKeepJson)
11-
BondedECDSAKeepFactory.setProvider(web3.currentProvider)
12-
BondedECDSAKeep.setProvider(web3.currentProvider)
13-
14-
const factoryDeploymentBlock = await contractHelper.getDeploymentBlockNumber(
15-
BondedECDSAKeepFactoryJson, web3
8+
try {
9+
const BondedECDSAKeepFactory = truffleContract(BondedECDSAKeepFactoryJson)
10+
const BondedECDSAKeep = truffleContract(BondedECDSAKeepJson)
11+
BondedECDSAKeepFactory.setProvider(web3.currentProvider)
12+
BondedECDSAKeep.setProvider(web3.currentProvider)
13+
14+
const factoryDeploymentBlock = await contractHelper.getDeploymentBlockNumber(
15+
BondedECDSAKeepFactoryJson,
16+
web3,
17+
)
18+
19+
const factory = await BondedECDSAKeepFactory.deployed()
20+
21+
const keepCount = await factory.getKeepCount()
22+
console.log(`created keeps count: ${keepCount}`)
23+
24+
const allOperators = new Set()
25+
const goodOperators = new Set()
26+
27+
for (i = 0; i < keepCount; i++) {
28+
const keepAddress = await callWithRetry(() => factory.getKeepAtIndex(i))
29+
const keep = await BondedECDSAKeep.at(keepAddress)
30+
const keepPublicKey = await callWithRetry(() => keep.publicKey())
31+
const members = await callWithRetry(() => keep.getMembers())
32+
const isActive = await callWithRetry(() => keep.isActive())
33+
const bond = await callWithRetry(() => keep.checkBondAmount())
34+
35+
const signatureRequestedEvents = await keep.getPastEvents(
36+
"SignatureRequested",
37+
{
38+
fromBlock: factoryDeploymentBlock,
39+
toBlock: "latest",
40+
},
41+
)
42+
43+
console.log(`keep address: ${keepAddress}`)
44+
console.log(`keep index: ${i}`)
45+
console.log(`pubkey: ${keepPublicKey}`)
46+
console.log(`members: ${members}`)
47+
console.log(`isActive: ${isActive}`)
48+
console.log(`bond [wei]: ${bond}`)
49+
console.log(`bond [eth]: ${web3.utils.fromWei(bond)}`)
50+
console.log(`bond [eth]: ${web3.utils.fromWei(bond)}`)
51+
52+
if (signatureRequestedEvents.length == 0) {
53+
console.log(`signature requested: no`)
54+
} else {
55+
console.log(
56+
`signature requested: yes, [${signatureRequestedEvents.length}] times`,
1657
)
1758

18-
const factory = await BondedECDSAKeepFactory.deployed()
19-
20-
const keepCount = await factory.getKeepCount()
21-
console.log(`created keeps count: ${keepCount}`)
22-
23-
const allOperators = new Set()
24-
const goodOperators = new Set()
25-
26-
for (i = 0; i < keepCount; i++) {
27-
const keepAddress = await callWithRetry(() => factory.getKeepAtIndex(i))
28-
const keep = await BondedECDSAKeep.at(keepAddress)
29-
const keepPublicKey = await callWithRetry(() => keep.publicKey())
30-
const members = await callWithRetry(() => keep.getMembers())
31-
const isActive = await callWithRetry(() => keep.isActive())
32-
const bond = await callWithRetry(()=> keep.checkBondAmount())
33-
34-
const signatureRequestedEvents = await keep.getPastEvents(
35-
"SignatureRequested",
36-
{
37-
fromBlock: factoryDeploymentBlock,
38-
toBlock: "latest",
39-
}
40-
)
41-
42-
console.log(`keep address: ${keepAddress}`)
43-
console.log(`keep index: ${i}`)
44-
console.log(`pubkey: ${keepPublicKey}`)
45-
console.log(`members: ${members}`)
46-
console.log(`isActive: ${isActive}`)
47-
console.log(`bond [wei]: ${bond}`)
48-
console.log(`bond [eth]: ${web3.utils.fromWei(bond)}`)
49-
console.log(`bond [eth]: ${web3.utils.fromWei(bond)}`)
50-
if (signatureRequestedEvents.length == 0) {
51-
console.log(`signature requested: no`)
52-
} else {
53-
console.log(`signature requested: yes, [${signatureRequestedEvents.length}] times`)
54-
55-
const signatureSubmittedEvents = await keep.getPastEvents(
56-
"SignatureSubmitted",
57-
{
58-
fromBlock: factoryDeploymentBlock,
59-
toBlock: "latest",
60-
}
61-
)
62-
if (signatureRequestedEvents.length == 0) {
63-
console.log(`signature submitted: no`)
64-
} else {
65-
console.log(`signature submitted: yes, [${signatureSubmittedEvents.length}] times`)
66-
}
67-
}
68-
69-
members.forEach((member) => allOperators.add(member))
70-
if (keepPublicKey) {
71-
members.forEach((member) => goodOperators.add(member))
72-
}
73-
74-
console.log(``)
59+
const signatureSubmittedEvents = await keep.getPastEvents(
60+
"SignatureSubmitted",
61+
{
62+
fromBlock: factoryDeploymentBlock,
63+
toBlock: "latest",
64+
},
65+
)
66+
if (signatureRequestedEvents.length == 0) {
67+
console.log(`signature submitted: no`)
68+
} else {
69+
console.log(
70+
`signature submitted: yes, [${signatureSubmittedEvents.length}] times`,
71+
)
7572
}
73+
}
7674

77-
// if the operator is a member of at least one keep and that operator
78-
// is NOT a member of at least one keep which successfully generated
79-
// a public key, this operator is here
80-
let potentiallyBadOperators = new Set(allOperators)
81-
for (let goodOperator of goodOperators) {
82-
potentiallyBadOperators.delete(goodOperator)
83-
}
84-
console.log(`potentially bad operators = ${new Array(...potentiallyBadOperators).join(', ')}`)
75+
members.forEach((member) => allOperators.add(member))
76+
if (keepPublicKey) {
77+
members.forEach((member) => goodOperators.add(member))
78+
}
79+
80+
console.log(``)
81+
}
8582

86-
process.exit()
87-
} catch (error) {
88-
console.log(error)
83+
// if the operator is a member of at least one keep and that operator
84+
// is NOT a member of at least one keep which successfully generated
85+
// a public key, this operator is here
86+
let potentiallyBadOperators = new Set(allOperators)
87+
for (let goodOperator of goodOperators) {
88+
potentiallyBadOperators.delete(goodOperator)
8989
}
90+
console.log(
91+
`potentially bad operators = ${new Array(...potentiallyBadOperators).join(
92+
", ",
93+
)}`,
94+
)
95+
96+
process.exit()
97+
} catch (error) {
98+
console.log(error)
99+
}
90100
}
91101

92102
async function callWithRetry(fn) {
93-
try {
94-
return await fn()
95-
} catch (error) {
96-
console.log(`Error ${error} occurred; retrying...`)
97-
return await fn()
98-
}
99-
}
103+
try {
104+
return await fn()
105+
} catch (error) {
106+
console.log(`Error ${error} occurred; retrying...`)
107+
return await fn()
108+
}
109+
}

0 commit comments

Comments
 (0)