Skip to content
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.

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

Fix refund calculation bug in BetaProgramInitiator (part 2) #230

Merged
merged 4 commits into from
Jan 31, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions contracts/contracts/coordination/FlatRateFeeModel.sol
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ contract FlatRateFeeModel is IFeeModel {
}

// TODO: Validate if this is enough to remove griefing attacks
function feeDeduction(uint256 pending, uint256) public pure returns (uint256) {
return pending;
function feeDeduction(uint256, uint256) public pure returns (uint256) {
return 0;
}
}
6 changes: 3 additions & 3 deletions deployment/artifacts/mainnet.json
Original file line number Diff line number Diff line change
Expand Up @@ -1541,7 +1541,7 @@
},
"137": {
"BetaProgramInitiator": {
"address": "0x2A8eA9760CB41a36f8320B8020173D3CA0495FC8",
"address": "0x7CEbC88351061b2721865f01d2aCEc4c3eC92E8d",
"abi": [
{
"type": "constructor",
Expand Down Expand Up @@ -1905,8 +1905,8 @@
]
}
],
"tx_hash": "0xd20ad04b6b39c7913e313c75c566170bd9891649cf2bae0706bb11ac23404626",
"block_number": 51972892,
"tx_hash": "0xca501b1153acf6d47a2def2413fc5c72302f6d87c050f4e859eacc888e3fc492",
"block_number": 52701776,
"deployer": "0x1591165F1BF8B73de7053A6BE6f239BC15076879"
},
"Coordinator": {
Expand Down
26 changes: 26 additions & 0 deletions deployment/constructor_params/mainnet/redeploy-coordinator.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
deployment:
name: redeploy-coordinator
chain_id: 137 # Polygon Mainnet

artifacts:
dir: ./deployment/artifacts/
filename: redeploy-coordinator.json

constants:
# See deployment/artifacts/mainnet.json
TACO_CHILD_APPLICATION: "0xFa07aaB78062Fac4C36995bF28F6D677667973F5"

# DAI Token on Polygon PoS - References:
# - https://polygonscan.com/token/0x8f3cf7ad23cd3cadbd9735aff958023239c6a063
# - https://github.com/search?q=0x8f3Cf7ad23Cd3CaDbD9735AFf958023239c6A063&type=code
DAI_ON_POLYGON: "0x8f3Cf7ad23Cd3CaDbD9735AFf958023239c6A063"

# TACO specific constants:
PRIVATE_BETA_FEE_RATE: 4050925925925 # $0.35 per day, expressed in DAI units per seconds (in Python: 35*10**16 // 86400)

contracts:
- Coordinator:
constructor:
_application: $TACO_CHILD_APPLICATION
_currency: $DAI_ON_POLYGON
_feeRatePerSecond: $PRIVATE_BETA_FEE_RATE
23 changes: 23 additions & 0 deletions scripts/mainnet/redeploy_coordinator.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
#!/usr/bin/python3

from ape import project

from deployment.constants import CONSTRUCTOR_PARAMS_DIR
from deployment.params import Deployer

VERIFY = False
CONSTRUCTOR_PARAMS_FILEPATH = CONSTRUCTOR_PARAMS_DIR / "mainnet" / "redeploy-coordinator.yml"


def main():

deployer = Deployer.from_yaml(filepath=CONSTRUCTOR_PARAMS_FILEPATH, verify=VERIFY)

coordinator_implementation = deployer.deploy(project.Coordinator)

deployments = [
coordinator_implementation,
]

deployer.finalize(deployments=deployments)

Loading