Skip to content
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
5 changes: 4 additions & 1 deletion src/app.js
Original file line number Diff line number Diff line change
Expand Up @@ -1330,8 +1330,11 @@ class App extends React.Component {

console.debug(`🔧 [getMetaEvidence] Final MetaEvidence JSON after normalization:`, metaEvidenceJSON);

//Do not assume cross-chain for POH_V2, otherwise the iframe won't work
const isPOH_V2 = networkMap[this.state.network].POH_V2_CONTRACTS.includes(arbitrableAddress);

// For cross-chain disputes where arbitrable is on Gnosis, ensure correct chainID
if (!metaEvidenceJSON.arbitrableChainID && network === '1') {
if (!isPOH_V2 && !metaEvidenceJSON.arbitrableChainID && network === '1') {
console.debug(`🔧 [getMetaEvidence] Adding arbitrableChainID for cross-chain dispute`);
metaEvidenceJSON.arbitrableChainID = '100'; // Gnosis chain
metaEvidenceJSON.arbitratorChainID = '1'; // Ethereum mainnet
Expand Down
2 changes: 2 additions & 0 deletions src/ethereum/arbitrableWhitelist.js
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ const arbitrableWhitelist = {
"0xf339047c85d0dd2645f2bd802a1e8a5e7af61053",
"0xf65c7560d6ce320cc3a16a07f1f65aab66396b9e",
"0xf72cfd1b34a91a64f9a98537fe63fbab7530adca",
"0xbE9834097A4E97689d9B667441acafb456D0480A"
],
100: [
"0x0b928165a67df8254412483ae8c3b8cc7f2b4d36",
Expand All @@ -49,6 +50,7 @@ const arbitrableWhitelist = {
"0xd5994f15be9987104d9821aa99d1c97227c7c08c",
"0xe04f5791d671d5c4e08ab49b39807087b591ea3e",
"0xf7de5537ecd69a94695fcf4bcdbdee6329b63322",
"0xa4AC94C4fa65Bb352eFa30e3408e64F72aC857bc"
],
};

Expand Down
17 changes: 17 additions & 0 deletions src/ethereum/network-contract-mapping.js
Original file line number Diff line number Diff line change
Expand Up @@ -26,13 +26,16 @@ const arbitratorDeployedAtBlock = {

const ESCROW_V1_ETH_MAINNET_ADDRESSES = ["0xE2Dd8CCe2c33a04215074ADb4B5820B765d8Ed9D", "0x0d67440946949fe293b45c52efd8a9b3d51e2522", "0xC25a0b9681ABF6F090AEd71a8c08fB564b41dab6", "0xBCf0d1AD453728F75e9cFD4358ED187598A45e6c"]
const ESCROW_V1_ETH_SEPOLIA_ADDRESSES = ["0x338f1A474e0FB0ae9E913cFA3d7c6Aa19b92015B", "0x9262c1c7810571B189db83F945e7e8b67abcE1c8", "0x58fc7e398B4a1886695ab2C7fE7c31F49393a8c5", "0x6048002b6E93A4A5d93E902F2427D7472790aC97"]
const POH_V2_MAINNET_ADDRESS = "0xbE9834097A4E97689d9B667441acafb456D0480A"
const POH_V2_GNOSIS_ADDRESS = "0xa4AC94C4fa65Bb352eFa30e3408e64F72aC857bc"

const map = {
1: {
NAME: "Ethereum Mainnet",
KLEROS_LIQUID: arbitrators["1"],
ARBITRABLE_PROXY: ArbitrableProxy.networks[1]?.address,
ESCROW_V1_CONTRACTS: ESCROW_V1_ETH_MAINNET_ADDRESSES,
POH_V2_CONTRACTS: [POH_V2_MAINNET_ADDRESS],
POLICY_REGISTRY: "0xCf1f07713d5193FaE5c1653C9f61953D048BECe4",
WEB3_PROVIDER: process.env.REACT_APP_WEB3_PROVIDER_URL,
CURRENCY_SHORT: "ETH",
Expand All @@ -43,6 +46,7 @@ const map = {
KLEROS_LIQUID: arbitrators["5"],
ARBITRABLE_PROXY: "0x78ac5F189FC6DAB261437a7B95D11cAcf0234FFe",
ESCROW_V1_CONTRACTS: [],
POH_V2_CONTRACTS: [],
POLICY_REGISTRY: "0x28c8A3A2E3c8Cd3F795DB83764316a1129a069bA",
WEB3_PROVIDER: process.env.REACT_APP_WEB3_GOERLI_PROVIDER_URL,
CURRENCY_SHORT: "ETH",
Expand All @@ -53,6 +57,7 @@ const map = {
KLEROS_LIQUID: arbitrators["100"],
ARBITRABLE_PROXY: ArbitrableProxy.networks[100].address,
ESCROW_V1_CONTRACTS: [],
POH_V2_CONTRACTS: [POH_V2_GNOSIS_ADDRESS],
POLICY_REGISTRY: "0x9d494768936b6bDaabc46733b8D53A937A6c6D7e",
WEB3_PROVIDER: process.env.REACT_APP_WEB3_XDAI_PROVIDER_URL,
CURRENCY_SHORT: "xDai",
Expand All @@ -64,6 +69,7 @@ const map = {
FOREIGN_ARBITRATOR_NETWORK_CODE: "1",
ARBITRABLE_PROXY: null,
ESCROW_V1_CONTRACTS: [],
POH_V2_CONTRACTS: [],
POLICY_REGISTRY: policyRegistries["1"],
WEB3_PROVIDER: process.env.REACT_APP_UNICHAIN,
CURRENCY_SHORT: "ETH",
Expand All @@ -75,6 +81,7 @@ const map = {
FOREIGN_ARBITRATOR_NETWORK_CODE: "11155111",
ARBITRABLE_PROXY: null,
ESCROW_V1_CONTRACTS: [],
POH_V2_CONTRACTS: [],
POLICY_REGISTRY: policyRegistries["11155111"],
WEB3_PROVIDER: process.env.REACT_APP_UNICHAIN_SEPOLIA,
CURRENCY_SHORT: "ETH",
Expand All @@ -87,6 +94,7 @@ const map = {
FOREIGN_KLEROS_LIQUID: arbitrators["1"],
FOREIGN_ARBITRATOR_NETWORK_CODE: "1",
ESCROW_V1_CONTRACTS: [],
POH_V2_CONTRACTS: [],
QUERY_FROM_BLOCK: arbitratorDeployedAtBlock["1"],
},
300: {
Expand All @@ -95,6 +103,7 @@ const map = {
FOREIGN_ARBITRATOR_NETWORK_CODE: "11155111",
ARBITRABLE_PROXY: null,
ESCROW_V1_CONTRACTS: [],
POH_V2_CONTRACTS: [],
POLICY_REGISTRY: policyRegistries["11155111"],
WEB3_PROVIDER: "https://sepolia.era.zksync.dev/",
CURRENCY_SHORT: "sETH",
Expand All @@ -106,6 +115,7 @@ const map = {
FOREIGN_ARBITRATOR_NETWORK_CODE: "1",
ARBITRABLE_PROXY: null,
ESCROW_V1_CONTRACTS: [],
POH_V2_CONTRACTS: [],
POLICY_REGISTRY: policyRegistries["1"],
WEB3_PROVIDER: "https://mainnet.era.zksync.io",
CURRENCY_SHORT: "ETH",
Expand All @@ -117,6 +127,7 @@ const map = {
FOREIGN_ARBITRATOR_NETWORK_CODE: "1",
ARBITRABLE_PROXY: null,
ESCROW_V1_CONTRACTS: [],
POH_V2_CONTRACTS: [],
POLICY_REGISTRY: policyRegistries["1"],
WEB3_PROVIDER: process.env.REACT_APP_REDSTONE,
CURRENCY_SHORT: "ETH",
Expand All @@ -128,6 +139,7 @@ const map = {
FOREIGN_ARBITRATOR_NETWORK_CODE: "1",
ARBITRABLE_PROXY: null,
ESCROW_V1_CONTRACTS: [],
POH_V2_CONTRACTS: [],
POLICY_REGISTRY: policyRegistries["1"],
WEB3_PROVIDER: process.env.REACT_APP_ARBITRUM_ONE,
CURRENCY_SHORT: "ETH",
Expand All @@ -139,6 +151,7 @@ const map = {
FOREIGN_ARBITRATOR_NETWORK_CODE: "11155111",
ARBITRABLE_PROXY: null,
ESCROW_V1_CONTRACTS: [],
POH_V2_CONTRACTS: [],
POLICY_REGISTRY: policyRegistries["11155111"],
WEB3_PROVIDER: process.env.REACT_APP_ARBITRUM_SEPOLIA,
CURRENCY_SHORT: "ETH",
Expand All @@ -152,6 +165,7 @@ const map = {
FOREIGN_KLEROS_LIQUID: arbitrators["5"],
FOREIGN_ARBITRATOR_NETWORK_CODE: "5",
ESCROW_V1_CONTRACTS: [],
POH_V2_CONTRACTS: [],
QUERY_FROM_BLOCK: arbitratorDeployedAtBlock["5"],
},
10200: {
Expand All @@ -162,13 +176,15 @@ const map = {
WEB3_PROVIDER: process.env.REACT_APP_WEB3_CHIADO_PROVIDER_URL,
CURRENCY_SHORT: "xDai",
ESCROW_V1_CONTRACTS: [],
POH_V2_CONTRACTS: [],
QUERY_FROM_BLOCK: 1165867,
},
11155111: {
NAME: "Ethereum Testnet Sepolia",
KLEROS_LIQUID: arbitrators["11155111"],
ARBITRABLE_PROXY: "0x009cA5A0B816156F91B29A93d7688c52480BaB24",
ESCROW_V1_CONTRACTS: ESCROW_V1_ETH_SEPOLIA_ADDRESSES,
POH_V2_CONTRACTS: [],
POLICY_REGISTRY: policyRegistries["11155111"],
WEB3_PROVIDER: process.env.REACT_APP_WEB3_SEPOLIA_PROVIDER_URL,
CURRENCY_SHORT: "sETH",
Expand All @@ -180,6 +196,7 @@ const map = {
FOREIGN_ARBITRATOR_NETWORK_CODE: "11155111",
ARBITRABLE_PROXY: null,
ESCROW_V1_CONTRACTS: [],
POH_V2_CONTRACTS: [],
POLICY_REGISTRY: policyRegistries["11155111"],
WEB3_PROVIDER: process.env.REACT_APP_OPTIMISM_SEPOLIA,
CURRENCY_SHORT: "ETH",
Expand Down
Loading