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.

Sign up for GitHub

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

feat: remove circuit resolver #73

Closed
wants to merge 1 commit into from
Closed

feat: remove circuit resolver #73

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 0 additions & 2 deletions docs/src/SUMMARY.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@

- [BondedDisputeModule](content/modules/dispute/bonded_dispute_module.md)
- [BondEscalationModule](content/modules/dispute/bond_escalation_module.md)
- [CircuitResolverModule](content/modules/dispute/circuit_resolver_module.md)
- [RootVerificationModule](content/modules/dispute/root_verification_module.md)

- [Resolution](content/modules/resolution.md)
Expand Down Expand Up @@ -75,7 +74,6 @@
- [❱ dispute](solidity/interfaces/modules/dispute/README.md)
- [IBondEscalationModule](solidity/interfaces/modules/dispute/IBondEscalationModule.sol/interface.IBondEscalationModule.md)
- [IBondedDisputeModule](solidity/interfaces/modules/dispute/IBondedDisputeModule.sol/interface.IBondedDisputeModule.md)
- [ICircuitResolverModule](solidity/interfaces/modules/dispute/ICircuitResolverModule.sol/interface.ICircuitResolverModule.md)
- [IRootVerificationModule](solidity/interfaces/modules/dispute/IRootVerificationModule.sol/interface.IRootVerificationModule.md)
- [❱ finality](solidity/interfaces/modules/finality/README.md)
- [ICallbackModule](solidity/interfaces/modules/finality/ICallbackModule.sol/interface.ICallbackModule.md)
Expand Down
1 change: 0 additions & 1 deletion docs/src/content/intro/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,6 @@ Prophet presents a versatile and fully adaptable optimistic oracle solution, tra
| [BondedResponseModule](/solidity/interfaces/modules/response/IBondedResponseModule.sol/interface.IBondedResponseModule.md) | [`0x0000000000000000000000000000000000000000`](https://sepolia-optimism.etherscan.io/address/0x0000000000000000000000000000000000000000) |
| [BondedDisputeModule](/solidity/interfaces/modules/dispute/IBondedDisputeModule.sol/interface.IBondedDisputeModule.md) | [`0x0000000000000000000000000000000000000000`](https://sepolia-optimism.etherscan.io/address/0x0000000000000000000000000000000000000000) |
| [BondEscalationModule](/solidity/interfaces/modules/dispute/IBondEscalationModule.sol/interface.IBondEscalationModule.md) | [`0x0000000000000000000000000000000000000000`](https://sepolia-optimism.etherscan.io/address/0x0000000000000000000000000000000000000000) |
| [CircuitResolverModule](/solidity/interfaces/modules/dispute/ICircuitResolverModule.sol/interface.ICircuitResolverModule.md) | [`0x0000000000000000000000000000000000000000`](https://sepolia-optimism.etherscan.io/address/0x0000000000000000000000000000000000000000) |
| [RootVerificationModule](/solidity/interfaces/modules/dispute/IRootVerificationModule.sol/interface.IRootVerificationModule.md) | [`0x0000000000000000000000000000000000000000`](https://sepolia-optimism.etherscan.io/address/0x0000000000000000000000000000000000000000) |
| [ArbitratorModule](/solidity/interfaces/modules/resolution/IArbitratorModule.sol/interface.IArbitratorModule.md) | [`0x0000000000000000000000000000000000000000`](https://sepolia-optimism.etherscan.io/address/0x0000000000000000000000000000000000000000) |
| [BondEscalationResolutionModule](/solidity/interfaces/modules/resolution/IBondEscalationResolutionModule.sol/interface.IBondEscalationResolutionModule.md) | [`0x0000000000000000000000000000000000000000`](https://sepolia-optimism.etherscan.io/address/0x0000000000000000000000000000000000000000) |
Expand Down
5 changes: 2 additions & 3 deletions docs/src/content/modules/dispute.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,13 @@ The Dispute module is a crucial component of the Prophet Framework that manages
In Prophet, examples of Dispute modules include:
- [BondedDisputeModule](./dispute/bonded_dispute_module.md) that requires a challenger to post a bond first, which will be returned upon successful dispute resolution or slashed in case of an unsuccessful dispute.
- [BondEscalationModule](./dispute/bond_escalation_module.md) in which the sides take turns increasing the bond until one of them gives up or until they reach a limit.
- [CircuitResolverModule](./dispute/circuit_resolver_module.md) that allows for the dispute to be resolved on-chain.
- [RootVerificationModule](./dispute/root_verification_module.md) that, similarly to the `CircuitResolverModule`, enables atomical on-chain resolution of disputes.
- [RootVerificationModule](./dispute/root_verification_module.md) enables atomical on-chain resolution of disputes.

## Dispute Types

- **Pre-dispute**: This type of Dispute modules aims to settle disputes before they reach the Resolution module. `BondEscalationModule` is an example of a pre-dispute module.

- **Atomical dispute**: This type of dispute relies on an external contract to atomically resolve the dispute as soon as it's started. In this case the Resolution module might not be needed at all. `CircuitResolverModule` and `RootVerificationModule` are examples of atomical dispute modules.
- **Atomical dispute**: This type of dispute relies on an external contract to atomically resolve the dispute as soon as it's started. In this case the Resolution module might not be needed at all. `RootVerificationModule` are examples of atomical dispute modules.

## Developing a Dispute Module

Expand Down
33 changes: 0 additions & 33 deletions docs/src/content/modules/dispute/circuit_resolver_module.md
View file
Open in desktop

This file was deleted.

118 changes: 0 additions & 118 deletions solidity/contracts/modules/dispute/CircuitResolverModule.sol
View file
Open in desktop

This file was deleted.

93 changes: 0 additions & 93 deletions solidity/interfaces/modules/dispute/ICircuitResolverModule.sol
View file
Open in desktop

This file was deleted.

6 changes: 0 additions & 6 deletions solidity/scripts/Deploy.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ import {IResolutionModule} from
import {BondEscalationModule} from '../contracts/modules/dispute/BondEscalationModule.sol';
import {BondedDisputeModule} from '../contracts/modules/dispute/BondedDisputeModule.sol';

import {CircuitResolverModule} from '../contracts/modules/dispute/CircuitResolverModule.sol';
import {RootVerificationModule} from '../contracts/modules/dispute/RootVerificationModule.sol';
import {CallbackModule} from '../contracts/modules/finality/CallbackModule.sol';
import {MultipleCallbacksModule} from '../contracts/modules/finality/MultipleCallbacksModule.sol';
Expand Down Expand Up @@ -44,7 +43,6 @@ contract Deploy is Script {
BondedDisputeModule bondedDisputeModule;
BondEscalationModule bondEscalationModule;
RootVerificationModule rootVerificationModule;
CircuitResolverModule circuitResolverModule;

// Resolution modules
ArbitratorModule arbitratorModule;
Expand Down Expand Up @@ -129,9 +127,5 @@ contract Deploy is Script {
authorizedCallers[0] = address(bondEscalationModule);
bondEscalationAccounting = new BondEscalationAccounting(oracle, authorizedCallers);
console.log('BOND_ESCALATION_ACCOUNTING_EXTENSION:', address(bondEscalationAccounting));

// Deploy circuit resolver module
circuitResolverModule = new CircuitResolverModule(oracle);
console.log('CIRCUIT_RESOLVER_MODULE:', address(circuitResolverModule));
}
}
Loading
Loading