-
Notifications
You must be signed in to change notification settings - Fork 30
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
* Move tree update in a separate function * Add grace period * Refactor code, add tests * adds tests for dd * Fix message event, add comments * adds tests for priority queue * Add tests, minor fixes * Add AllowListOperatorManager tests * Minor refactoring * Minor fixes * Refactor PriorityQueue * Fix formatting * Fix formatting * Fix formatting * Rename transact, add calldata version * Add commitment to RootUpdated event * Return gracePeriodEnd from pendingCommitment * Add memo message size * Add extra data to tests * Support new message prefix * Remove forced exit related code * Update src/zkbob/utils/PriorityQueue.sol Co-authored-by: Kirill Fedoseev <[email protected]> * Refactor AllowListOperatorManager * Rename PriorityQueue, add copyright, uint32 timestamp * Remove minTreeUpdateFeeIsSet modifier * Pack fee reciever and allowed in a single struct * Remove lastTreeUpdateTimestamp * Add gaps, fix testNativeWithdrawal * Fix formatting * Update ZkBobPool.s.sol and Local.s.sol scripts * Add script to deploy new operator, modify upgrade script * Minor fixes * Add privileged prover in calldata * Update scripts * Add decentralization upgrade script * Modify migration script * Update scripts * Minor fixes * Fix format * Fix format --------- Co-authored-by: vladimir <[email protected]> Co-authored-by: Kirill Fedoseev <[email protected]>
- Loading branch information
1 parent
17f2adf
commit 1677f1e
Showing
22 changed files
with
1,973 additions
and
706 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,48 @@ | ||
// SPDX-License-Identifier: CC0-1.0 | ||
|
||
pragma solidity 0.8.15; | ||
|
||
import "forge-std/Script.sol"; | ||
import {AllowListOperatorManager} from "../../src/zkbob/manager/AllowListOperatorManager.sol"; | ||
|
||
// TODO: Update this values before the deployment | ||
address constant operatorManagerOwner = 0x14fc6a1a996A2EB889cF86e5c8cD17323bC85290; | ||
address constant zkBobProxy1 = 0x7D2D146a7AD3F0Dc398AA718a9bFCa2Bc873a5FD; | ||
address constant zkBobProxyFeeReceiver1 = 0x7D2D146a7AD3F0Dc398AA718a9bFCa2Bc873a5FD; | ||
address constant zkBobProxy2 = 0xFec49782FE8e11De9Fb3Ba645a76FE914FFfe3cb; | ||
address constant zkBobProxyFeeReceiver2 = 0xFec49782FE8e11De9Fb3Ba645a76FE914FFfe3cb; | ||
address constant zkBobProver1 = 0x33a0b018340d6424870cfC686a4d02e1df792254; | ||
address constant zkBobProverFeeReceiver1 = 0x33a0b018340d6424870cfC686a4d02e1df792254; | ||
address constant zkBobProver2 = 0x63A88E69fa7adEf036fc6ED94394CC9295de2f99; | ||
address constant zkBobProverFeeReceiver2 = 0x63A88E69fa7adEf036fc6ED94394CC9295de2f99; | ||
|
||
bool constant allowListEnabled = true; | ||
|
||
contract DeployAllowListOperatorManager is Script { | ||
function run() external { | ||
vm.startBroadcast(); | ||
|
||
address[] memory operators = new address[](4); | ||
operators[0] = zkBobProxy1; | ||
operators[1] = zkBobProver1; | ||
operators[2] = zkBobProxy2; | ||
operators[3] = zkBobProver2; | ||
|
||
address[] memory feeReceivers = new address[](4); | ||
feeReceivers[0] = zkBobProxyFeeReceiver1; | ||
feeReceivers[1] = zkBobProverFeeReceiver1; | ||
feeReceivers[2] = zkBobProxyFeeReceiver2; | ||
feeReceivers[3] = zkBobProverFeeReceiver2; | ||
|
||
AllowListOperatorManager operatorManager = | ||
new AllowListOperatorManager(operators, feeReceivers, allowListEnabled); | ||
|
||
operatorManager.transferOwnership(operatorManagerOwner); | ||
|
||
vm.stopBroadcast(); | ||
|
||
assert(address(operatorManager.owner()) == operatorManagerOwner); | ||
|
||
console2.log("AllowListOperatorManager address:", address(operatorManager)); | ||
} | ||
} |
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.