Skip to content

Rename PaymentClient and proposal #310

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
FHieser merged 8 commits into from
Aug 2, 2023
Merged

Rename PaymentClient and proposal #310

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
ac66c53
Rename to ERC20PaymentClient
FHieser Aug 1, 2023
7b43322
Revert "Rename to ERC20PaymentClient"
FHieser Aug 1, 2023
c451238
Merge branch 'main' into 261-move-and-refactor-payment-client
FHieser Aug 1, 2023
197dd79
Rename to ERC20PaymentClient
FHieser Aug 1, 2023
e1a19d6
Rename Proposal to Orchestrator
FHieser Aug 1, 2023
97134ee
rename configdata to configData
FHieser Aug 1, 2023
6354afd
rename dependencydata to dependencyData
FHieser Aug 1, 2023
97d582d
Fix / Pre-commit
FHieser Aug 1, 2023
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
584 changes: 292 additions & 292 deletions .gas-snapshot
View file
Open in desktop

Large diffs are not rendered by default.

24 changes: 12 additions & 12 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,9 +52,9 @@ testFuzz: ## Run whole testsuite with a custom amount of fuzz runs
# -----------------------------------------------------------------------------
# Individual Component Tests

.PHONY: testProposal
testProposal: ## Run proposal/ package tests
@forge test -vvv --match-path "*/proposal/*"
.PHONY: testOrchestrator
testOrchestrator: ## Run orchestrator/ package tests
@forge test -vvv --match-path "*/orchestrator/*"

.PHONY: testModules
testModules: ## Run modules/ package tests
Expand All @@ -73,7 +73,7 @@ testScripts: ## Run e2e test suite
@forge script script/deployment/DeploymentScript.s.sol

@forge script script/factories/DeployModuleFactory.s.sol
@forge script script/factories/DeployProposalFactory.s.sol
@forge script script/factories/DeployOrchestratorFactory.s.sol

@forge script script/modules/governance/DeployRoleAuthorizer.s.sol
@forge script script/modules/governance/DeploySingleVoteGovernor.s.sol
Expand All @@ -84,11 +84,11 @@ testScripts: ## Run e2e test suite
@forge script script/modules/DeployMilestoneManager.s.sol
@forge script script/modules/DeployRebasingFundingManager.s.sol

@forge script script/proposal/DeployProposal.s.sol
@forge script script/orchestrator/DeployOrchestrator.s.sol

@forge script script/proxies/DeployBeacon.s.sol

@forge script script/setup/SetupToyProposalScript.s.sol
@forge script script/setup/SetupToyOrchestratorScript.s.sol

# -----------------------------------------------------------------------------
# Static Analyzers
Expand All @@ -101,7 +101,7 @@ analyze-slither: ## Run slither analyzer against project (requires solc-select)
slither --ignore-compile src/factories || \
slither --ignore-compile src/generated || \
slither --ignore-compile src/modules || \
slither --ignore-compile src/proposal
slither --ignore-compile src/orchestrator

.PHONY: analyze-c4udit
analyze-c4udit: ## Run c4udit analyzer against project
Expand Down Expand Up @@ -148,17 +148,17 @@ pre-commit: ## Git pre-commit hook
# Env variables required for the tests
@export WALLET_DEPLOYER=0xf39fd6e51aad88f6f4ce6ab8827279cfffb92266
@export WALLET_DEPLOYER_PK=0xac0974bec39a17e36ba4a6b4d238ff944bacb478cbed5efcae784d7bf4f2ff80
@export DEPLOYMENT_PROPOSAL_FACTORY_TARGET=0x0000000000000000000000000000000000000001
@export DEPLOYMENT_PROPOSAL_FACTORY_MODULE_FACTORY=0x0000000000000000000000000000000000000001
@export DEPLOYMENT_ORCHESTRATOR_FACTORY_TARGET=0x0000000000000000000000000000000000000001
@export DEPLOYMENT_ORCHESTRATOR_FACTORY_MODULE_FACTORY=0x0000000000000000000000000000000000000001
@export ANVIL_PRIVATE_KEY=0xac0974bec39a17e36ba4a6b4d238ff944bacb478cbed5efcae784d7bf4f2ff80
@export PPBO_PRIVATE_KEY=0x59c6995e998f97a5a0044966f0945389dc9e86dae88c7a8412f4603b6b78690d
@export MMBO_PRIVATE_KEY=0x5de4111afa1a4b94908f83103eb1f1706367c2e68ca870fc3fb9a804cdab365a
@export FMBO_PRIVATE_KEY=0x7c852118294e51e653712a81e05800f419141751be58f605c371e15141b007a6
@export ABO_PRIVATE_KEY=0x47e179ec197488593b187f80a00eb0da91f1b9d0b13f8733639f19c30a34926a
@export PROPOSAL_OWNER_PRIVATE_KEY=0x8b3a350cf5c34c9194ca85829a2df0ec3153be0318b5e2d3348e872092edffba
@export ORCHESTRATOR_OWNER_PRIVATE_KEY=0x8b3a350cf5c34c9194ca85829a2df0ec3153be0318b5e2d3348e872092edffba
@export FUNDER_1_PRIVATE_KEY=0x92db14e403b83dfe3df233f83dfa3a0d7096f21ca9b0d6d6b8d88b2b4ec1564e
@export DEPLOYMENT_PROPOSAL_FACTORY_TARGET=0x0000000000000000000000000000000000000001
@export DEPLOYMENT_PROPOSAL_FACTORY_MODULE_FACTORY=0x0000000000000000000000000000000000000002
@export DEPLOYMENT_ORCHESTRATOR_FACTORY_TARGET=0x0000000000000000000000000000000000000001
@export DEPLOYMENT_ORCHESTRATOR_FACTORY_MODULE_FACTORY=0x0000000000000000000000000000000000000002

@echo "### Running tests & generating the coverage report..."
@forge coverage --report lcov
Expand Down
12 changes: 6 additions & 6 deletions dev.env
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,19 +28,19 @@ export WALLET_DEPLOYER_PK=0xac0974bec39a17e36ba4a6b4d238ff944bacb478cbed5efcae78
# ------------------------------------------------------------------------------
# Deployment Arguments

# ProposalFactory
export DEPLOYMENT_PROPOSAL_FACTORY_TARGET=0x0000000000000000000000000000000000000001
export DEPLOYMENT_PROPOSAL_FACTORY_MODULE_FACTORY=0x0000000000000000000000000000000000000001
# OrchestratorFactory
export DEPLOYMENT_ORCHESTRATOR_FACTORY_TARGET=0x0000000000000000000000000000000000000001
export DEPLOYMENT_ORCHESTRATOR_FACTORY_MODULE_FACTORY=0x0000000000000000000000000000000000000001

# Keys used from anvil available accounts standard
export ANVIL_PRIVATE_KEY=0xac0974bec39a17e36ba4a6b4d238ff944bacb478cbed5efcae784d7bf4f2ff80
export PPBO_PRIVATE_KEY=0x59c6995e998f97a5a0044966f0945389dc9e86dae88c7a8412f4603b6b78690d
export MMBO_PRIVATE_KEY=0x5de4111afa1a4b94908f83103eb1f1706367c2e68ca870fc3fb9a804cdab365a
export FMBO_PRIVATE_KEY=0x7c852118294e51e653712a81e05800f419141751be58f605c371e15141b007a6
export ABO_PRIVATE_KEY=0x47e179ec197488593b187f80a00eb0da91f1b9d0b13f8733639f19c30a34926a
export PROPOSAL_OWNER_PRIVATE_KEY=0x8b3a350cf5c34c9194ca85829a2df0ec3153be0318b5e2d3348e872092edffba
export ORCHESTRATOR_OWNER_PRIVATE_KEY=0x8b3a350cf5c34c9194ca85829a2df0ec3153be0318b5e2d3348e872092edffba
export FUNDER_1_PRIVATE_KEY=0x92db14e403b83dfe3df233f83dfa3a0d7096f21ca9b0d6d6b8d88b2b4ec1564e

# These are just basic Addresses fro testing
export DEPLOYMENT_PROPOSAL_FACTORY_TARGET=0x0000000000000000000000000000000000000001
export DEPLOYMENT_PROPOSAL_FACTORY_MODULE_FACTORY=0x0000000000000000000000000000000000000002
export DEPLOYMENT_ORCHESTRATOR_FACTORY_TARGET=0x0000000000000000000000000000000000000001
export DEPLOYMENT_ORCHESTRATOR_FACTORY_MODULE_FACTORY=0x0000000000000000000000000000000000000002
Loading