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

Std #1

Open
wants to merge 100 commits into
base: main
Choose a base branch
from
Open
Changes from 1 commit
Commits
Show all changes
100 commits
Select commit Hold shift + click to select a range
0eaea35
Add RewardsWithdrawn event
manumonti Jun 14, 2024
6b12617
Prevent variables being overwritten
theref Aug 15, 2024
49bf166
Script that lists all the active rituals that a specified staking pro…
derekpierre Aug 15, 2024
d4dac28
Add duration calculation when using a subscription
theref Aug 15, 2024
5d78a8f
Coordinator: moves rituals from array to mapping
vzotova Aug 15, 2024
2ee2d92
Coordinator: tests for upgrade
vzotova Aug 15, 2024
2619079
Check that subscription hasn't already ended
theref Aug 16, 2024
8983231
Merge pull request #305 from derekpierre/ritual-membership
derekpierre Aug 19, 2024
e173166
Apply suggestions from code review
vzotova Aug 19, 2024
852f66d
Merge pull request #307 from vzotova/coordinator-layout
derekpierre Aug 19, 2024
67f8896
Undo previous change to how receipts were obtained. That change appli…
derekpierre Aug 20, 2024
9e115b6
Merge pull request #310 from derekpierre/rollback-receipt
theref Aug 20, 2024
0067b74
Merge pull request #306 from theref/duration
cygnusv Aug 21, 2024
3772347
Don't check for ape-infura when not using infura
cygnusv Aug 21, 2024
d78c076
Raise an exception for unsuccessful HTTP codes from Porter sample req…
derekpierre Aug 21, 2024
b78f263
On testnet /get_ursulas is used and its response format is slightly d…
derekpierre Aug 21, 2024
bd18f40
Merge pull request #313 from derekpierre/fix-sampling
theref Aug 22, 2024
6759c77
Merge pull request #311 from cygnusv/infulas
theref Aug 22, 2024
1735317
Begin copying mainnet deployment & config files to tapir
theref Aug 16, 2024
60daf93
Bring tapir bqeth deployment inline with lynx
theref Aug 19, 2024
227fbec
Read contracts from registry where possible for tapir deployments
theref Aug 19, 2024
afe6d94
Add script and params for upgrading Coordinator on tapir
theref Aug 19, 2024
af2e91c
Add tapir scripts for approving Fee Models
theref Aug 19, 2024
5d2759b
Deploy updated Coordinator to tapir
theref Aug 19, 2024
ef949b9
Merge coordinator registry with main Tapir registry
theref Aug 20, 2024
f14cee1
Deploy FreeFeeModel to Tapir and add it to registry
theref Aug 20, 2024
3235592
Add BqETH subscription to registry
theref Aug 21, 2024
cad6aa3
Update `tapir` contract registry with latest BqETHSubscription contra…
derekpierre Aug 22, 2024
594848f
Relock dependencies to latest versions.
derekpierre Aug 22, 2024
7c2941d
Prettier should ignore Pipfile.lock
derekpierre Aug 22, 2024
2eceb03
Remove import re-mappings since no longer needed with newer version o…
derekpierre Aug 22, 2024
e45d458
Obtain contract instance receipt from the creation metadata available…
derekpierre Aug 22, 2024
a992b50
Remove managed allow list deployment script since no longer needed.
derekpierre Aug 22, 2024
9e44ae8
Remove unused Destroyable contract and corresponding test - fails wit…
derekpierre Aug 22, 2024
96f24de
Merge pull request #316 from derekpierre/ape-0.8
derekpierre Aug 23, 2024
16610f6
Add ability for the deployer to not prompt user for deployments.
derekpierre Aug 22, 2024
9099e33
Add deployment script to use for CI tests in order to test deployments.
derekpierre Aug 22, 2024
067d7d4
Add step to CI to test deployment of contracts, and to list contracts…
derekpierre Aug 22, 2024
d981059
Update pip install so that script files can properly reference deploy…
derekpierre Aug 22, 2024
a7ce192
Rename 'force' to 'non_interactive' for clarity.
derekpierre Aug 23, 2024
c24f375
Delete generated registry at the end of the script - allows for local…
derekpierre Aug 23, 2024
346f364
Merge pull request #317 from derekpierre/ci-job-scripts
derekpierre Aug 23, 2024
e72d2ba
Upgrade lynx Coordinator
vzotova Aug 21, 2024
2593c52
Coordinator: Removes participants array from "rituals" ABI
vzotova Aug 21, 2024
b785a75
Upgrade Coordinator: changed ABI of `rituals`
vzotova Aug 21, 2024
6b8420a
Apply suggestions from code review
vzotova Aug 22, 2024
d2a09c6
Merge branch 'main' into rewards-withdrawn
manumonti Aug 26, 2024
9f58db9
Merge pull request #312 from vzotova/upgrade-lynx-coordinator
derekpierre Aug 26, 2024
e93302d
Fix formatting of Tapir registry
theref Aug 27, 2024
5d38e7f
Add tests to check RewardsWithdrawn is emitted
manumonti Aug 27, 2024
38a2420
Merge pull request #308 from theref/upgrade-tapir-45
derekpierre Aug 27, 2024
3c7ff4f
Set up prettier to ignore contract registry files.
derekpierre Aug 27, 2024
823d28c
Merge pull request #276 from manumonti/rewards-withdrawn
manumonti Aug 28, 2024
2c6d572
Bump version: 0.22.0 → 0.23.0
manumonti Aug 28, 2024
d8c84be
Merge pull request #320 from derekpierre/pretty-inconsistent
derekpierre Aug 28, 2024
1215054
Merge pull request #321 from manumonti/new-release
manumonti Aug 28, 2024
a4deef8
Update the docs for the NPM publishing process
manumonti Aug 28, 2024
66cbe9a
Merge pull request #322 from manumonti/update-readme
theref Aug 28, 2024
1b525b5
Add ReimbursementPool contract
cygnusv Aug 29, 2024
9475b59
Adapt ReimbursementPool contract to our codebase
cygnusv Aug 29, 2024
9670d34
Adapt Reimbursement pool to OpenZeppelin v5
cygnusv Aug 29, 2024
5e75990
ReimbursementPool deployment script and params for Lynx
cygnusv Aug 29, 2024
3462100
Add ReimbursementPool deployment to Lynx registry
cygnusv Aug 29, 2024
53e9bfb
Make linter happy
cygnusv Aug 29, 2024
969dff2
Credit original source of ReimbursementPool
cygnusv Aug 29, 2024
f76a026
Script to set ReimbursementPool contract on Lynx
cygnusv Aug 30, 2024
63b32b4
Strip new lines from provider addresses obtained from handpicked addr…
derekpierre Sep 4, 2024
89c2729
Add num missing text to ritual_state_check for missing transcripts/ag…
derekpierre Sep 4, 2024
23e83b4
Merge pull request #323 from cygnusv/reimbursement
KPrasch Sep 4, 2024
b294524
Merge pull request #325 from derekpierre/minor-fix
derekpierre Sep 4, 2024
2b9f812
Upgrade tapir Coordinator
vzotova Sep 4, 2024
a912327
Relock dependencies to use ape-etherscan >= 0.8.3 since it has some f…
derekpierre Sep 5, 2024
b619df8
Update scripts/tapir/upgrade_coordinator.py
vzotova Sep 5, 2024
3f53910
Merge pull request #326 from vzotova/upgrade-tapir-coordinator
derekpierre Sep 5, 2024
48e71c8
Merge pull request #327 from derekpierre/update-ape-etherscan
derekpierre Sep 5, 2024
0b1d4af
GPL code can be used in a AGPL repo
cygnusv Sep 5, 2024
45d000d
Reference original authors (thanks @dimpar, @pdyraga !)
cygnusv Sep 5, 2024
71299c7
Polygon Mainnet params for ReimbursementPool
cygnusv Sep 10, 2024
81e0591
Deployment script for ReimbursementPool on Polygon Mainnet
cygnusv Sep 10, 2024
b232c3c
Deployment artifact for ReimbursementPool on Polygon Mainnet
cygnusv Sep 11, 2024
7694b12
Update contract verification script to verify individual contracts po…
derekpierre Sep 11, 2024
8336c65
Update dependencies to use modified ape-etherscan library, and relock…
derekpierre Sep 11, 2024
adab7e2
Merge pull request #330 from derekpierre/update-verification-script
theref Sep 12, 2024
2f1f8b5
Add function to withdraw all tokens from Coordinator for a token address
cygnusv Sep 12, 2024
d931844
Merge pull request #333 from cygnusv/withdraw
cygnusv Sep 12, 2024
f706291
Merge deployment info into mainnet registry
cygnusv Sep 16, 2024
588b9a5
Add calldata cost when calculating gas reimbursements
cygnusv Sep 11, 2024
c11dfc0
Validate transcript size when posting
cygnusv Sep 11, 2024
94ec0df
Adapt tests to transcript size validation
cygnusv Sep 16, 2024
bd41a0f
Test bad transcript size
cygnusv Sep 16, 2024
6231be4
Upgrade Lynx coordinator
cygnusv Sep 16, 2024
a21ac6f
Merge pull request #334 from cygnusv/tsize
cygnusv Sep 18, 2024
75c2b97
Merge pull request #329 from cygnusv/reimbursement
cygnusv Sep 18, 2024
b0404d9
Update Coordinator ABI on mainnet registry
cygnusv Sep 18, 2024
691d7e4
Merge pull request #335 from cygnusv/main
cygnusv Sep 23, 2024
37d2f24
New StandardSubscription deployment parameter file
cygnusv Jan 15, 2025
3e9201f
Generalize StandardSubscription from BqETHSubscription
cygnusv Jan 15, 2025
bb08f59
Make GlobalAllowList upgradeable
cygnusv Jan 16, 2025
4d76f5c
Intermediary registry with new GlobalAllowList and StandardSubscription
cygnusv Jan 16, 2025
2085cab
Updated mainnet registry with new GlobalAllowList and without BqETHSu…
cygnusv Jan 16, 2025
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
Prev Previous commit
Next Next commit
Merge coordinator registry with main Tapir registry
theref authored and derekpierre committed Aug 22, 2024
commit ef949b919ba3d288898ab96a1e1103c2af98c613
1,733 changes: 0 additions & 1,733 deletions deployment/artifacts/tapir-upgrade-coordinator.json

This file was deleted.

349 changes: 149 additions & 200 deletions deployment/artifacts/tapir.json
Original file line number Diff line number Diff line change
@@ -2346,16 +2346,6 @@
"name": "_application",
"type": "address",
"internalType": "contract ITACoChildApplication"
},
{
"name": "_currency",
"type": "address",
"internalType": "contract IERC20"
},
{
"name": "_feeRatePerSecond",
"type": "uint256",
"internalType": "uint256"
}
]
},
@@ -2407,33 +2397,6 @@
}
]
},
{
"type": "error",
"name": "AddressEmptyCode",
"inputs": [
{
"name": "target",
"type": "address",
"internalType": "address"
}
]
},
{
"type": "error",
"name": "AddressInsufficientBalance",
"inputs": [
{
"name": "account",
"type": "address",
"internalType": "address"
}
]
},
{
"type": "error",
"name": "FailedInnerCall",
"inputs": []
},
{
"type": "error",
"name": "InvalidInitialization",
@@ -2460,17 +2423,6 @@
}
]
},
{
"type": "error",
"name": "SafeERC20FailedOperation",
"inputs": [
{
"name": "token",
"type": "address",
"internalType": "address"
}
]
},
{
"type": "event",
"name": "AggregationPosted",
@@ -2565,6 +2517,19 @@
],
"anonymous": false
},
{
"type": "event",
"name": "FeeModelApproved",
"inputs": [
{
"name": "feeModel",
"type": "address",
"internalType": "contract IFeeModel",
"indexed": false
}
],
"anonymous": false
},
{
"type": "event",
"name": "Initialized",
@@ -2677,6 +2642,25 @@
],
"anonymous": false
},
{
"type": "event",
"name": "RitualExtended",
"inputs": [
{
"name": "ritualId",
"type": "uint32",
"internalType": "uint32",
"indexed": true
},
{
"name": "endTimestamp",
"type": "uint32",
"internalType": "uint32",
"indexed": false
}
],
"anonymous": false
},
{
"type": "event",
"name": "RoleAdminChanged",
@@ -2847,19 +2831,6 @@
}
]
},
{
"type": "function",
"name": "INITIATOR_ROLE",
"stateMutability": "view",
"inputs": [],
"outputs": [
{
"name": "",
"type": "bytes32",
"internalType": "bytes32"
}
]
},
{
"type": "function",
"name": "TREASURY_ROLE",
@@ -2893,6 +2864,19 @@
}
]
},
{
"type": "function",
"name": "approveFeeModel",
"stateMutability": "nonpayable",
"inputs": [
{
"name": "feeModel",
"type": "address",
"internalType": "contract IFeeModel"
}
],
"outputs": []
},
{
"type": "function",
"name": "beginDefaultAdminTransfer",
@@ -2947,33 +2931,33 @@
},
{
"type": "function",
"name": "currency",
"name": "defaultAdmin",
"stateMutability": "view",
"inputs": [],
"outputs": [
{
"name": "",
"type": "address",
"internalType": "contract IERC20"
"internalType": "address"
}
]
},
{
"type": "function",
"name": "defaultAdmin",
"name": "defaultAdminDelay",
"stateMutability": "view",
"inputs": [],
"outputs": [
{
"name": "",
"type": "address",
"internalType": "address"
"type": "uint48",
"internalType": "uint48"
}
]
},
{
"type": "function",
"name": "defaultAdminDelay",
"name": "defaultAdminDelayIncreaseWait",
"stateMutability": "view",
"inputs": [],
"outputs": [
@@ -2986,57 +2970,101 @@
},
{
"type": "function",
"name": "defaultAdminDelayIncreaseWait",
"name": "extendRitual",
"stateMutability": "nonpayable",
"inputs": [
{
"name": "ritualId",
"type": "uint32",
"internalType": "uint32"
},
{
"name": "duration",
"type": "uint32",
"internalType": "uint32"
}
],
"outputs": []
},
{
"type": "function",
"name": "feeModelsRegistry",
"stateMutability": "view",
"inputs": [],
"inputs": [
{
"name": "",
"type": "address",
"internalType": "contract IFeeModel"
}
],
"outputs": [
{
"name": "",
"type": "uint48",
"internalType": "uint48"
"type": "bool",
"internalType": "bool"
}
]
},
{
"type": "function",
"name": "feeDeduction",
"stateMutability": "pure",
"name": "getAccessController",
"stateMutability": "view",
"inputs": [
{
"name": "",
"type": "uint256",
"internalType": "uint256"
},
"name": "ritualId",
"type": "uint32",
"internalType": "uint32"
}
],
"outputs": [
{
"name": "",
"type": "uint256",
"internalType": "uint256"
"type": "address",
"internalType": "contract IEncryptionAuthorizer"
}
]
},
{
"type": "function",
"name": "getAuthority",
"stateMutability": "view",
"inputs": [
{
"name": "ritualId",
"type": "uint32",
"internalType": "uint32"
}
],
"outputs": [
{
"name": "",
"type": "uint256",
"internalType": "uint256"
"type": "address",
"internalType": "address"
}
]
},
{
"type": "function",
"name": "feeRatePerSecond",
"name": "getFeeModel",
"stateMutability": "view",
"inputs": [],
"inputs": [
{
"name": "ritualId",
"type": "uint32",
"internalType": "uint32"
}
],
"outputs": [
{
"name": "",
"type": "uint256",
"internalType": "uint256"
"type": "address",
"internalType": "contract IFeeModel"
}
]
},
{
"type": "function",
"name": "getAuthority",
"name": "getInitiator",
"stateMutability": "view",
"inputs": [
{
@@ -3369,30 +3397,6 @@
}
]
},
{
"type": "function",
"name": "getRitualInitiationCost",
"stateMutability": "view",
"inputs": [
{
"name": "providers",
"type": "address[]",
"internalType": "address[]"
},
{
"name": "duration",
"type": "uint32",
"internalType": "uint32"
}
],
"outputs": [
{
"name": "",
"type": "uint256",
"internalType": "uint256"
}
]
},
{
"type": "function",
"name": "getRitualState",
@@ -3450,6 +3454,30 @@
}
]
},
{
"type": "function",
"name": "getTimestamps",
"stateMutability": "view",
"inputs": [
{
"name": "ritualId",
"type": "uint32",
"internalType": "uint32"
}
],
"outputs": [
{
"name": "initTimestamp",
"type": "uint32",
"internalType": "uint32"
},
{
"name": "endTimestamp",
"type": "uint32",
"internalType": "uint32"
}
]
},
{
"type": "function",
"name": "grantRole",
@@ -3520,6 +3548,11 @@
"name": "initiateRitual",
"stateMutability": "nonpayable",
"inputs": [
{
"name": "feeModel",
"type": "address",
"internalType": "contract IFeeModel"
},
{
"name": "providers",
"type": "address[]",
@@ -3578,19 +3611,6 @@
}
]
},
{
"type": "function",
"name": "isInitiationPublic",
"stateMutability": "view",
"inputs": [],
"outputs": [
{
"name": "",
"type": "bool",
"internalType": "bool"
}
]
},
{
"type": "function",
"name": "isParticipant",
@@ -3653,13 +3673,6 @@
}
]
},
{
"type": "function",
"name": "makeInitiationPublic",
"stateMutability": "nonpayable",
"inputs": [],
"outputs": []
},
{
"type": "function",
"name": "maxDkgSize",
@@ -3735,25 +3748,6 @@
}
]
},
{
"type": "function",
"name": "pendingFees",
"stateMutability": "view",
"inputs": [
{
"name": "",
"type": "uint256",
"internalType": "uint256"
}
],
"outputs": [
{
"name": "",
"type": "uint256",
"internalType": "uint256"
}
]
},
{
"type": "function",
"name": "postAggregation",
@@ -3812,25 +3806,6 @@
],
"outputs": []
},
{
"type": "function",
"name": "processPendingFee",
"stateMutability": "nonpayable",
"inputs": [
{
"name": "ritualId",
"type": "uint32",
"internalType": "uint32"
}
],
"outputs": [
{
"name": "refundableFee",
"type": "uint256",
"internalType": "uint256"
}
]
},
{
"type": "function",
"name": "renounceRole",
@@ -3950,6 +3925,11 @@
"name": "aggregatedTranscript",
"type": "bytes",
"internalType": "bytes"
},
{
"name": "feeModel",
"type": "address",
"internalType": "contract IFeeModel"
}
]
},
@@ -4061,19 +4041,6 @@
}
]
},
{
"type": "function",
"name": "totalPendingFees",
"stateMutability": "view",
"inputs": [],
"outputs": [
{
"name": "",
"type": "uint256",
"internalType": "uint256"
}
]
},
{
"type": "function",
"name": "transferRitualAuthority",
@@ -4091,24 +4058,6 @@
}
],
"outputs": []
},
{
"type": "function",
"name": "withdrawTokens",
"stateMutability": "nonpayable",
"inputs": [
{
"name": "token",
"type": "address",
"internalType": "contract IERC20"
},
{
"name": "amount",
"type": "uint256",
"internalType": "uint256"
}
],
"outputs": []
}
],
"tx_hash": "0xc1b97df91385ff99feb29f80b9a6c8d861544b8fa1693bc980a6c7324fdc8899",
@@ -5866,4 +5815,4 @@
"deployer": "0x3B42d26E19FF860bC4dEbB920DD8caA53F93c600"
}
}
}
}
8 changes: 7 additions & 1 deletion scripts/tapir/upgrade_coordinator.py
Original file line number Diff line number Diff line change
@@ -4,10 +4,11 @@

from deployment.constants import ARTIFACTS_DIR, CONSTRUCTOR_PARAMS_DIR
from deployment.params import Deployer
from deployment.registry import contracts_from_registry
from deployment.registry import contracts_from_registry, merge_registries

VERIFY = False
CONSTRUCTOR_PARAMS_FILEPATH = CONSTRUCTOR_PARAMS_DIR / "tapir" / "upgrade-coordinator.yml"
TAPIR_REGISTRY_FILEPATH = ARTIFACTS_DIR / "tapir.json"


def main():
@@ -27,3 +28,8 @@ def main():
]

deployer.finalize(deployments=deployments)
merge_registries(
registry_1_filepath=TAPIR_REGISTRY_FILEPATH,
registry_2_filepath=deployer.registry_filepath,
output_filepath=TAPIR_REGISTRY_FILEPATH,
)