submodules to npm packages
This commit is contained in:
parent
ae8370df0d
commit
435da86981
|
@ -1,28 +1,8 @@
|
|||
[submodule "submodules/poa-chain-spec"]
|
||||
path = submodules/poa-chain-spec
|
||||
url = https://github.com/poanetwork/poa-chain-spec
|
||||
branch = sokol
|
||||
[submodule "submodules/poa-scripts-moc"]
|
||||
path = submodules/poa-scripts-moc
|
||||
url = https://github.com/poanetwork/poa-scripts-moc
|
||||
branch = sokol
|
||||
[submodule "submodules/poa-dapps-validators"]
|
||||
path = submodules/poa-dapps-validators
|
||||
url = https://github.com/poanetwork/poa-dapps-validators
|
||||
branch = core
|
||||
[submodule "submodules/poa-dapps-keys-generation"]
|
||||
path = submodules/poa-dapps-keys-generation
|
||||
url = https://github.com/poanetwork/poa-dapps-keys-generation
|
||||
branch = core
|
||||
[submodule "submodules/solidity-flattener"]
|
||||
path = submodules/solidity-flattener
|
||||
url = https://github.com/poanetwork/solidity-flattener
|
||||
branch = master
|
||||
[submodule "submodules/poa-dapps-voting"]
|
||||
path = submodules/poa-dapps-voting
|
||||
url = https://github.com/poanetwork/poa-dapps-voting
|
||||
branch = core
|
||||
[submodule "submodules/poa-network-consensus-contracts"]
|
||||
path = submodules/poa-network-consensus-contracts
|
||||
url = https://github.com/poanetwork/poa-network-consensus-contracts
|
||||
branch = master
|
||||
branch = master
|
File diff suppressed because it is too large
Load Diff
28
package.json
28
package.json
|
@ -13,15 +13,18 @@
|
|||
"node-fetch": "^2.0.0",
|
||||
"password-generator": "^2.2.0",
|
||||
"path": "^0.12.7",
|
||||
"poa-dapps-keys-generation": "github:poanetwork/poa-dapps-keys-generation#core",
|
||||
"poa-dapps-validators": "github:poanetwork/poa-dapps-validators#core",
|
||||
"poa-dapps-voting": "github:poanetwork/poa-dapps-voting#core",
|
||||
"selenium-webdriver": "3.6.0",
|
||||
"toml": "^2.3.3",
|
||||
"toml-js": "0.0.8",
|
||||
"web3": "1.0.0-beta.34"
|
||||
},
|
||||
"scripts": {
|
||||
"start-moc-setup": "npm run get-main-submodules && npm run prepare-contracts-repo && npm run prepare-moc-node && npm run start-moc-node && npm run deploy-secondary-contracts && npm run prepare-scripts-moc-repo && npm run test-setup-is-started",
|
||||
"launch-dapps": "npm run get-dapps-submodules && npm run launch-ceremony-dapp && npm run launch-validators-dapp && npm run launch-governance-dapp",
|
||||
"launch-dapps-ceremony": "npm run get-dapps-submodules-ceremony && npm run launch-ceremony-dapp",
|
||||
"start-moc-setup": "npm run get-all-submodules && npm run prepare-contracts-repo && npm run prepare-moc-node && npm run start-moc-node && npm run deploy-secondary-contracts && npm run prepare-scripts-moc-repo && npm run test-setup-is-started",
|
||||
"launch-dapps": "npm run launch-ceremony-dapp && npm run launch-validators-dapp && npm run launch-governance-dapp",
|
||||
"launch-dapps-ceremony": "npm run launch-ceremony-dapp",
|
||||
"launch-dapps-light": "npm run launch-ceremony-dapp",
|
||||
"launch-ceremony": "npm run launch-ceremony-1 && npm run launch-ceremony-2 && npm run launch-ceremony-3",
|
||||
"set-validators-data": "npm run e2e-validators-test 1 && npm run e2e-validators-test 2 && npm run e2e-validators-test 3",
|
||||
|
@ -38,21 +41,18 @@
|
|||
"start-test-setup": "npm run get-all-submodules && npm run prepare-contracts-repo && npm run prepare-moc-node && npm run start-moc-node && npm run deploy-secondary-contracts && npm run prepare-scripts-moc-repo && npm run prepare-ceremony-dapp && npm run prepare-ceremony-dapp-more && npm run generate-initial-keys && npm run get-private-initial-keys && npm run start-ceremony && npm run test-setup-is-started",
|
||||
"start-test-setup-e2e-ceremony-test": "npm run start-test-setup && npm run e2e-ceremony-test",
|
||||
"start-moc-validator-setup": "npm run start-test-setup-e2e-ceremony-test && npm run prepare-validator-node 1 && npm run start-validator-node 1 > /dev/null 2>&1 & && npm run prepare-validators-dapp && npm run prepare-validators-dapp-more && npm run start-validators-dapp",
|
||||
"get-main-submodules": "git submodule update --init submodules/poa-network-consensus-contracts && git submodule update --init submodules/solidity-flattener && git submodule update --init submodules/poa-scripts-moc && git submodule update --init submodules/poa-chain-spec",
|
||||
"get-dapps-submodules": "git submodule update --init submodules/poa-dapps-validators && git submodule update --init submodules/poa-dapps-voting && git submodule update --init submodules/poa-dapps-keys-generation",
|
||||
"get-dapps-submodules-ceremony": "git submodule update --init submodules/poa-dapps-keys-generation",
|
||||
"get-all-submodules": "git submodule update --init",
|
||||
"get-all-submodules": "git submodule update --init --remote",
|
||||
"prepare-contracts-repo": "bash ./scripts/prepare-contracts-repo",
|
||||
"prepare-moc-node": "node prepareMoCNode",
|
||||
"start-moc-node": "bash ./scripts/start-moc-node > /dev/null 2>&1 &",
|
||||
"deploy-secondary-contracts": "bash ./scripts/deploy-secondary-contracts",
|
||||
"prepare-scripts-moc-repo": "node prepareMoCScripts",
|
||||
"prepare-ceremony-dapp": "node prepareCeremonyDapp",
|
||||
"prepare-ceremony-dapp-more": "cd ./submodules/poa-dapps-keys-generation && npm i --production > /dev/null 2>&1 && npm run lint -- --fix",
|
||||
"prepare-ceremony-dapp-more": "cd ./node_modules/poa-dapps-keys-generation && npm run lint -- --fix",
|
||||
"generate-initial-key": "bash ./scripts/generate-initial-key",
|
||||
"generate-initial-keys": "bash ./scripts/generate-initial-keys",
|
||||
"get-private-initial-keys": "node getPrivateInitialKeys",
|
||||
"start-ceremony": "cd ./submodules/poa-dapps-keys-generation && PORT=3000 BROWSER=none npm start > /dev/null 2>&1 &",
|
||||
"start-ceremony": "cd ./node_modules/poa-dapps-keys-generation && PORT=3000 BROWSER=none npm start > /dev/null 2>&1 &",
|
||||
"test-setup-is-started": "echo '### POA test setup is configured ###'",
|
||||
"e2e-ceremony-test": "node e2eCeremonyTest",
|
||||
"e2e-validators-test": "node e2eValidatorsTest",
|
||||
|
@ -60,12 +60,12 @@
|
|||
"prepare-validator-node": "node prepareValidatorNode",
|
||||
"start-validator-node": "bash ./scripts/start-validator-node",
|
||||
"prepare-validators-dapp": "node prepareValidatorsDapp",
|
||||
"prepare-validators-dapp-more": "cd ./submodules/poa-dapps-validators && npm i --production > /dev/null 2>&1 && npm run lint -- --fix",
|
||||
"start-validators-dapp": "cd ./submodules/poa-dapps-validators && PORT=3001 BROWSER=none npm start > /dev/null 2>&1 &",
|
||||
"prepare-validators-dapp-more": "cd ./node_modules/poa-dapps-validators && npm i && npm run lint -- --fix",
|
||||
"start-validators-dapp": "cd ./node_modules/poa-dapps-validators && PORT=3001 BROWSER=none npm start > /dev/null 2>&1 &",
|
||||
"prepare-governance-dapp": "node prepareGovernanceDapp",
|
||||
"prepare-governance-dapp-more": "cd ./submodules/poa-dapps-voting && npm i > /dev/null 2>&1 && npm run lint -- --fix",
|
||||
"start-governance-dapp": "cd ./submodules/poa-dapps-voting && PORT=3002 BROWSER=none npm start > /dev/null 2>&1 &",
|
||||
"prepare-governance-dapp-more": "cd ./node_modules/poa-dapps-voting && npm i && npm run lint -- --fix",
|
||||
"start-governance-dapp": "cd ./node_modules/poa-dapps-voting && PORT=3002 BROWSER=none npm start > /dev/null 2>&1 &",
|
||||
"kill-processes": "bash ./scripts/kill-processes",
|
||||
"stop-test-setup": "npm run kill-processes && rm -rf ./submodules/poa-dapps-keys-generation && rm -rf ./submodules/poa-dapps-validators && rm -rf ./submodules/poa-dapps-voting && rm -rf ./submodules/poa-scripts-moc/generateInitialKey/output/* && git submodule update --init && git clean -f -d && git checkout nodes/reserved_peers"
|
||||
"stop-test-setup": "npm run kill-processes && rm -rf ./node_modules/poa-dapps-keys-generation && rm -rf ./node_modules/poa-dapps-validators && rm -rf ./node_modules/poa-dapps-voting && rm -rf ./submodules/poa-scripts-moc/generateInitialKey/output/* && git submodule update --init --remote && rm -rf ./package-lock.json && npm i && git clean -f -d && git checkout nodes/reserved_peers"
|
||||
}
|
||||
}
|
||||
|
|
|
@ -3,30 +3,17 @@
|
|||
set -u
|
||||
set -e
|
||||
|
||||
flattener_directory=./submodules/solidity-flattener
|
||||
directory_contracts=../poa-network-consensus-contracts/contracts
|
||||
directory_flat=../poa-network-consensus-contracts/flat
|
||||
flattener=./node_modules/.bin/poa-solidity-flattener
|
||||
directory_contracts=contracts
|
||||
directory_flat=./flat
|
||||
directory=./submodules/poa-network-consensus-contracts
|
||||
# build_dir=${directory}/build
|
||||
|
||||
# if [ -d ${directory} ]; then
|
||||
# if [ ! -d ${build_dir} ]; then
|
||||
# if ! [ -x "$(command -v pip3)" ]; then
|
||||
# cmd1=$(sudo apt-get update)
|
||||
# cmd2$(sudo apt-get install python3)
|
||||
# fi
|
||||
# if ! [ -x "$(command -v solidity_flattener)" ]; then
|
||||
# cmd3=$(pip3 install solidity-flattener)
|
||||
# fi
|
||||
# cmd4=$(cd ${directory} && npm i && bash ./make_flat.sh && ./node_modules/.bin/truffle compile)
|
||||
# fi
|
||||
# fi
|
||||
|
||||
cmd1=$(cd ${flattener_directory} && npm i && npm start ${directory_contracts}/PoaNetworkConsensus.sol ${directory_flat})
|
||||
cmd2=$(cd ${flattener_directory} && npm start ${directory_contracts}/KeysManager.sol ${directory_flat})
|
||||
cmd3=$(cd ${flattener_directory} && npm start ${directory_contracts}/VotingToChangeKeys.sol ${directory_flat})
|
||||
cmd4=$(cd ${flattener_directory} && npm start ${directory_contracts}/VotingToChangeMinThreshold.sol ${directory_flat})
|
||||
cmd5=$(cd ${flattener_directory} && npm start ${directory_contracts}/ValidatorMetadata.sol ${directory_flat})
|
||||
cmd6=$(cd ${flattener_directory} && npm start ${directory_contracts}/ProxyStorage.sol ${directory_flat})
|
||||
cmd7=$(cd ${flattener_directory} && npm start ${directory_contracts}/VotingToChangeProxyAddress.sol ${directory_flat})
|
||||
cmd8=$(cd ${directory} && npm i && ./node_modules/.bin/truffle compile)
|
||||
cmd0=$(cd ${directory} && npm i)
|
||||
cmd1=$(cd ${directory} && ${flattener} ${directory_contracts}/PoaNetworkConsensus.sol ${directory_flat})
|
||||
cmd2=$(cd ${directory} && ${flattener} ${directory_contracts}/KeysManager.sol ${directory_flat})
|
||||
cmd3=$(cd ${directory} && ${flattener} ${directory_contracts}/VotingToChangeKeys.sol ${directory_flat})
|
||||
cmd4=$(cd ${directory} && ${flattener} ${directory_contracts}/VotingToChangeMinThreshold.sol ${directory_flat})
|
||||
cmd5=$(cd ${directory} && ${flattener} ${directory_contracts}/ValidatorMetadata.sol ${directory_flat})
|
||||
cmd6=$(cd ${directory} && ${flattener} ${directory_contracts}/ProxyStorage.sol ${directory_flat})
|
||||
cmd7=$(cd ${directory} && ${flattener} ${directory_contracts}/VotingToChangeProxyAddress.sol ${directory_flat})
|
||||
cmd8=$(cd ${directory} && ./node_modules/.bin/truffle compile)
|
|
@ -1 +0,0 @@
|
|||
Subproject commit 8a4ded0fb6ca151c9a782362e30111837ca7d3c3
|
|
@ -1 +0,0 @@
|
|||
Subproject commit 84aa1c5a523cafbd1cfb1801b8012bc9222bb410
|
|
@ -1 +0,0 @@
|
|||
Subproject commit 3d52c78bf3d241d8db5b5916b739f9f9bd2425db
|
|
@ -1 +0,0 @@
|
|||
Subproject commit b72d0166e0e743eed31c9acb5cb9dc32d8e332bd
|
|
@ -1 +1 @@
|
|||
Subproject commit 31fa251ab0d299ba7b70f2fd03ceb5fd04ad5950
|
||||
Subproject commit b0fc8789850ef44f0eb0c277748415d3d194e94a
|
|
@ -1 +0,0 @@
|
|||
Subproject commit a58a42fa2316046fb6cde54d1f1f7edf36963c2c
|
|
@ -8,9 +8,9 @@ constants.pathToScriptsMocRepo = `./submodules/${constants.scriptsMocRepoName}`;
|
|||
constants.CeremonyDAppRepoName = 'poa-dapps-keys-generation';
|
||||
constants.ValidatorsDAppRepoName = 'poa-dapps-validators';
|
||||
constants.GovernanceDAppRepoName = 'poa-dapps-voting';
|
||||
constants.pathToCeremonyDAppRepo = `./submodules/${constants.CeremonyDAppRepoName}`;
|
||||
constants.pathToValidatorsDAppRepo = `./submodules/${constants.ValidatorsDAppRepoName}`;
|
||||
constants.pathToGovernanceDAppRepo = `./submodules/${constants.GovernanceDAppRepoName}`;
|
||||
constants.pathToCeremonyDAppRepo = `./node_modules/${constants.CeremonyDAppRepoName}`;
|
||||
constants.pathToValidatorsDAppRepo = `./node_modules/${constants.ValidatorsDAppRepoName}`;
|
||||
constants.pathToGovernanceDAppRepo = `./node_modules/${constants.GovernanceDAppRepoName}`;
|
||||
constants.scriptsMocConfigPath = `${constants.pathToScriptsMocRepo}/config.json`;
|
||||
constants.scriptsMocOutputFolder = `${constants.pathToScriptsMocRepo}/generateInitialKey/output`;
|
||||
constants.addressesSourceFile = 'contracts.json';
|
||||
|
|
Loading…
Reference in New Issue