Skip to content
This repository was archived by the owner on Mar 3, 2022. It is now read-only.

Commit 7d81b43

Browse files
anthonygdanthonygd
authored
Updated build and ABI generation steps (#11)
1 parent c8008fb commit 7d81b43

8 files changed

Lines changed: 33243 additions & 16755 deletions

File tree

‎Makefile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
FLAGS = --use solc:0.7.6
22

3-
all :; dapp $(FLAGS) build
3+
all :; DAPP_STANDARD_JSON=dapp.json dapp $(FLAGS) build --legacy
44
clean :; dapp clean
5-
test :; dapp $(FLAGS) test -v
5+
test :; DAPP_STANDARD_JSON=dapp-test.json dapp $(FLAGS) test -v
66
deploy :; dapp create Bridge

‎bindings/bridge.go‎

Lines changed: 32919 additions & 16750 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎dapp-test.json‎

Lines changed: 174 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,174 @@
1+
{
2+
"language": "Solidity",
3+
"sources": {
4+
"src/EthDKGDiamond.sol": { "urls": ["src/EthDKGDiamond.sol"] },
5+
"src/CryptoLibrary.sol": { "urls": ["src/CryptoLibrary.sol"] },
6+
"src/TokenMigrator.t.sol": { "urls": ["src/TokenMigrator.t.sol"] },
7+
"src/Registry.sol": { "urls": ["src/Registry.sol"] },
8+
"src/SignatureLibrary.sol": { "urls": ["src/SignatureLibrary.sol"] },
9+
"src/SimpleAuth.sol": { "urls": ["src/SimpleAuth.sol"] },
10+
"src/AccusationManager.sol": { "urls": ["src/AccusationManager.sol"] },
11+
"src/QueueLibrary.sol": { "urls": ["src/QueueLibrary.sol"] },
12+
"src/Token.t.sol": { "urls": ["src/Token.t.sol"] },
13+
"src/Token.sol": { "urls": ["src/Token.sol"] },
14+
"src/MerkleProof.sol": { "urls": ["src/MerkleProof.sol"] },
15+
"src/CryptoLibrary.t.sol": { "urls": ["src/CryptoLibrary.t.sol"] },
16+
"src/TokenMigrator.sol": { "urls": ["src/TokenMigrator.sol"] },
17+
"src/Diamond.sol": { "urls": ["src/Diamond.sol"] },
18+
"src/Registry.t.sol": { "urls": ["src/Registry.t.sol"] },
19+
"src/ERC165.sol": { "urls": ["src/ERC165.sol"] },
20+
"src/Crypto.sol": { "urls": ["src/Crypto.sol"] },
21+
"src/Deposit.t.sol": { "urls": ["src/Deposit.t.sol"] },
22+
"src/SafeMath.sol": { "urls": ["src/SafeMath.sol"] },
23+
"src/Constants.sol": { "urls": ["src/Constants.sol"] },
24+
"src/Deposit.sol": { "urls": ["src/Deposit.sol"] },
25+
"src/ValidatorsDiamond.sol": { "urls": ["src/ValidatorsDiamond.sol"] },
26+
"src/QueueLibrary.t.sol": { "urls": ["src/QueueLibrary.t.sol"] },
27+
"src/Experiment.t.sol": { "urls": ["src/Experiment.t.sol"] },
28+
"src/migrate/MigrateSnapshotsFacet.sol": {
29+
"urls": ["src/migrate/MigrateSnapshotsFacet.sol"]
30+
},
31+
"src/migrate/MigrateETHDKG.t.sol": {
32+
"urls": ["src/migrate/MigrateETHDKG.t.sol"]
33+
},
34+
"src/migrate/MigrateStakingFacet.sol": {
35+
"urls": ["src/migrate/MigrateStakingFacet.sol"]
36+
},
37+
"src/migrate/MigrateParticipantsFacet.sol": {
38+
"urls": ["src/migrate/MigrateParticipantsFacet.sol"]
39+
},
40+
"src/migrate/MigrateSnapshotsFacet.t.sol": {
41+
"urls": ["src/migrate/MigrateSnapshotsFacet.t.sol"]
42+
},
43+
"src/migrate/MigrateParticipantsFacet.t.sol": {
44+
"urls": ["src/migrate/MigrateParticipantsFacet.t.sol"]
45+
},
46+
"src/migrate/MigrateETHDKG.sol": {
47+
"urls": ["src/migrate/MigrateETHDKG.sol"]
48+
},
49+
"src/migrate/MigrateStakingFacet.t.sol": {
50+
"urls": ["src/migrate/MigrateStakingFacet.t.sol"]
51+
},
52+
"src/facets/EthDKGLibrary.sol": {
53+
"urls": ["src/facets/EthDKGLibrary.sol"]
54+
},
55+
"src/facets/StakingLibrary.sol": {
56+
"urls": ["src/facets/StakingLibrary.sol"]
57+
},
58+
"src/facets/EthDKG.t.sol": { "urls": ["src/facets/EthDKG.t.sol"] },
59+
"src/facets/DiamondStorageLibrary.sol": {
60+
"urls": ["src/facets/DiamondStorageLibrary.sol"]
61+
},
62+
"src/facets/ParticipantsLibrary.sol": {
63+
"urls": ["src/facets/ParticipantsLibrary.sol"]
64+
},
65+
"src/facets/SnapshotsFacet.sol": {
66+
"urls": ["src/facets/SnapshotsFacet.sol"]
67+
},
68+
"src/facets/StakingFacet.sol": { "urls": ["src/facets/StakingFacet.sol"] },
69+
"src/facets/EthDKGInformationFacet.sol": {
70+
"urls": ["src/facets/EthDKGInformationFacet.sol"]
71+
},
72+
"src/facets/SnapshotsFacet.t.sol": {
73+
"urls": ["src/facets/SnapshotsFacet.t.sol"]
74+
},
75+
"src/facets/AccessControlLibrary.sol": {
76+
"urls": ["src/facets/AccessControlLibrary.sol"]
77+
},
78+
"src/facets/EthDKGInitializeFacet.sol": {
79+
"urls": ["src/facets/EthDKGInitializeFacet.sol"]
80+
},
81+
"src/facets/EthDKGMiscFacet.sol": {
82+
"urls": ["src/facets/EthDKGMiscFacet.sol"]
83+
},
84+
"src/facets/ParticipantsFacet.sol": {
85+
"urls": ["src/facets/ParticipantsFacet.sol"]
86+
},
87+
"src/facets/EthDKGCompletionFacet.sol": {
88+
"urls": ["src/facets/EthDKGCompletionFacet.sol"]
89+
},
90+
"src/facets/DiamondUpdateFacet.sol": {
91+
"urls": ["src/facets/DiamondUpdateFacet.sol"]
92+
},
93+
"src/facets/EthDKGSubmitDisputeFacet.sol": {
94+
"urls": ["src/facets/EthDKGSubmitDisputeFacet.sol"]
95+
},
96+
"src/facets/EthDKGSubmitMPKFacet.sol": {
97+
"urls": ["src/facets/EthDKGSubmitMPKFacet.sol"]
98+
},
99+
"src/facets/SnapshotsLibrary.sol": {
100+
"urls": ["src/facets/SnapshotsLibrary.sol"]
101+
},
102+
"src/facets/Setup.t.sol": { "urls": ["src/facets/Setup.t.sol"] },
103+
"src/facets/EthDKGGroupAccusationFacet.sol": {
104+
"urls": ["src/facets/EthDKGGroupAccusationFacet.sol"]
105+
},
106+
"src/facets/StopLibrary.sol": { "urls": ["src/facets/StopLibrary.sol"] },
107+
"src/facets/StakingFacet.t.sol": {
108+
"urls": ["src/facets/StakingFacet.t.sol"]
109+
},
110+
"src/facets/ParticipantsFacet.t.sol": {
111+
"urls": ["src/facets/ParticipantsFacet.t.sol"]
112+
},
113+
"src/interfaces/StakingEvents.sol": {
114+
"urls": ["src/interfaces/StakingEvents.sol"]
115+
},
116+
"src/interfaces/Validators.sol": {
117+
"urls": ["src/interfaces/Validators.sol"]
118+
},
119+
"src/interfaces/ValidatorsEvents.sol": {
120+
"urls": ["src/interfaces/ValidatorsEvents.sol"]
121+
},
122+
"src/interfaces/Token.sol": { "urls": ["src/interfaces/Token.sol"] },
123+
"src/interfaces/Participants.sol": {
124+
"urls": ["src/interfaces/Participants.sol"]
125+
},
126+
"src/interfaces/ETHDKGEvents.sol": {
127+
"urls": ["src/interfaces/ETHDKGEvents.sol"]
128+
},
129+
"src/interfaces/SnapshotsEvents.sol": {
130+
"urls": ["src/interfaces/SnapshotsEvents.sol"]
131+
},
132+
"src/interfaces/ETHDKG.sol": { "urls": ["src/interfaces/ETHDKG.sol"] },
133+
"src/interfaces/Staking.sol": { "urls": ["src/interfaces/Staking.sol"] },
134+
"src/interfaces/ParticipantsEvents.sol": {
135+
"urls": ["src/interfaces/ParticipantsEvents.sol"]
136+
},
137+
"src/interfaces/Snapshots.sol": { "urls": ["src/interfaces/Snapshots.sol"] }
138+
},
139+
"settings": {
140+
"remappings": [
141+
"ds-auth/=lib/ds-auth/src/",
142+
"ds-auth=lib/ds-auth/src/index.sol",
143+
"ds-test/=lib/ds-test/src/",
144+
"ds-test=lib/ds-test/src/index.sol",
145+
"ds-math/=lib/ds-math/src/",
146+
"ds-math=lib/ds-math/src/index.sol",
147+
"ds-stop/=lib/ds-stop/src/",
148+
"ds-stop=lib/ds-stop/src/index.sol",
149+
"ds-token/=lib/ds-token/src/",
150+
"ds-token=lib/ds-token/src/index.sol",
151+
"ds-note/=lib/ds-stop/lib/ds-note/src/",
152+
"ds-note=lib/ds-stop/lib/ds-note/src/index.sol"
153+
],
154+
"outputSelection": {
155+
"*": {
156+
"*": [
157+
"metadata",
158+
"evm.bytecode",
159+
"evm.deployedBytecode",
160+
"abi",
161+
"storageLayout",
162+
"evm.bytecode.sourceMap",
163+
"evm.bytecode.linkReferences",
164+
"evm.bytecode.generatedSources",
165+
"evm.deployedBytecode.sourceMap",
166+
"evm.deployedBytecode.linkReferences",
167+
"evm.deployedBytecode.generatedSources",
168+
"evm.deployedBytecode.immutableReferences"
169+
],
170+
"": ["ast"]
171+
}
172+
}
173+
}
174+
}

‎dapp.json‎

Lines changed: 144 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,144 @@
1+
{
2+
"language": "Solidity",
3+
"sources": {
4+
"src/EthDKGDiamond.sol": { "urls": ["src/EthDKGDiamond.sol"] },
5+
"src/CryptoLibrary.sol": { "urls": ["src/CryptoLibrary.sol"] },
6+
"src/Registry.sol": { "urls": ["src/Registry.sol"] },
7+
"src/SignatureLibrary.sol": { "urls": ["src/SignatureLibrary.sol"] },
8+
"src/SimpleAuth.sol": { "urls": ["src/SimpleAuth.sol"] },
9+
"src/AccusationManager.sol": { "urls": ["src/AccusationManager.sol"] },
10+
"src/QueueLibrary.sol": { "urls": ["src/QueueLibrary.sol"] },
11+
"src/Token.sol": { "urls": ["src/Token.sol"] },
12+
"src/MerkleProof.sol": { "urls": ["src/MerkleProof.sol"] },
13+
"src/TokenMigrator.sol": { "urls": ["src/TokenMigrator.sol"] },
14+
"src/Diamond.sol": { "urls": ["src/Diamond.sol"] },
15+
"src/ERC165.sol": { "urls": ["src/ERC165.sol"] },
16+
"src/Crypto.sol": { "urls": ["src/Crypto.sol"] },
17+
"src/SafeMath.sol": { "urls": ["src/SafeMath.sol"] },
18+
"src/Constants.sol": { "urls": ["src/Constants.sol"] },
19+
"src/Deposit.sol": { "urls": ["src/Deposit.sol"] },
20+
"src/ValidatorsDiamond.sol": { "urls": ["src/ValidatorsDiamond.sol"] },
21+
"src/migrate/MigrateSnapshotsFacet.sol": {
22+
"urls": ["src/migrate/MigrateSnapshotsFacet.sol"]
23+
},
24+
"src/migrate/MigrateStakingFacet.sol": {
25+
"urls": ["src/migrate/MigrateStakingFacet.sol"]
26+
},
27+
"src/migrate/MigrateParticipantsFacet.sol": {
28+
"urls": ["src/migrate/MigrateParticipantsFacet.sol"]
29+
},
30+
"src/migrate/MigrateETHDKG.sol": {
31+
"urls": ["src/migrate/MigrateETHDKG.sol"]
32+
},
33+
"src/facets/EthDKGLibrary.sol": {
34+
"urls": ["src/facets/EthDKGLibrary.sol"]
35+
},
36+
"src/facets/StakingLibrary.sol": {
37+
"urls": ["src/facets/StakingLibrary.sol"]
38+
},
39+
"src/facets/DiamondStorageLibrary.sol": {
40+
"urls": ["src/facets/DiamondStorageLibrary.sol"]
41+
},
42+
"src/facets/ParticipantsLibrary.sol": {
43+
"urls": ["src/facets/ParticipantsLibrary.sol"]
44+
},
45+
"src/facets/SnapshotsFacet.sol": {
46+
"urls": ["src/facets/SnapshotsFacet.sol"]
47+
},
48+
"src/facets/StakingFacet.sol": { "urls": ["src/facets/StakingFacet.sol"] },
49+
"src/facets/EthDKGInformationFacet.sol": {
50+
"urls": ["src/facets/EthDKGInformationFacet.sol"]
51+
},
52+
"src/facets/AccessControlLibrary.sol": {
53+
"urls": ["src/facets/AccessControlLibrary.sol"]
54+
},
55+
"src/facets/EthDKGInitializeFacet.sol": {
56+
"urls": ["src/facets/EthDKGInitializeFacet.sol"]
57+
},
58+
"src/facets/EthDKGMiscFacet.sol": {
59+
"urls": ["src/facets/EthDKGMiscFacet.sol"]
60+
},
61+
"src/facets/ParticipantsFacet.sol": {
62+
"urls": ["src/facets/ParticipantsFacet.sol"]
63+
},
64+
"src/facets/EthDKGCompletionFacet.sol": {
65+
"urls": ["src/facets/EthDKGCompletionFacet.sol"]
66+
},
67+
"src/facets/DiamondUpdateFacet.sol": {
68+
"urls": ["src/facets/DiamondUpdateFacet.sol"]
69+
},
70+
"src/facets/EthDKGSubmitDisputeFacet.sol": {
71+
"urls": ["src/facets/EthDKGSubmitDisputeFacet.sol"]
72+
},
73+
"src/facets/EthDKGSubmitMPKFacet.sol": {
74+
"urls": ["src/facets/EthDKGSubmitMPKFacet.sol"]
75+
},
76+
"src/facets/SnapshotsLibrary.sol": {
77+
"urls": ["src/facets/SnapshotsLibrary.sol"]
78+
},
79+
"src/facets/EthDKGGroupAccusationFacet.sol": {
80+
"urls": ["src/facets/EthDKGGroupAccusationFacet.sol"]
81+
},
82+
"src/facets/StopLibrary.sol": { "urls": ["src/facets/StopLibrary.sol"] },
83+
"src/interfaces/StakingEvents.sol": {
84+
"urls": ["src/interfaces/StakingEvents.sol"]
85+
},
86+
"src/interfaces/Validators.sol": {
87+
"urls": ["src/interfaces/Validators.sol"]
88+
},
89+
"src/interfaces/ValidatorsEvents.sol": {
90+
"urls": ["src/interfaces/ValidatorsEvents.sol"]
91+
},
92+
"src/interfaces/Token.sol": { "urls": ["src/interfaces/Token.sol"] },
93+
"src/interfaces/Participants.sol": {
94+
"urls": ["src/interfaces/Participants.sol"]
95+
},
96+
"src/interfaces/ETHDKGEvents.sol": {
97+
"urls": ["src/interfaces/ETHDKGEvents.sol"]
98+
},
99+
"src/interfaces/SnapshotsEvents.sol": {
100+
"urls": ["src/interfaces/SnapshotsEvents.sol"]
101+
},
102+
"src/interfaces/ETHDKG.sol": { "urls": ["src/interfaces/ETHDKG.sol"] },
103+
"src/interfaces/Staking.sol": { "urls": ["src/interfaces/Staking.sol"] },
104+
"src/interfaces/ParticipantsEvents.sol": {
105+
"urls": ["src/interfaces/ParticipantsEvents.sol"]
106+
},
107+
"src/interfaces/Snapshots.sol": { "urls": ["src/interfaces/Snapshots.sol"] }
108+
},
109+
"settings": {
110+
"remappings": [
111+
"ds-auth/=lib/ds-auth/src/",
112+
"ds-auth=lib/ds-auth/src/index.sol",
113+
"ds-test/=lib/ds-test/src/",
114+
"ds-test=lib/ds-test/src/index.sol",
115+
"ds-math/=lib/ds-math/src/",
116+
"ds-math=lib/ds-math/src/index.sol",
117+
"ds-stop/=lib/ds-stop/src/",
118+
"ds-stop=lib/ds-stop/src/index.sol",
119+
"ds-token/=lib/ds-token/src/",
120+
"ds-token=lib/ds-token/src/index.sol",
121+
"ds-note/=lib/ds-stop/lib/ds-note/src/",
122+
"ds-note=lib/ds-stop/lib/ds-note/src/index.sol"
123+
],
124+
"outputSelection": {
125+
"*": {
126+
"*": [
127+
"metadata",
128+
"evm.bytecode",
129+
"evm.deployedBytecode",
130+
"abi",
131+
"storageLayout",
132+
"evm.bytecode.sourceMap",
133+
"evm.bytecode.linkReferences",
134+
"evm.bytecode.generatedSources",
135+
"evm.deployedBytecode.sourceMap",
136+
"evm.deployedBytecode.linkReferences",
137+
"evm.deployedBytecode.generatedSources",
138+
"evm.deployedBytecode.immutableReferences"
139+
],
140+
"": ["ast"]
141+
}
142+
}
143+
}
144+
}

‎generated.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
package bridge
22

3-
//go:generate abigen --combined-json ./out/dapp.sol.json --pkg bindings --exc lib/ds-auth/src/auth.sol:DSAuth,lib/ds-auth/src/auth.sol:DSAuthEvents,lib/ds-auth/src/auth.sol:DSAuthority,lib/ds-token/src/token.sol:DSToken,lib/ds-token/src/base.sol:DSTokenBase,lib/ds-stop/src/stop.sol:DSStop,lib/ds-math/src/math.sol:DSMath,lib/ds-stop/lib/ds-note/src/note.sol:DSNote,src/AccusationManager.sol:AccusationEvents,src/AccusationManager.sol:AccusationManager,src/Bridge.sol:Bridge,src/Bridge.sol:BridgeStorage,src/Bridge.sol:SubContract1,src/Bridge.sol:SubContract2,src/Bridge.sol:SubContract3,src/Bridge.sol:MonoBridge,src/Bridge.t.sol:BridgeTest,src/Crypto.t.sol:CryptoTest,src/ETHDKG.t.sol:ETHDKGTest,src/Persistence.sol:Persistence,src/Persistence.t.sol:PersistanceTest,src/Staking.t.sol:StakingTest,src/Validators.t.sol:ValidatorsTest,src/QueueLibrary.t.sol:QueueLibraryTest,src/Deposit.t.sol:DepositTest,lib/ds-test/src/test.sol:DSTest,lib/ds-token/lib/erc20/src/erc20.sol:ERC20,src/ERC165.sol:ERC165,src/ERC165.sol:ERC165Library --out ./bindings/bridge.go
3+
//go:generate abigen --solc solc-0.7.6 --combined-json ./out/dapp.sol.json --pkg bindings --out ./bindings/bridge.go

‎out/dapp.sol.json‎

Lines changed: 1 addition & 1 deletion
Large diffs are not rendered by default.

‎src/AccusationManager.sol‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1+
// SPDX-License-Identifier: MIT-open-group
12
pragma solidity >=0.5.15;
23

3-
44
contract AccusationEvents {
55
event InvalidProposer(address indexed validator);
66
event MultipleProposals(address indexed validator);

‎src/MerkleProof.sol‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
// SPDX-License-Identifier: MIT-open-group
12
pragma solidity >=0.5.15;
23

34
contract MerkleProof {

0 commit comments

Comments
 (0)