Skip to content

chore: arbitrator redeployment, general court initialized, policy on Estuary. #559

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

Merged
merged 1 commit into from
Feb 1, 2023
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
12 changes: 6 additions & 6 deletions contracts/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -19,14 +19,14 @@ Refresh the list of deployed contracts by running `./scripts/generateDeployments

- [PNK](https://goerli.arbiscan.io/token/0x4DEeeFD054434bf6721eF39Aa18EfB3fd0D12610/token-transfers)
- [BlockHashRNG](https://goerli.arbiscan.io/address/0x68eE49dfD9d76f3386257a3D0e0A85c0A5519bBD)
- [DisputeKitClassic](https://goerli.arbiscan.io/address/0xde31F2245d164620d08f5b0f8D43dCe8B9708373)
- [DisputeResolver](https://goerli.arbiscan.io/address/0xa1f52474CFa1ee78758a4bBa35DE547133Bda62f)
- [DisputeKitClassic](https://goerli.arbiscan.io/address/0x86734488ABF0E1AD40bc4DE4F820e808f39Bea09)
- [DisputeResolver](https://goerli.arbiscan.io/address/0xDe3eCeB73C453E56F5661ad029a41341CF592b9A)
- [FastBridgeSender](https://goerli.arbiscan.io/address/0x4d18b9792e0D8F5aF696E71dBEDff8fcBEed6e8C)
- [HomeGatewayToEthereum](https://goerli.arbiscan.io/address/0xed12799915180a257985631fbD2ead261eD838cf)
- [KlerosCore](https://goerli.arbiscan.io/address/0x4d7858e73a8842b5e6422D08a3349924dD062AbB)
- [PolicyRegistry](https://goerli.arbiscan.io/address/0xAF0F49Fe110b48bd512F00d51D141F023c9a9106)
- [RandomizerRNG](https://goerli.arbiscan.io/address/0xb82D1eAD813C3a2E729F288276cc402343423Bad)
- [SortitionSumTreeFactory](https://goerli.arbiscan.io/address/0x40a78989317B953e427B3BD87C59eA003fcC2296)
- [KlerosCore](https://goerli.arbiscan.io/address/0x3eED6aaCa43f4Bb98C591e4A0d2C4a124efF9C24)
- [PolicyRegistry](https://goerli.arbiscan.io/address/0xC5655728387Ce5E2aAA22138114E5777370aBDae)
- [RandomizerRNG](https://goerli.arbiscan.io/address/0xa2d1A3CDF0becEdb724e5A34De7022B6FF5e4787)
- [SortitionSumTreeFactoryV2](https://goerli.arbiscan.io/address/0x678E676fd0048da8c35d5B03fabB53a7beBf73A6)

## Getting Started

Expand Down
6 changes: 0 additions & 6 deletions contracts/deploy/00-home-chain-arbitration.ts
Original file line number Diff line number Diff line change
Expand Up @@ -57,12 +57,6 @@ const deployArbitration: DeployFunction = async (hre: HardhatRuntimeEnvironment)
log: true,
});

await deploy("BlockHashRNG", {
from: deployer,
args: [],
log: true,
});

const randomizer = randomizerByChain.get(Number(await getChainId())) ?? AddressZero;
const rng = await deploy("RandomizerRNG", {
from: deployer,
Expand Down
132 changes: 63 additions & 69 deletions contracts/deployments/arbitrumGoerli/DisputeKitClassic.json

Large diffs are not rendered by default.

79 changes: 24 additions & 55 deletions contracts/deployments/arbitrumGoerli/DisputeResolver.json

Large diffs are not rendered by default.

283 changes: 154 additions & 129 deletions contracts/deployments/arbitrumGoerli/KlerosCore.json

Large diffs are not rendered by default.

24 changes: 12 additions & 12 deletions contracts/deployments/arbitrumGoerli/PolicyRegistry.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"address": "0xAF0F49Fe110b48bd512F00d51D141F023c9a9106",
"address": "0xC5655728387Ce5E2aAA22138114E5777370aBDae",
"abi": [
{
"inputs": [
Expand Down Expand Up @@ -106,27 +106,27 @@
"type": "function"
}
],
"transactionHash": "0xa41e224e83e5c1e17e649caed26e280c8250a740cd65cd6d8ae0f76043fb8186",
"transactionHash": "0x24abcff43c9cf135c11f7e1023e3db8b4b77a279d1db481462453ecbecca9c54",
"receipt": {
"to": null,
"from": "0xF50E77f2A2B6138D16c6c7511562E5C33c4B15A3",
"contractAddress": "0xAF0F49Fe110b48bd512F00d51D141F023c9a9106",
"contractAddress": "0xC5655728387Ce5E2aAA22138114E5777370aBDae",
"transactionIndex": 1,
"gasUsed": "2847520",
"gasUsed": "396958",
"logsBloom": "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
"blockHash": "0xbebb1da749776542ebaaee1c78f8092c913436e3e5f1028e87553e069d60cf86",
"transactionHash": "0xa41e224e83e5c1e17e649caed26e280c8250a740cd65cd6d8ae0f76043fb8186",
"blockHash": "0x2434db72d4dee1e05e4e397a9629937c2f0f513fe1299cc0960267c6d78258a1",
"transactionHash": "0x24abcff43c9cf135c11f7e1023e3db8b4b77a279d1db481462453ecbecca9c54",
"logs": [],
"blockNumber": 4027973,
"cumulativeGasUsed": "2847520",
"blockNumber": 6456907,
"cumulativeGasUsed": "396958",
"status": 1,
"byzantium": true
},
"args": [
"0xF50E77f2A2B6138D16c6c7511562E5C33c4B15A3"
],
"numDeployments": 4,
"solcInputHash": "8e4e08d76a7f02df476a9f91ae4ef934",
"numDeployments": 1,
"solcInputHash": "86ef3911afc4fb1dc9daa46f19a1d3ba",
"metadata": "{\"compiler\":{\"version\":\"0.8.9+commit.e5eed63a\"},\"language\":\"Solidity\",\"output\":{\"abi\":[{\"inputs\":[{\"internalType\":\"address\",\"name\":\"_governor\",\"type\":\"address\"}],\"stateMutability\":\"nonpayable\",\"type\":\"constructor\"},{\"anonymous\":false,\"inputs\":[{\"indexed\":true,\"internalType\":\"uint256\",\"name\":\"_courtID\",\"type\":\"uint256\"},{\"indexed\":false,\"internalType\":\"string\",\"name\":\"_courtName\",\"type\":\"string\"},{\"indexed\":false,\"internalType\":\"string\",\"name\":\"_policy\",\"type\":\"string\"}],\"name\":\"PolicyUpdate\",\"type\":\"event\"},{\"inputs\":[{\"internalType\":\"address\",\"name\":\"_governor\",\"type\":\"address\"}],\"name\":\"changeGovernor\",\"outputs\":[],\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"inputs\":[],\"name\":\"governor\",\"outputs\":[{\"internalType\":\"address\",\"name\":\"\",\"type\":\"address\"}],\"stateMutability\":\"view\",\"type\":\"function\"},{\"inputs\":[{\"internalType\":\"uint256\",\"name\":\"\",\"type\":\"uint256\"}],\"name\":\"policies\",\"outputs\":[{\"internalType\":\"string\",\"name\":\"\",\"type\":\"string\"}],\"stateMutability\":\"view\",\"type\":\"function\"},{\"inputs\":[{\"internalType\":\"uint256\",\"name\":\"_courtID\",\"type\":\"uint256\"},{\"internalType\":\"string\",\"name\":\"_courtName\",\"type\":\"string\"},{\"internalType\":\"string\",\"name\":\"_policy\",\"type\":\"string\"}],\"name\":\"setPolicy\",\"outputs\":[],\"stateMutability\":\"nonpayable\",\"type\":\"function\"}],\"devdoc\":{\"author\":\"Enrique Piqueras - <epiquerass@gmail.com>\",\"details\":\"A contract to maintain a policy for each court.\",\"events\":{\"PolicyUpdate(uint256,string,string)\":{\"details\":\"Emitted when a policy is updated.\",\"params\":{\"_courtID\":\"The ID of the policy's court.\",\"_courtName\":\"The name of the policy's court.\",\"_policy\":\"The URI of the policy JSON.\"}}},\"kind\":\"dev\",\"methods\":{\"changeGovernor(address)\":{\"details\":\"Changes the `governor` storage variable.\",\"params\":{\"_governor\":\"The new value for the `governor` storage variable.\"}},\"constructor\":{\"details\":\"Constructs the `PolicyRegistry` contract.\",\"params\":{\"_governor\":\"The governor's address.\"}},\"setPolicy(uint256,string,string)\":{\"details\":\"Sets the policy for the specified court.\",\"params\":{\"_courtID\":\"The ID of the specified court.\",\"_courtName\":\"The name of the specified court.\",\"_policy\":\"The URI of the policy JSON.\"}}},\"title\":\"PolicyRegistry\",\"version\":1},\"userdoc\":{\"kind\":\"user\",\"methods\":{},\"version\":1}},\"settings\":{\"compilationTarget\":{\"src/arbitration/PolicyRegistry.sol\":\"PolicyRegistry\"},\"evmVersion\":\"london\",\"libraries\":{},\"metadata\":{\"bytecodeHash\":\"ipfs\",\"useLiteralContent\":true},\"optimizer\":{\"enabled\":true,\"runs\":100},\"remappings\":[]},\"sources\":{\"src/arbitration/PolicyRegistry.sol\":{\"content\":\"// SPDX-License-Identifier: MIT\\npragma solidity ^0.8;\\n\\n/**\\n * @title PolicyRegistry\\n * @author Enrique Piqueras - <epiquerass@gmail.com>\\n * @dev A contract to maintain a policy for each court.\\n */\\ncontract PolicyRegistry {\\n // ************************************* //\\n // * Events * //\\n // ************************************* //\\n\\n /**\\n * @dev Emitted when a policy is updated.\\n * @param _courtID The ID of the policy's court.\\n * @param _courtName The name of the policy's court.\\n * @param _policy The URI of the policy JSON.\\n */\\n event PolicyUpdate(uint256 indexed _courtID, string _courtName, string _policy);\\n\\n // ************************************* //\\n // * Storage * //\\n // ************************************* //\\n\\n address public governor;\\n mapping(uint256 => string) public policies;\\n\\n // ************************************* //\\n // * Function Modifiers * //\\n // ************************************* //\\n\\n /**\\n * @dev Requires that the sender is the governor.\\n */\\n modifier onlyByGovernor() {\\n require(governor == msg.sender, \\\"No allowed: governor only\\\");\\n _;\\n }\\n\\n // ************************************* //\\n // * Constructor * //\\n // ************************************* //\\n\\n /** @dev Constructs the `PolicyRegistry` contract.\\n * @param _governor The governor's address.\\n */\\n constructor(address _governor) {\\n governor = _governor;\\n }\\n\\n // ************************************* //\\n // * Governance * //\\n // ************************************* //\\n\\n /**\\n * @dev Changes the `governor` storage variable.\\n * @param _governor The new value for the `governor` storage variable.\\n */\\n function changeGovernor(address _governor) external onlyByGovernor {\\n governor = _governor;\\n }\\n\\n // ************************************* //\\n // * State Modifiers * //\\n // ************************************* //\\n\\n /**\\n * @dev Sets the policy for the specified court.\\n * @param _courtID The ID of the specified court.\\n * @param _courtName The name of the specified court.\\n * @param _policy The URI of the policy JSON.\\n */\\n function setPolicy(uint256 _courtID, string calldata _courtName, string calldata _policy) external onlyByGovernor {\\n policies[_courtID] = _policy;\\n emit PolicyUpdate(_courtID, _courtName, policies[_courtID]);\\n }\\n}\\n\",\"keccak256\":\"0xdc8205d9103d2e4d3f98721691ddbe8f999226cdc78d88ddcd9718f403fff960\",\"license\":\"MIT\"}},\"version\":1}",
"bytecode": "0x608060405234801561001057600080fd5b5060405161065a38038061065a83398101604081905261002f91610054565b600080546001600160a01b0319166001600160a01b0392909216919091179055610084565b60006020828403121561006657600080fd5b81516001600160a01b038116811461007d57600080fd5b9392505050565b6105c7806100936000396000f3fe608060405234801561001057600080fd5b506004361061004c5760003560e01c80630c340a2414610051578063bdf7378014610081578063d3e8948314610096578063e4c0aaf4146100b6575b600080fd5b600054610064906001600160a01b031681565b6040516001600160a01b0390911681526020015b60405180910390f35b61009461008f366004610333565b6100c9565b005b6100a96100a43660046103ad565b61016b565b60405161007891906103c6565b6100946100c436600461041b565b610205565b6000546001600160a01b031633146100fc5760405162461bcd60e51b81526004016100f39061044b565b60405180910390fd5b6000858152600160205260409020610115908383610251565b50847f61f7110245e82eddd3b134d1e1607420d4a4dcdab30f5abdbbc9c3485b5dd2a48585600160008a815260200190815260200160002060405161015c939291906104b9565b60405180910390a25050505050565b600160205260009081526040902080546101849061047e565b80601f01602080910402602001604051908101604052809291908181526020018280546101b09061047e565b80156101fd5780601f106101d2576101008083540402835291602001916101fd565b820191906000526020600020905b8154815290600101906020018083116101e057829003601f168201915b505050505081565b6000546001600160a01b0316331461022f5760405162461bcd60e51b81526004016100f39061044b565b600080546001600160a01b0319166001600160a01b0392909216919091179055565b82805461025d9061047e565b90600052602060002090601f01602090048101928261027f57600085556102c5565b82601f106102985782800160ff198235161785556102c5565b828001600101855582156102c5579182015b828111156102c55782358255916020019190600101906102aa565b506102d19291506102d5565b5090565b5b808211156102d157600081556001016102d6565b60008083601f8401126102fc57600080fd5b50813567ffffffffffffffff81111561031457600080fd5b60208301915083602082850101111561032c57600080fd5b9250929050565b60008060008060006060868803121561034b57600080fd5b85359450602086013567ffffffffffffffff8082111561036a57600080fd5b61037689838a016102ea565b9096509450604088013591508082111561038f57600080fd5b5061039c888289016102ea565b969995985093965092949392505050565b6000602082840312156103bf57600080fd5b5035919050565b600060208083528351808285015260005b818110156103f3578581018301518582016040015282016103d7565b81811115610405576000604083870101525b50601f01601f1916929092016040019392505050565b60006020828403121561042d57600080fd5b81356001600160a01b038116811461044457600080fd5b9392505050565b6020808252601990820152784e6f20616c6c6f7765643a20676f7665726e6f72206f6e6c7960381b604082015260600190565b600181811c9082168061049257607f821691505b602082108114156104b357634e487b7160e01b600052602260045260246000fd5b50919050565b60408152826040820152828460608301376000808060608685010152601f19601f860116830160206060858303018186015282865484600182811c91508083168061050557607f831692505b85831081141561052357634e487b7160e01b88526022600452602488fd5b6060870183905260808701965080801561054457600181146105555761057f565b60ff1985168852868801955061057f565b60008c815260209020895b858110156105795781548a820152908401908801610560565b89019650505b50939c9b50505050505050505050505056fea264697066735822122060e39a877421ec3f435184c5bf619159738ca216935c7caabe5aa60b00a9043464736f6c63430008090033",
"deployedBytecode": "0x608060405234801561001057600080fd5b506004361061004c5760003560e01c80630c340a2414610051578063bdf7378014610081578063d3e8948314610096578063e4c0aaf4146100b6575b600080fd5b600054610064906001600160a01b031681565b6040516001600160a01b0390911681526020015b60405180910390f35b61009461008f366004610333565b6100c9565b005b6100a96100a43660046103ad565b61016b565b60405161007891906103c6565b6100946100c436600461041b565b610205565b6000546001600160a01b031633146100fc5760405162461bcd60e51b81526004016100f39061044b565b60405180910390fd5b6000858152600160205260409020610115908383610251565b50847f61f7110245e82eddd3b134d1e1607420d4a4dcdab30f5abdbbc9c3485b5dd2a48585600160008a815260200190815260200160002060405161015c939291906104b9565b60405180910390a25050505050565b600160205260009081526040902080546101849061047e565b80601f01602080910402602001604051908101604052809291908181526020018280546101b09061047e565b80156101fd5780601f106101d2576101008083540402835291602001916101fd565b820191906000526020600020905b8154815290600101906020018083116101e057829003601f168201915b505050505081565b6000546001600160a01b0316331461022f5760405162461bcd60e51b81526004016100f39061044b565b600080546001600160a01b0319166001600160a01b0392909216919091179055565b82805461025d9061047e565b90600052602060002090601f01602090048101928261027f57600085556102c5565b82601f106102985782800160ff198235161785556102c5565b828001600101855582156102c5579182015b828111156102c55782358255916020019190600101906102aa565b506102d19291506102d5565b5090565b5b808211156102d157600081556001016102d6565b60008083601f8401126102fc57600080fd5b50813567ffffffffffffffff81111561031457600080fd5b60208301915083602082850101111561032c57600080fd5b9250929050565b60008060008060006060868803121561034b57600080fd5b85359450602086013567ffffffffffffffff8082111561036a57600080fd5b61037689838a016102ea565b9096509450604088013591508082111561038f57600080fd5b5061039c888289016102ea565b969995985093965092949392505050565b6000602082840312156103bf57600080fd5b5035919050565b600060208083528351808285015260005b818110156103f3578581018301518582016040015282016103d7565b81811115610405576000604083870101525b50601f01601f1916929092016040019392505050565b60006020828403121561042d57600080fd5b81356001600160a01b038116811461044457600080fd5b9392505050565b6020808252601990820152784e6f20616c6c6f7765643a20676f7665726e6f72206f6e6c7960381b604082015260600190565b600181811c9082168061049257607f821691505b602082108114156104b357634e487b7160e01b600052602260045260246000fd5b50919050565b60408152826040820152828460608301376000808060608685010152601f19601f860116830160206060858303018186015282865484600182811c91508083168061050557607f831692505b85831081141561052357634e487b7160e01b88526022600452602488fd5b6060870183905260808701965080801561054457600181146105555761057f565b60ff1985168852868801955061057f565b60008c815260209020895b858110156105795781548a820152908401908801610560565b89019650505b50939c9b50505050505050505050505056fea264697066735822122060e39a877421ec3f435184c5bf619159738ca216935c7caabe5aa60b00a9043464736f6c63430008090033",
Expand Down Expand Up @@ -177,15 +177,15 @@
"storageLayout": {
"storage": [
{
"astId": 7415,
"astId": 7931,
"contract": "src/arbitration/PolicyRegistry.sol:PolicyRegistry",
"label": "governor",
"offset": 0,
"slot": "0",
"type": "t_address"
},
{
"astId": 7419,
"astId": 7935,
"contract": "src/arbitration/PolicyRegistry.sol:PolicyRegistry",
"label": "policies",
"offset": 0,
Expand Down
Loading