Skip to content

Commit 872600e

Browse files
committed
fix: dispute request event incorrect localDisputeID
1 parent 364678a commit 872600e

File tree

8 files changed

+193
-180
lines changed

8 files changed

+193
-180
lines changed

contracts/README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -75,13 +75,13 @@ Refresh the list of deployed contracts by running `./scripts/generateDeployments
7575
- [DisputeKitClassicUniversity: proxy](https://sepolia.arbiscan.io/address/0xDaE66157D72Baa099cd63a833c353776206feea4), [implementation](https://sepolia.arbiscan.io/address/0xf36fa321Bb64b6E39f5DA3dbb053ccE63D077f8B)
7676
- [DisputeResolver](https://sepolia.arbiscan.io/address/0xB8B36CC43f852f9F0484f53Eb38CaBBA28a81bF6)
7777
- [DisputeResolverNeo](https://sepolia.arbiscan.io/address/0xaBC213522c01354DC0Db2B3E89bDe0FCF44Acac6)
78-
- [DisputeResolverRuler](https://sepolia.arbiscan.io/address/0xF1544a7B9DC6aBFAbBD58A2feF8Ee8fEDdBA5DBd)
78+
- [DisputeResolverRuler](https://sepolia.arbiscan.io/address/0xb157a3C0691c6c39C268EC5c6f32d9Ee599aeDBA)
7979
- [DisputeResolverUniversity](https://sepolia.arbiscan.io/address/0x102Ba9488Df13842612e777aB16144cCACD38194)
8080
- [DisputeTemplateRegistry: proxy](https://sepolia.arbiscan.io/address/0x596D3B09E684D62217682216e9b7a0De75933391), [implementation](https://sepolia.arbiscan.io/address/0xc53b813ed94AaEb6F5518D60bf6a8109954bE3f6)
8181
- [EvidenceModule: proxy](https://sepolia.arbiscan.io/address/0x57fd453FB0d16f8ca174E7386102D7170E17Be09), [implementation](https://sepolia.arbiscan.io/address/0x05AD81f245209b7f91885fd96e57c9da90554824)
8282
- [KlerosCore: proxy](https://sepolia.arbiscan.io/address/0xA54e7A16d7460e38a8F324eF46782FB520d58CE8), [implementation](https://sepolia.arbiscan.io/address/0x91a373BBdE0532F86410682F362e2Cf685e95085)
8383
- [KlerosCoreNeo: proxy](https://sepolia.arbiscan.io/address/0x26bf077037550e437605F07e25EfcAd510715C3A), [implementation](https://sepolia.arbiscan.io/address/0x3bE96b7eAF6A3640DBa1f7CE58776D5b790B74CB)
84-
- [KlerosCoreRuler: proxy](https://sepolia.arbiscan.io/address/0x7ffcd32A0521645E6fCFd071A68F0e26957775a5), [implementation](https://sepolia.arbiscan.io/address/0x97e30A3A940856A3913437912C746f1aF6ccC76c)
84+
- [KlerosCoreRuler: proxy](https://sepolia.arbiscan.io/address/0x5346E65b05c90E6d81d6D9112caB81a76126EDD9), [implementation](https://sepolia.arbiscan.io/address/0xd9CE882bc9aE35954c1C0A2C4b90A73f192DB958)
8585
- [KlerosCoreUniversity: proxy](https://sepolia.arbiscan.io/address/0x10BaAFDe8B4d3164CA781571e2F1513317f57980), [implementation](https://sepolia.arbiscan.io/address/0x8466ab62E7c923e8F2E61d0358C495676D6F939b)
8686
- [KlerosV2NeoEarlyUser](https://sepolia.arbiscan.io/address/0x0d60Ff8bbCF49Bc5352328E7E28e141834d7750F)
8787
- [PNKFaucet](https://sepolia.arbiscan.io/address/0x7EFE468003Ad6A858b5350CDE0A67bBED58739dD)

contracts/deployments/arbitrumSepoliaDevnet/DisputeResolverRuler.json

Lines changed: 31 additions & 31 deletions
Large diffs are not rendered by default.

contracts/deployments/arbitrumSepoliaDevnet/KlerosCoreRuler.json

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"address": "0x7ffcd32A0521645E6fCFd071A68F0e26957775a5",
2+
"address": "0x5346E65b05c90E6d81d6D9112caB81a76126EDD9",
33
"abi": [
44
{
55
"stateMutability": "payable",
@@ -1519,55 +1519,55 @@
15191519
"type": "constructor"
15201520
}
15211521
],
1522-
"transactionHash": "0xe7a285a9dae297998d65ab557226558d250c1e0b512f0d9349fc4e3f5c9c3865",
1522+
"transactionHash": "0xf8aab10fa7dde5b20402e5e64010a9c2423f5d76eea9c8adac2bebea2a8fb61a",
15231523
"receipt": {
15241524
"to": null,
15251525
"from": "0xf1C7c037891525E360C59f708739Ac09A7670c59",
1526-
"contractAddress": "0x7ffcd32A0521645E6fCFd071A68F0e26957775a5",
1527-
"transactionIndex": 1,
1528-
"gasUsed": "366202",
1529-
"logsBloom": "0x00000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000040000000000000100005000000000000000000000000000040008000000000000000000000000020000000000000000000800000000000000000000000000000000000000000000000000000800000000000000000000000080000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000004800000000000000060000000000000000000000000000000000000000000000000000000000000000000",
1530-
"blockHash": "0x4a74c33b3212cc7ed833956036b191ca451ae191619b2e4f90cf6dad50868d33",
1531-
"transactionHash": "0xe7a285a9dae297998d65ab557226558d250c1e0b512f0d9349fc4e3f5c9c3865",
1526+
"contractAddress": "0x5346E65b05c90E6d81d6D9112caB81a76126EDD9",
1527+
"transactionIndex": 2,
1528+
"gasUsed": "308573",
1529+
"logsBloom": "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000040000000000000100004000000002000000000000000000040008010000000000000000000000020000000000000000000800000000000000000000000000000000000000000000000000000800000000000000000000000080000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000004000000000000000060000000000000000000000000000000000000000000000000001000000000000000",
1530+
"blockHash": "0x369c2c8f1d584c3f1cd4364da91263b4cf0fa55760412413cf15ed86868eaa82",
1531+
"transactionHash": "0xf8aab10fa7dde5b20402e5e64010a9c2423f5d76eea9c8adac2bebea2a8fb61a",
15321532
"logs": [
15331533
{
1534-
"transactionIndex": 1,
1535-
"blockNumber": 81776148,
1536-
"transactionHash": "0xe7a285a9dae297998d65ab557226558d250c1e0b512f0d9349fc4e3f5c9c3865",
1537-
"address": "0x7ffcd32A0521645E6fCFd071A68F0e26957775a5",
1534+
"transactionIndex": 2,
1535+
"blockNumber": 87156235,
1536+
"transactionHash": "0xf8aab10fa7dde5b20402e5e64010a9c2423f5d76eea9c8adac2bebea2a8fb61a",
1537+
"address": "0x5346E65b05c90E6d81d6D9112caB81a76126EDD9",
15381538
"topics": [
15391539
"0x0c907a651f88974ed0d9423aacc8b998c40eedf39920e2c3bdae0adcc486a761",
15401540
"0x0000000000000000000000000000000000000000000000000000000000000001",
15411541
"0x0000000000000000000000000000000000000000000000000000000000000000"
15421542
],
15431543
"data": "0x000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002710000000000000000000000000000000000000000000000000016345785d8a000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
1544-
"logIndex": 0,
1545-
"blockHash": "0x4a74c33b3212cc7ed833956036b191ca451ae191619b2e4f90cf6dad50868d33"
1544+
"logIndex": 1,
1545+
"blockHash": "0x369c2c8f1d584c3f1cd4364da91263b4cf0fa55760412413cf15ed86868eaa82"
15461546
},
15471547
{
1548-
"transactionIndex": 1,
1549-
"blockNumber": 81776148,
1550-
"transactionHash": "0xe7a285a9dae297998d65ab557226558d250c1e0b512f0d9349fc4e3f5c9c3865",
1551-
"address": "0x7ffcd32A0521645E6fCFd071A68F0e26957775a5",
1548+
"transactionIndex": 2,
1549+
"blockNumber": 87156235,
1550+
"transactionHash": "0xf8aab10fa7dde5b20402e5e64010a9c2423f5d76eea9c8adac2bebea2a8fb61a",
1551+
"address": "0x5346E65b05c90E6d81d6D9112caB81a76126EDD9",
15521552
"topics": [
15531553
"0xc7f505b2f371ae2175ee4913f4499e1f2633a7b5936321eed1cdaeb6115181d2"
15541554
],
15551555
"data": "0x0000000000000000000000000000000000000000000000000000000000000001",
1556-
"logIndex": 1,
1557-
"blockHash": "0x4a74c33b3212cc7ed833956036b191ca451ae191619b2e4f90cf6dad50868d33"
1556+
"logIndex": 2,
1557+
"blockHash": "0x369c2c8f1d584c3f1cd4364da91263b4cf0fa55760412413cf15ed86868eaa82"
15581558
}
15591559
],
1560-
"blockNumber": 81776148,
1561-
"cumulativeGasUsed": "366202",
1560+
"blockNumber": 87156235,
1561+
"cumulativeGasUsed": "416102",
15621562
"status": 1,
15631563
"byzantium": true
15641564
},
15651565
"args": [
1566-
"0x97e30A3A940856A3913437912C746f1aF6ccC76c",
1566+
"0xd9CE882bc9aE35954c1C0A2C4b90A73f192DB958",
15671567
"0x05d3177d000000000000000000000000f1c7c037891525e360c59f708739ac09a7670c5900000000000000000000000034b944d42cacfc8266955d07a80181d2054aa22500000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002710000000000000000000000000000000000000000000000000016345785d8a00000000000000000000000000000000000000000000000000000000000000000010"
15681568
],
15691569
"numDeployments": 1,
1570-
"solcInputHash": "2c1a31d10a5f76f480d447fbb502d6fc",
1570+
"solcInputHash": "4ffaf74501296239fa9967a6f3bb794f",
15711571
"metadata": "{\"compiler\":{\"version\":\"0.8.24+commit.e11b9ed9\"},\"language\":\"Solidity\",\"output\":{\"abi\":[{\"inputs\":[{\"internalType\":\"address\",\"name\":\"_implementation\",\"type\":\"address\"},{\"internalType\":\"bytes\",\"name\":\"_data\",\"type\":\"bytes\"}],\"stateMutability\":\"nonpayable\",\"type\":\"constructor\"},{\"stateMutability\":\"payable\",\"type\":\"fallback\"},{\"stateMutability\":\"payable\",\"type\":\"receive\"}],\"devdoc\":{\"author\":\"Simon Malatrait <[email protected]>\",\"details\":\"This contract implements a UUPS Proxy compliant with ERC-1967 & ERC-1822.This contract delegates all calls to another contract (UUPS Proxiable) through a fallback function and the use of the `delegatecall` EVM instruction.We refer to the Proxiable contract (as per ERC-1822) with `implementation`.\",\"kind\":\"dev\",\"methods\":{\"constructor\":{\"details\":\"Initializes the upgradeable proxy with an initial implementation specified by `_implementation`. If `_data` is nonempty, it's used as data in a delegate call to `_implementation`. This will typically be an encoded function call, and allows initializing the storage of the proxy like a Solidity constructor.\"}},\"stateVariables\":{\"IMPLEMENTATION_SLOT\":{\"details\":\"Storage slot with the address of the current implementation. This is the keccak-256 hash of \\\"eip1967.proxy.implementation\\\" subtracted by 1, and is validated in the constructor. NOTE: bytes32(uint256(keccak256('eip1967.proxy.implementation')) - 1)\"}},\"title\":\"UUPS Proxy\",\"version\":1},\"userdoc\":{\"kind\":\"user\",\"methods\":{},\"version\":1}},\"settings\":{\"compilationTarget\":{\"src/proxy/UUPSProxy.sol\":\"UUPSProxy\"},\"evmVersion\":\"shanghai\",\"libraries\":{},\"metadata\":{\"bytecodeHash\":\"ipfs\",\"useLiteralContent\":true},\"optimizer\":{\"enabled\":true,\"runs\":100},\"remappings\":[]},\"sources\":{\"src/proxy/UUPSProxy.sol\":{\"content\":\"//SPDX-License-Identifier: MIT\\n// Adapted from <https://github.com/OpenZeppelin/openzeppelin-contracts/blob/v4.9.0/contracts/proxy/ERC1967/ERC1967Proxy.sol>\\n\\n/**\\n * @authors: [@malatrax]\\n * @reviewers: []\\n * @auditors: []\\n * @bounties: []\\n * @deployments: []\\n */\\npragma solidity 0.8.24;\\n\\n/**\\n * @title UUPS Proxy\\n * @author Simon Malatrait <[email protected]>\\n * @dev This contract implements a UUPS Proxy compliant with ERC-1967 & ERC-1822.\\n * @dev This contract delegates all calls to another contract (UUPS Proxiable) through a fallback function and the use of the `delegatecall` EVM instruction.\\n * @dev We refer to the Proxiable contract (as per ERC-1822) with `implementation`.\\n */\\ncontract UUPSProxy {\\n /**\\n * @dev Storage slot with the address of the current implementation.\\n * This is the keccak-256 hash of \\\"eip1967.proxy.implementation\\\" subtracted by 1, and is\\n * validated in the constructor.\\n * NOTE: bytes32(uint256(keccak256('eip1967.proxy.implementation')) - 1)\\n */\\n bytes32 private constant IMPLEMENTATION_SLOT = 0x360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbc;\\n\\n // ************************************* //\\n // * Constructor * //\\n // ************************************* //\\n\\n /**\\n * @dev Initializes the upgradeable proxy with an initial implementation specified by `_implementation`.\\n *\\n * If `_data` is nonempty, it's used as data in a delegate call to `_implementation`. This will typically be an encoded\\n * function call, and allows initializing the storage of the proxy like a Solidity constructor.\\n */\\n constructor(address _implementation, bytes memory _data) {\\n assembly {\\n sstore(IMPLEMENTATION_SLOT, _implementation)\\n }\\n\\n if (_data.length != 0) {\\n (bool success, ) = _implementation.delegatecall(_data);\\n require(success, \\\"Proxy Constructor failed\\\");\\n }\\n }\\n\\n // ************************************* //\\n // * State Modifiers * //\\n // ************************************* //\\n\\n /**\\n * @dev Delegates the current call to `implementation`.\\n *\\n * NOTE: This function does not return to its internal call site, it will return directly to the external caller.\\n */\\n function _delegate(address implementation) internal {\\n assembly {\\n // Copy msg.data. We take full control of memory in this inline assembly\\n // block because it will not return to Solidity code. We overwrite the\\n // Solidity scratch pad at memory position 0.\\n calldatacopy(0, 0, calldatasize())\\n\\n // Call the implementation.\\n // out and outsize are 0 because we don't know the size yet.\\n let result := delegatecall(gas(), implementation, 0, calldatasize(), 0, 0)\\n\\n // Copy the returned data.\\n returndatacopy(0, 0, returndatasize())\\n\\n switch result\\n // delegatecall returns 0 on error.\\n case 0 {\\n revert(0, returndatasize())\\n }\\n default {\\n return(0, returndatasize())\\n }\\n }\\n }\\n\\n // ************************************* //\\n // * Internal Views * //\\n // ************************************* //\\n\\n function _getImplementation() internal view returns (address implementation) {\\n assembly {\\n implementation := sload(IMPLEMENTATION_SLOT)\\n }\\n }\\n\\n // ************************************* //\\n // * Fallback * //\\n // ************************************* //\\n\\n /**\\n * @dev Fallback function that delegates calls to the address returned by `_implementation()`. Will run if no other\\n * function in the contract matches the call data.\\n */\\n fallback() external payable {\\n _delegate(_getImplementation());\\n }\\n\\n receive() external payable {\\n _delegate(_getImplementation());\\n }\\n}\\n\",\"keccak256\":\"0x7aa5f14ce351299722ac1a1afca9e65e1c795f32ea3e9702b0d5faaf7ca822a0\",\"license\":\"MIT\"}},\"version\":1}",
15721572
"bytecode": "0x608060405234801561000f575f80fd5b506040516102e53803806102e583398101604081905261002e91610143565b817f360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbc5580515f14610106575f826001600160a01b031682604051610072919061020b565b5f60405180830381855af49150503d805f81146100aa576040519150601f19603f3d011682016040523d82523d5f602084013e6100af565b606091505b50509050806101045760405162461bcd60e51b815260206004820152601860248201527f50726f787920436f6e7374727563746f72206661696c65640000000000000000604482015260640160405180910390fd5b505b5050610226565b634e487b7160e01b5f52604160045260245ffd5b5f5b8381101561013b578181015183820152602001610123565b50505f910152565b5f8060408385031215610154575f80fd5b82516001600160a01b038116811461016a575f80fd5b60208401519092506001600160401b0380821115610186575f80fd5b818501915085601f830112610199575f80fd5b8151818111156101ab576101ab61010d565b604051601f8201601f19908116603f011681019083821181831017156101d3576101d361010d565b816040528281528860208487010111156101eb575f80fd5b6101fc836020830160208801610121565b80955050505050509250929050565b5f825161021c818460208701610121565b9190910192915050565b60b3806102325f395ff3fe608060405236603757603560317f360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbc5490565b6060565b005b603560317f360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbc5490565b365f80375f80365f845af43d5f803e8080156079573d5ff35b3d5ffdfea2646970667358221220cef4b52606e73de407a2e27987280e32ca63601b58f184d7d171ca05e6a91f7c64736f6c63430008180033",
15731573
"deployedBytecode": "0x608060405236603757603560317f360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbc5490565b6060565b005b603560317f360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbc5490565b365f80375f80365f845af43d5f803e8080156079573d5ff35b3d5ffdfea2646970667358221220cef4b52606e73de407a2e27987280e32ca63601b58f184d7d171ca05e6a91f7c64736f6c63430008180033",
@@ -1587,7 +1587,7 @@
15871587
]
15881588
]
15891589
},
1590-
"implementation": "0x97e30A3A940856A3913437912C746f1aF6ccC76c",
1590+
"implementation": "0xd9CE882bc9aE35954c1C0A2C4b90A73f192DB958",
15911591
"devdoc": {
15921592
"author": "Simon Malatrait <[email protected]>",
15931593
"details": "This contract implements a UUPS Proxy compliant with ERC-1967 & ERC-1822.This contract delegates all calls to another contract (UUPS Proxiable) through a fallback function and the use of the `delegatecall` EVM instruction.We refer to the Proxiable contract (as per ERC-1822) with `implementation`.",

contracts/deployments/arbitrumSepoliaDevnet/KlerosCoreRuler_Implementation.json

Lines changed: 86 additions & 86 deletions
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)