Skip to content

Commit

Permalink
Bring tapir bqeth deployment inline with lynx
Browse files Browse the repository at this point in the history
  • Loading branch information
theref committed Aug 19, 2024
1 parent 940471f commit f0aa506
Show file tree
Hide file tree
Showing 2 changed files with 20 additions and 35 deletions.
51 changes: 18 additions & 33 deletions deployment/constructor_params/tapir/bqeth.yml
Original file line number Diff line number Diff line change
@@ -1,42 +1,27 @@
deployment:
name: bqeth-tapir
chain_id: 137
chain_id: 80002

artifacts:
dir: ./deployment/artifacts/
filename: bqeth-mainnet.json
filename: bqeth-tapir.json

constants:
# See deployment/artifacts/tapir.json
COORDINATOR_PROXY: "0xE690b6bCC0616Dc5294fF84ff4e00335cA52C388"
TAPIR_RITUAL_TOKEN: "0xf91afFE7cf1d9c367Cb56eDd70C0941a4E8570d9"
TESTNET_DEPLOYER: "0x3B42d26E19FF860bC4dEbB920DD8caA53F93c600"

# See https://github.com/nucypher/tdec/issues/137#issuecomment-1881525878
# and https://app.safe.global/home?safe=matic:0x861aa915C785dEe04684444560fC7A2AB43a1543
NUCO_MULTISIG: "0x861aa915C785dEe04684444560fC7A2AB43a1543"

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

# Threshold Network - References:
# - https://docs.threshold.network/resources/contract-addresses/mainnet/threshold-dao
# - https://github.com/keep-network/tbtc-v2/issues/594
TREASURY_GUILD_ON_POLYGON: "0xc3Bf49eBA094AF346830dF4dbB42a07dE378EeB6"
THRESHOLD_COUNCIL_ON_POLYGON: "0x9F6e831c8F8939DC0C830C6e492e7cEf4f9C2F5f"

# Subscription Parameters
# See https://github.com/nucypher/tdec/issues/169

MAX_NODES: 3
MAX_NODES: 5

# - Fee parameters:
INITIAL_BASE_FEE_RATE: 4050925925925 # $0.35 per day, in DAI units per second (in Python: 35*10**16 // 86400)
ENCRYPTOR_FEE_RATE: 63419583967 # $2 per year, in DAI units per second (in Python: 2 * 10**18 // 86400 // 365)
BASE_FEE_RATE_INCREASE_PER_PERIOD: 247 # 5%/year ~ 2.47%/semester, expressed in basis points (0.01%)
# - Duration parameters --> 1 period = 6 months
SIX_MONTHS_IN_SECONDS: 15811200 # 183 days (~6 months)
THREE_MONTHS_IN_SECONDS: 7776000 # 90 day (~3 months)
BASE_FEE_RATE_INCREASE: 500 # 5%/year ~ 2.47%/semester, expressed in basis points (0.01%)

PERIOD: 172800 # 2 days
YELLOW_PERIOD: 86400 # 1 day
RED_PERIOD: 86400 # 1 day

contracts:
- GlobalAllowList:
Expand All @@ -45,17 +30,17 @@ contracts:
- BqETHSubscription:
proxy:
constructor:
initialOwner: $THRESHOLD_COUNCIL_ON_POLYGON # Upgrades owner
_data: $encode:initialize,$TREASURY_GUILD_ON_POLYGON
initialOwner: $TESTNET_DEPLOYER
_data: $encode:initialize,$TESTNET_DEPLOYER
constructor:
_coordinator: $COORDINATOR_PROXY
_accessController: $GlobalAllowList
_feeToken: $DAI_ON_POLYGON
_adopterSetter: $NUCO_MULTISIG
_feeToken: $TAPIR_RITUAL_TOKEN
_adopterSetter: $TESTNET_DEPLOYER
_initialBaseFeeRate: $INITIAL_BASE_FEE_RATE
_baseFeeRateIncrease: $BASE_FEE_RATE_INCREASE_PER_PERIOD
_baseFeeRateIncrease: $BASE_FEE_RATE_INCREASE
_encryptorFeeRate: $ENCRYPTOR_FEE_RATE
_maxNodes: $MAX_NODES
_subscriptionPeriodDuration: $SIX_MONTHS_IN_SECONDS
_yellowPeriodDuration: $THREE_MONTHS_IN_SECONDS
_redPeriodDuration: $THREE_MONTHS_IN_SECONDS
_subscriptionPeriodDuration: $PERIOD
_yellowPeriodDuration: $YELLOW_PERIOD
_redPeriodDuration: $RED_PERIOD
4 changes: 2 additions & 2 deletions deployment/constructor_params/tapir/free-fee-model.yml
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
deployment:
name: tapir-free-fee-model
chain_id: 800002
chain_id: 80002

artifacts:
dir: ./deployment/artifacts/
filename: free-fee-model.json
filename: tapir-free-fee-model.json

contracts:
- FreeFeeModel

0 comments on commit f0aa506

Please sign in to comment.