This repository has been archived by the owner on Mar 3, 2022. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 10
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Updated build and ABI generation steps (#11)
- Loading branch information
Showing
8 changed files
with
33,243 additions
and
16,755 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,6 +1,6 @@ | ||
FLAGS = --use solc:0.7.6 | ||
|
||
all :; dapp $(FLAGS) build | ||
all :; DAPP_STANDARD_JSON=dapp.json dapp $(FLAGS) build --legacy | ||
clean :; dapp clean | ||
test :; dapp $(FLAGS) test -v | ||
test :; DAPP_STANDARD_JSON=dapp-test.json dapp $(FLAGS) test -v | ||
deploy :; dapp create Bridge |
Large diffs are not rendered by default.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,174 @@ | ||
{ | ||
"language": "Solidity", | ||
"sources": { | ||
"src/EthDKGDiamond.sol": { "urls": ["src/EthDKGDiamond.sol"] }, | ||
"src/CryptoLibrary.sol": { "urls": ["src/CryptoLibrary.sol"] }, | ||
"src/TokenMigrator.t.sol": { "urls": ["src/TokenMigrator.t.sol"] }, | ||
"src/Registry.sol": { "urls": ["src/Registry.sol"] }, | ||
"src/SignatureLibrary.sol": { "urls": ["src/SignatureLibrary.sol"] }, | ||
"src/SimpleAuth.sol": { "urls": ["src/SimpleAuth.sol"] }, | ||
"src/AccusationManager.sol": { "urls": ["src/AccusationManager.sol"] }, | ||
"src/QueueLibrary.sol": { "urls": ["src/QueueLibrary.sol"] }, | ||
"src/Token.t.sol": { "urls": ["src/Token.t.sol"] }, | ||
"src/Token.sol": { "urls": ["src/Token.sol"] }, | ||
"src/MerkleProof.sol": { "urls": ["src/MerkleProof.sol"] }, | ||
"src/CryptoLibrary.t.sol": { "urls": ["src/CryptoLibrary.t.sol"] }, | ||
"src/TokenMigrator.sol": { "urls": ["src/TokenMigrator.sol"] }, | ||
"src/Diamond.sol": { "urls": ["src/Diamond.sol"] }, | ||
"src/Registry.t.sol": { "urls": ["src/Registry.t.sol"] }, | ||
"src/ERC165.sol": { "urls": ["src/ERC165.sol"] }, | ||
"src/Crypto.sol": { "urls": ["src/Crypto.sol"] }, | ||
"src/Deposit.t.sol": { "urls": ["src/Deposit.t.sol"] }, | ||
"src/SafeMath.sol": { "urls": ["src/SafeMath.sol"] }, | ||
"src/Constants.sol": { "urls": ["src/Constants.sol"] }, | ||
"src/Deposit.sol": { "urls": ["src/Deposit.sol"] }, | ||
"src/ValidatorsDiamond.sol": { "urls": ["src/ValidatorsDiamond.sol"] }, | ||
"src/QueueLibrary.t.sol": { "urls": ["src/QueueLibrary.t.sol"] }, | ||
"src/Experiment.t.sol": { "urls": ["src/Experiment.t.sol"] }, | ||
"src/migrate/MigrateSnapshotsFacet.sol": { | ||
"urls": ["src/migrate/MigrateSnapshotsFacet.sol"] | ||
}, | ||
"src/migrate/MigrateETHDKG.t.sol": { | ||
"urls": ["src/migrate/MigrateETHDKG.t.sol"] | ||
}, | ||
"src/migrate/MigrateStakingFacet.sol": { | ||
"urls": ["src/migrate/MigrateStakingFacet.sol"] | ||
}, | ||
"src/migrate/MigrateParticipantsFacet.sol": { | ||
"urls": ["src/migrate/MigrateParticipantsFacet.sol"] | ||
}, | ||
"src/migrate/MigrateSnapshotsFacet.t.sol": { | ||
"urls": ["src/migrate/MigrateSnapshotsFacet.t.sol"] | ||
}, | ||
"src/migrate/MigrateParticipantsFacet.t.sol": { | ||
"urls": ["src/migrate/MigrateParticipantsFacet.t.sol"] | ||
}, | ||
"src/migrate/MigrateETHDKG.sol": { | ||
"urls": ["src/migrate/MigrateETHDKG.sol"] | ||
}, | ||
"src/migrate/MigrateStakingFacet.t.sol": { | ||
"urls": ["src/migrate/MigrateStakingFacet.t.sol"] | ||
}, | ||
"src/facets/EthDKGLibrary.sol": { | ||
"urls": ["src/facets/EthDKGLibrary.sol"] | ||
}, | ||
"src/facets/StakingLibrary.sol": { | ||
"urls": ["src/facets/StakingLibrary.sol"] | ||
}, | ||
"src/facets/EthDKG.t.sol": { "urls": ["src/facets/EthDKG.t.sol"] }, | ||
"src/facets/DiamondStorageLibrary.sol": { | ||
"urls": ["src/facets/DiamondStorageLibrary.sol"] | ||
}, | ||
"src/facets/ParticipantsLibrary.sol": { | ||
"urls": ["src/facets/ParticipantsLibrary.sol"] | ||
}, | ||
"src/facets/SnapshotsFacet.sol": { | ||
"urls": ["src/facets/SnapshotsFacet.sol"] | ||
}, | ||
"src/facets/StakingFacet.sol": { "urls": ["src/facets/StakingFacet.sol"] }, | ||
"src/facets/EthDKGInformationFacet.sol": { | ||
"urls": ["src/facets/EthDKGInformationFacet.sol"] | ||
}, | ||
"src/facets/SnapshotsFacet.t.sol": { | ||
"urls": ["src/facets/SnapshotsFacet.t.sol"] | ||
}, | ||
"src/facets/AccessControlLibrary.sol": { | ||
"urls": ["src/facets/AccessControlLibrary.sol"] | ||
}, | ||
"src/facets/EthDKGInitializeFacet.sol": { | ||
"urls": ["src/facets/EthDKGInitializeFacet.sol"] | ||
}, | ||
"src/facets/EthDKGMiscFacet.sol": { | ||
"urls": ["src/facets/EthDKGMiscFacet.sol"] | ||
}, | ||
"src/facets/ParticipantsFacet.sol": { | ||
"urls": ["src/facets/ParticipantsFacet.sol"] | ||
}, | ||
"src/facets/EthDKGCompletionFacet.sol": { | ||
"urls": ["src/facets/EthDKGCompletionFacet.sol"] | ||
}, | ||
"src/facets/DiamondUpdateFacet.sol": { | ||
"urls": ["src/facets/DiamondUpdateFacet.sol"] | ||
}, | ||
"src/facets/EthDKGSubmitDisputeFacet.sol": { | ||
"urls": ["src/facets/EthDKGSubmitDisputeFacet.sol"] | ||
}, | ||
"src/facets/EthDKGSubmitMPKFacet.sol": { | ||
"urls": ["src/facets/EthDKGSubmitMPKFacet.sol"] | ||
}, | ||
"src/facets/SnapshotsLibrary.sol": { | ||
"urls": ["src/facets/SnapshotsLibrary.sol"] | ||
}, | ||
"src/facets/Setup.t.sol": { "urls": ["src/facets/Setup.t.sol"] }, | ||
"src/facets/EthDKGGroupAccusationFacet.sol": { | ||
"urls": ["src/facets/EthDKGGroupAccusationFacet.sol"] | ||
}, | ||
"src/facets/StopLibrary.sol": { "urls": ["src/facets/StopLibrary.sol"] }, | ||
"src/facets/StakingFacet.t.sol": { | ||
"urls": ["src/facets/StakingFacet.t.sol"] | ||
}, | ||
"src/facets/ParticipantsFacet.t.sol": { | ||
"urls": ["src/facets/ParticipantsFacet.t.sol"] | ||
}, | ||
"src/interfaces/StakingEvents.sol": { | ||
"urls": ["src/interfaces/StakingEvents.sol"] | ||
}, | ||
"src/interfaces/Validators.sol": { | ||
"urls": ["src/interfaces/Validators.sol"] | ||
}, | ||
"src/interfaces/ValidatorsEvents.sol": { | ||
"urls": ["src/interfaces/ValidatorsEvents.sol"] | ||
}, | ||
"src/interfaces/Token.sol": { "urls": ["src/interfaces/Token.sol"] }, | ||
"src/interfaces/Participants.sol": { | ||
"urls": ["src/interfaces/Participants.sol"] | ||
}, | ||
"src/interfaces/ETHDKGEvents.sol": { | ||
"urls": ["src/interfaces/ETHDKGEvents.sol"] | ||
}, | ||
"src/interfaces/SnapshotsEvents.sol": { | ||
"urls": ["src/interfaces/SnapshotsEvents.sol"] | ||
}, | ||
"src/interfaces/ETHDKG.sol": { "urls": ["src/interfaces/ETHDKG.sol"] }, | ||
"src/interfaces/Staking.sol": { "urls": ["src/interfaces/Staking.sol"] }, | ||
"src/interfaces/ParticipantsEvents.sol": { | ||
"urls": ["src/interfaces/ParticipantsEvents.sol"] | ||
}, | ||
"src/interfaces/Snapshots.sol": { "urls": ["src/interfaces/Snapshots.sol"] } | ||
}, | ||
"settings": { | ||
"remappings": [ | ||
"ds-auth/=lib/ds-auth/src/", | ||
"ds-auth=lib/ds-auth/src/index.sol", | ||
"ds-test/=lib/ds-test/src/", | ||
"ds-test=lib/ds-test/src/index.sol", | ||
"ds-math/=lib/ds-math/src/", | ||
"ds-math=lib/ds-math/src/index.sol", | ||
"ds-stop/=lib/ds-stop/src/", | ||
"ds-stop=lib/ds-stop/src/index.sol", | ||
"ds-token/=lib/ds-token/src/", | ||
"ds-token=lib/ds-token/src/index.sol", | ||
"ds-note/=lib/ds-stop/lib/ds-note/src/", | ||
"ds-note=lib/ds-stop/lib/ds-note/src/index.sol" | ||
], | ||
"outputSelection": { | ||
"*": { | ||
"*": [ | ||
"metadata", | ||
"evm.bytecode", | ||
"evm.deployedBytecode", | ||
"abi", | ||
"storageLayout", | ||
"evm.bytecode.sourceMap", | ||
"evm.bytecode.linkReferences", | ||
"evm.bytecode.generatedSources", | ||
"evm.deployedBytecode.sourceMap", | ||
"evm.deployedBytecode.linkReferences", | ||
"evm.deployedBytecode.generatedSources", | ||
"evm.deployedBytecode.immutableReferences" | ||
], | ||
"": ["ast"] | ||
} | ||
} | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,144 @@ | ||
{ | ||
"language": "Solidity", | ||
"sources": { | ||
"src/EthDKGDiamond.sol": { "urls": ["src/EthDKGDiamond.sol"] }, | ||
"src/CryptoLibrary.sol": { "urls": ["src/CryptoLibrary.sol"] }, | ||
"src/Registry.sol": { "urls": ["src/Registry.sol"] }, | ||
"src/SignatureLibrary.sol": { "urls": ["src/SignatureLibrary.sol"] }, | ||
"src/SimpleAuth.sol": { "urls": ["src/SimpleAuth.sol"] }, | ||
"src/AccusationManager.sol": { "urls": ["src/AccusationManager.sol"] }, | ||
"src/QueueLibrary.sol": { "urls": ["src/QueueLibrary.sol"] }, | ||
"src/Token.sol": { "urls": ["src/Token.sol"] }, | ||
"src/MerkleProof.sol": { "urls": ["src/MerkleProof.sol"] }, | ||
"src/TokenMigrator.sol": { "urls": ["src/TokenMigrator.sol"] }, | ||
"src/Diamond.sol": { "urls": ["src/Diamond.sol"] }, | ||
"src/ERC165.sol": { "urls": ["src/ERC165.sol"] }, | ||
"src/Crypto.sol": { "urls": ["src/Crypto.sol"] }, | ||
"src/SafeMath.sol": { "urls": ["src/SafeMath.sol"] }, | ||
"src/Constants.sol": { "urls": ["src/Constants.sol"] }, | ||
"src/Deposit.sol": { "urls": ["src/Deposit.sol"] }, | ||
"src/ValidatorsDiamond.sol": { "urls": ["src/ValidatorsDiamond.sol"] }, | ||
"src/migrate/MigrateSnapshotsFacet.sol": { | ||
"urls": ["src/migrate/MigrateSnapshotsFacet.sol"] | ||
}, | ||
"src/migrate/MigrateStakingFacet.sol": { | ||
"urls": ["src/migrate/MigrateStakingFacet.sol"] | ||
}, | ||
"src/migrate/MigrateParticipantsFacet.sol": { | ||
"urls": ["src/migrate/MigrateParticipantsFacet.sol"] | ||
}, | ||
"src/migrate/MigrateETHDKG.sol": { | ||
"urls": ["src/migrate/MigrateETHDKG.sol"] | ||
}, | ||
"src/facets/EthDKGLibrary.sol": { | ||
"urls": ["src/facets/EthDKGLibrary.sol"] | ||
}, | ||
"src/facets/StakingLibrary.sol": { | ||
"urls": ["src/facets/StakingLibrary.sol"] | ||
}, | ||
"src/facets/DiamondStorageLibrary.sol": { | ||
"urls": ["src/facets/DiamondStorageLibrary.sol"] | ||
}, | ||
"src/facets/ParticipantsLibrary.sol": { | ||
"urls": ["src/facets/ParticipantsLibrary.sol"] | ||
}, | ||
"src/facets/SnapshotsFacet.sol": { | ||
"urls": ["src/facets/SnapshotsFacet.sol"] | ||
}, | ||
"src/facets/StakingFacet.sol": { "urls": ["src/facets/StakingFacet.sol"] }, | ||
"src/facets/EthDKGInformationFacet.sol": { | ||
"urls": ["src/facets/EthDKGInformationFacet.sol"] | ||
}, | ||
"src/facets/AccessControlLibrary.sol": { | ||
"urls": ["src/facets/AccessControlLibrary.sol"] | ||
}, | ||
"src/facets/EthDKGInitializeFacet.sol": { | ||
"urls": ["src/facets/EthDKGInitializeFacet.sol"] | ||
}, | ||
"src/facets/EthDKGMiscFacet.sol": { | ||
"urls": ["src/facets/EthDKGMiscFacet.sol"] | ||
}, | ||
"src/facets/ParticipantsFacet.sol": { | ||
"urls": ["src/facets/ParticipantsFacet.sol"] | ||
}, | ||
"src/facets/EthDKGCompletionFacet.sol": { | ||
"urls": ["src/facets/EthDKGCompletionFacet.sol"] | ||
}, | ||
"src/facets/DiamondUpdateFacet.sol": { | ||
"urls": ["src/facets/DiamondUpdateFacet.sol"] | ||
}, | ||
"src/facets/EthDKGSubmitDisputeFacet.sol": { | ||
"urls": ["src/facets/EthDKGSubmitDisputeFacet.sol"] | ||
}, | ||
"src/facets/EthDKGSubmitMPKFacet.sol": { | ||
"urls": ["src/facets/EthDKGSubmitMPKFacet.sol"] | ||
}, | ||
"src/facets/SnapshotsLibrary.sol": { | ||
"urls": ["src/facets/SnapshotsLibrary.sol"] | ||
}, | ||
"src/facets/EthDKGGroupAccusationFacet.sol": { | ||
"urls": ["src/facets/EthDKGGroupAccusationFacet.sol"] | ||
}, | ||
"src/facets/StopLibrary.sol": { "urls": ["src/facets/StopLibrary.sol"] }, | ||
"src/interfaces/StakingEvents.sol": { | ||
"urls": ["src/interfaces/StakingEvents.sol"] | ||
}, | ||
"src/interfaces/Validators.sol": { | ||
"urls": ["src/interfaces/Validators.sol"] | ||
}, | ||
"src/interfaces/ValidatorsEvents.sol": { | ||
"urls": ["src/interfaces/ValidatorsEvents.sol"] | ||
}, | ||
"src/interfaces/Token.sol": { "urls": ["src/interfaces/Token.sol"] }, | ||
"src/interfaces/Participants.sol": { | ||
"urls": ["src/interfaces/Participants.sol"] | ||
}, | ||
"src/interfaces/ETHDKGEvents.sol": { | ||
"urls": ["src/interfaces/ETHDKGEvents.sol"] | ||
}, | ||
"src/interfaces/SnapshotsEvents.sol": { | ||
"urls": ["src/interfaces/SnapshotsEvents.sol"] | ||
}, | ||
"src/interfaces/ETHDKG.sol": { "urls": ["src/interfaces/ETHDKG.sol"] }, | ||
"src/interfaces/Staking.sol": { "urls": ["src/interfaces/Staking.sol"] }, | ||
"src/interfaces/ParticipantsEvents.sol": { | ||
"urls": ["src/interfaces/ParticipantsEvents.sol"] | ||
}, | ||
"src/interfaces/Snapshots.sol": { "urls": ["src/interfaces/Snapshots.sol"] } | ||
}, | ||
"settings": { | ||
"remappings": [ | ||
"ds-auth/=lib/ds-auth/src/", | ||
"ds-auth=lib/ds-auth/src/index.sol", | ||
"ds-test/=lib/ds-test/src/", | ||
"ds-test=lib/ds-test/src/index.sol", | ||
"ds-math/=lib/ds-math/src/", | ||
"ds-math=lib/ds-math/src/index.sol", | ||
"ds-stop/=lib/ds-stop/src/", | ||
"ds-stop=lib/ds-stop/src/index.sol", | ||
"ds-token/=lib/ds-token/src/", | ||
"ds-token=lib/ds-token/src/index.sol", | ||
"ds-note/=lib/ds-stop/lib/ds-note/src/", | ||
"ds-note=lib/ds-stop/lib/ds-note/src/index.sol" | ||
], | ||
"outputSelection": { | ||
"*": { | ||
"*": [ | ||
"metadata", | ||
"evm.bytecode", | ||
"evm.deployedBytecode", | ||
"abi", | ||
"storageLayout", | ||
"evm.bytecode.sourceMap", | ||
"evm.bytecode.linkReferences", | ||
"evm.bytecode.generatedSources", | ||
"evm.deployedBytecode.sourceMap", | ||
"evm.deployedBytecode.linkReferences", | ||
"evm.deployedBytecode.generatedSources", | ||
"evm.deployedBytecode.immutableReferences" | ||
], | ||
"": ["ast"] | ||
} | ||
} | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,3 +1,3 @@ | ||
package bridge | ||
|
||
//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 | ||
//go:generate abigen --solc solc-0.7.6 --combined-json ./out/dapp.sol.json --pkg bindings --out ./bindings/bridge.go |
Large diffs are not rendered by default.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,3 +1,4 @@ | ||
// SPDX-License-Identifier: MIT-open-group | ||
pragma solidity >=0.5.15; | ||
|
||
contract MerkleProof { | ||
|