@reality.eth/contracts 3.0.1 → 3.0.4

package/generated/chains.json

@@ -20,7 +20,7 @@
     },
     "3": {
         "chainId": "0x3",
-        "chainName": "Ethereum Testnet Ropsten",
+        "chainName": "Ropsten",
         "nativeCurrency": {
             "name": "Ropsten Ether",
             "symbol": "ROP",
@@ -36,7 +36,7 @@
     },
     "4": {
         "chainId": "0x4",
-        "chainName": "Ethereum Testnet Rinkeby",
+        "chainName": "Rinkeby",
         "nativeCurrency": {
             "name": "Rinkeby Ether",
             "symbol": "RIN",
@@ -52,31 +52,48 @@
     },
     "8": {
         "chainId": "0x8",
-        "chainName": "Ubiq Network Mainnet",
+        "chainName": "Ubiq",
         "nativeCurrency": {
             "name": "Ubiq Ether",
             "symbol": "UBQ",
             "decimals": 18
         },
-        "network_name": "mainnet",
         "rpcUrls": [
             "https://rpc.octano.dev",
             "https://pyrus2.ubiqscan.io"
         ],
         "hostedRPC": "https://rpc.octano.dev",
         "blockExplorerUrls": [
+            "https://ubiqscan.io",
             "https://ubqblockexplorer.com/"
         ]
     },
+    "10": {
+        "chainId": "0xa",
+        "chainName": "Optimism",
+        "nativeCurrency": {
+            "name": "Ether",
+            "symbol": "ETH",
+            "decimals": 18
+        },
+        "rpcUrls": [
+            "https://mainnet.optimism.io/"
+        ],
+        "hostedRPC": "https://mainnet.optimism.io",
+        "graphURL": "https://api.thegraph.com/subgraphs/name/realityeth/realityeth-optimism",
+        "blockExplorerUrls": [
+            "https://optimistic.etherscan.io"
+        ]
+    },
     "42": {
         "chainId": "0x2a",
-        "chainName": "Ethereum Testnet Kovan",
+        "chainName": "Kovan",
         "nativeCurrency": {
             "name": "Kovan Ether",
             "symbol": "KOV",
             "decimals": 18
         },
-        "network_name": "kovan",
+        "network_name": "testnet",
         "rpcUrls": [
             "https://kovan.poa.network",
             "http://kovan.poa.network:8545",
@@ -119,12 +136,29 @@
             "https://www.bscscan.com"
         ]
     },
+    "69": {
+        "chainId": "0x45",
+        "chainName": "Optimism Kovan",
+        "nativeCurrency": {
+            "name": "Kovan Ether",
+            "symbol": "KOR",
+            "decimals": 18
+        },
+        "network_name": "kovan",
+        "rpcUrls": [
+            "https://kovan.optimism.io/"
+        ],
+        "hostedRPC": "https://kovan.optimism.io",
+        "blockExplorerUrls": [
+            "https://kovan-optimistic.etherscan.io"
+        ]
+    },
     "77": {
         "chainId": "0x4d",
         "chainName": "POA Network Sokol",
         "nativeCurrency": {
             "name": "POA Sokol Ether",
-            "symbol": "POA",
+            "symbol": "SPOA",
             "decimals": 18
         },
         "network_name": "poa-sokol",
@@ -141,7 +175,7 @@
     },
     "100": {
         "chainId": "0x64",
-        "chainName": "xDAI Chain",
+        "chainName": "Gnosis",
         "nativeCurrency": {
             "name": "xDAI",
             "symbol": "xDAI",
@@ -149,45 +183,66 @@
         },
         "network_name": "xdai",
         "rpcUrls": [
-            "https://rpc.xdaichain.com",
+            "https://rpc.gnosischain.com",
             "https://xdai.poanetwork.dev",
-            "wss://rpc.xdaichain.com/wss",
-            "wss://xdai.poanetwork.dev/wss",
-            "http://xdai.poanetwork.dev",
             "https://dai.poa.network",
+            "https://rpc.ankr.com/gnosis",
+            "https://gnosischain-rpc.gateway.pokt.network",
+            "wss://rpc.gnosischain.com/wss",
+            "wss://xdai.poanetwork.dev/wss",
             "ws://xdai.poanetwork.dev:8546"
         ],
-        "hostedRPC": "https://rpc.xdaichain.com",
+        "hostedRPC": "https://rpc.gnosischain.com",
         "iconUrls": [
             "https://gblobscdn.gitbook.com/spaces%2F-Lpi9AHj62wscNlQjI-l%2Favatar.png"
         ],
         "graphURL": "https://api.thegraph.com/subgraphs/name/realityeth/realityeth-xdai",
         "blockExplorerUrls": [
+            "https://blockscout.com/xdai/mainnet",
             "https://blockscout.com/poa/xdai/"
         ]
     },
     "137": {
         "chainId": "0x89",
-        "chainName": "Matic(Polygon) Mainnet",
+        "chainName": "Polygon Mainnet",
         "nativeCurrency": {
-            "name": "Matic",
+            "name": "MATIC",
             "symbol": "MATIC",
             "decimals": 18
         },
         "network_name": "matic",
         "rpcUrls": [
+            "https://polygon-rpc.com/",
             "https://rpc-mainnet.matic.network",
-            "wss://ws-mainnet.matic.network",
+            "https://matic-mainnet.chainstacklabs.com",
+            "https://rpc-mainnet.maticvigil.com",
             "https://rpc-mainnet.matic.quiknode.pro",
-            "https://matic-mainnet.chainstacklabs.com"
+            "https://matic-mainnet-full-rpc.bwarelabs.com"
         ],
-        "hostedRPC": "https://rpc-mainnet.matic.network",
+        "hostedRPC": "https://polygon-rpc.com/",
         "graphURL": "https://api.thegraph.com/subgraphs/name/realityeth/realityeth-polygon",
         "blockExplorerUrls": [
             "https://polygonscan.com",
             "https://polygonscan.com/"
         ]
     },
+    "777": {
+        "chainId": "0x309",
+        "chainName": "cheapETH",
+        "nativeCurrency": {
+            "name": "cTH",
+            "symbol": "cTH",
+            "decimals": 18
+        },
+        "network_name": "cheapeth",
+        "rpcUrls": [
+            "https://node.cheapeth.org/rpc"
+        ],
+        "hostedRPC": "https://node.cheapeth.org/rpc",
+        "blockExplorerUrls": [
+            "https://explore.cheapswap.io/"
+        ]
+    },
     "42161": {
         "chainId": "0xa4b1",
         "chainName": "Arbitrum One",
@@ -208,7 +263,7 @@
     },
     "43114": {
         "chainId": "0xa86a",
-        "chainName": "Avalanche Mainnet",
+        "chainName": "Avalanche C-Chain",
         "nativeCurrency": {
             "name": "Avalanche",
             "symbol": "AVAX",
@@ -221,12 +276,13 @@
         "hostedRPC": "https://api.avax.network/ext/bc/C/rpc",
         "graphURL": "https://api.thegraph.com/subgraphs/name/realityeth/realityeth-ava",
         "blockExplorerUrls": [
+            "https://snowtrace.io",
             "https://cchain.explorer.avax.network/"
         ]
     },
     "421611": {
         "chainId": "0x66eeb",
-        "chainName": "Arbitrum Testnet Rinkeby",
+        "chainName": "Arbitrum Rinkeby",
         "nativeCurrency": {
             "name": "Arbitrum Rinkeby Ether",
             "symbol": "ARETH",
@@ -234,12 +290,29 @@
         },
         "network_name": "arbitrum-rinkeby",
         "rpcUrls": [
-            "https://rinkeby.arbitrum.io/rpc",
-            "wss://rinkeby.arbitrum.io/ws"
+            "https://rinkeby.arbitrum.io/rpc"
         ],
         "hostedRPC": "https://rinkeby.arbitrum.io/rpc",
         "blockExplorerUrls": [
+            "https://testnet.arbiscan.io",
             "https://rinkeby-explorer.arbitrum.io"
         ]
+    },
+    "1337702": {
+        "chainId": "0x146966",
+        "chainName": "Kintsugi",
+        "nativeCurrency": {
+            "name": "kintsugi Ethere",
+            "symbol": "kiETH",
+            "decimals": 18
+        },
+        "network_name": "kintsugi",
+        "rpcUrls": [
+            "https://rpc.kintsugi.themerge.dev"
+        ],
+        "hostedRPC": "https://rpc.kintsugi.themerge.dev",
+        "blockExplorerUrls": [
+            "https://explorer.kintsugi.themerge.dev"
+        ]
     }
 }

package/generated/contracts.json

@@ -16,7 +16,10 @@
                 "address": "0x5b7dD1E86623548AF054A4985F7fc8Ccbb554E2c",
                 "block": 13194676,
                 "notes": null,
-                "arbitrators": {}
+                "arbitrators": {
+                    "0x728cba71a3723caab33ea416cb46e2cc9215a596": "Kleros (General Court)",
+                    "0xf72cfd1b34a91a64f9a98537fe63fbab7530adca": "Kleros DAO Governance (Technical Court)"
+                }
             }
         },
         "FOX": {
@@ -46,6 +49,15 @@
                 "arbitrators": {}
             }
         },
+        "SWISE": {
+            "RealityETH_ERC20-3.0": {
+                "address": "0x867092A32bC16816F12Fb326EfF7A2865E1ec138",
+                "block": 14485577,
+                "token_address": "0x48C3399719B582dD63eB5AADf12A40B4C3f52FA2",
+                "notes": null,
+                "arbitrators": {}
+            }
+        },
         "TRST": {
             "RealityETH_ERC20-2.0": {
                 "address": "0x3D3B51b1091d1F6491AeB1916C94BAfe57f6Cc9d",
@@ -98,7 +110,9 @@
                 "address": "0xDf33060F476F8cff7511F806C72719394da1Ad64",
                 "block": 9106451,
                 "notes": null,
-                "arbitrators": {}
+                "arbitrators": {
+                    "0xe27768bdb76a9b742b7ddcfe1539fadaf3b89bc7": "Kleros (General Court)"
+                }
             }
         },
         "TRST": {
@@ -141,6 +155,16 @@
             }
         }
     },
+    "10": {
+        "OETH": {
+            "RealityETH-3.0": {
+                "address": "0x0eF940F7f053a2eF5D6578841072488aF0c7d89A",
+                "block": 2462149,
+                "notes": null,
+                "arbitrators": {}
+            }
+        }
+    },
     "42": {
         "ETH": {
             "RealityETH-2.0": {
@@ -158,7 +182,8 @@
                 "block": 27103177,
                 "notes": null,
                 "arbitrators": {
-                    "0xb9fdd2904cbcc5543F02DB948B2CE59Ef10A950E": "Kleros"
+                    "0x99489d7bb33539f3d1a401741e56e8f02b9ae0cf": "Kleros (General Court)",
+                    "0xb9fdd2904cbcc5543F02DB948B2CE59Ef10A950E": "Kleros DAO Governance (Technical Court)"
                 }
             }
         },
@@ -208,6 +233,25 @@
                 "notes": null,
                 "arbitrators": {}
             }
+        },
+        "DEXE": {
+            "RealityETH_ERC20-3.0": {
+                "address": "0x95f8fc16C7Bd5a5b24CaE629471c6cCC3916826A",
+                "block": 13749748,
+                "token_address": "0x039cb485212f996a9dbb85a9a75d898f94d38da6",
+                "notes": null,
+                "arbitrators": {}
+            }
+        }
+    },
+    "69": {
+        "OETH": {
+            "RealityETH-3.0": {
+                "address": "0x327543eaf65FE0D68333d4D092282cDBA0Bc37a6",
+                "block": 28282,
+                "notes": null,
+                "arbitrators": {}
+            }
         }
     },
     "77": {
@@ -217,9 +261,7 @@
                 "block": 17307142,
                 "token_address": null,
                 "notes": "Same as 2.1 except missing an empty address check",
-                "arbitrators": {
-                    "0x37Fcdb26F12f3FC76F2424EC6B94D434a959A0f7": "Kleros (testing)"
-                }
+                "arbitrators": {}
             },
             "RealityETH-2.1": {
                 "address": "0x90a617ed516ab7fAaBA56CcEDA0C5D952f294d03",
@@ -239,6 +281,24 @@
         }
     },
     "100": {
+        "GNO": {
+            "RealityETH_ERC20-3.0": {
+                "address": "0x95b2b2b4b66A5a47Df79bF07BEBe72E9870fceb2",
+                "block": 20882108,
+                "token_address": "0x9C58BAcC331c9aa871AFD802DB6379a98e80CEdb",
+                "notes": null,
+                "arbitrators": {}
+            }
+        },
+        "SWISE": {
+            "RealityETH_ERC20-3.0": {
+                "address": "0xC9FbdF0df8dE06Ad8d2193F7FA28bdA78c13a102",
+                "block": 21371853,
+                "token_address": "0xfdA94F056346d2320d4B5E468D6Ad099b2277746",
+                "notes": null,
+                "arbitrators": {}
+            }
+        },
         "XDAI": {
             "RealityETH-2.1": {
                 "address": "0x79e32aE03fb27B07C89c0c568F80287C01ca2E57",
@@ -255,7 +315,9 @@
                 "address": "0xE78996A233895bE74a66F451f1019cA9734205cc",
                 "block": 17997262,
                 "notes": null,
-                "arbitrators": {}
+                "arbitrators": {
+                    "0x29f39de98d750eb77b5fafb31b2837f079fce222": "Kleros"
+                }
             }
         }
     },
@@ -282,6 +344,16 @@
             }
         }
     },
+    "777": {
+        "CTH": {
+            "RealityETH-3.0": {
+                "address": "0xF935d11116fA0103Bd340B663879d325673106f0",
+                "block": 13539397,
+                "notes": null,
+                "arbitrators": {}
+            }
+        }
+    },
     "42161": {
         "ARETH": {
             "Arbitrator": {
@@ -337,5 +409,15 @@
                 "arbitrators": {}
             }
         }
+    },
+    "1337702": {
+        "ETH": {
+            "RealityETH-3.0": {
+                "address": "0x45fF90518c92C0AcF5C58784435852B5F0CBD4Be",
+                "block": 47012,
+                "notes": null,
+                "arbitrators": {}
+            }
+        }
     }
 }

package/generated/tokens.json

@@ -21,13 +21,21 @@
             "56": true
         }
     },
+    "CTH": {
+        "decimals": 18,
+        "small_number": 10000000000000000000,
+        "native_chains": {
+            "777": true
+        }
+    },
     "ETH": {
         "decimals": 18,
         "small_number": 10000000000000000,
         "native_chains": {
             "1": true,
             "4": true,
-            "42": true
+            "42": true,
+            "1337702": true
         }
     },
     "MATIC": {
@@ -37,6 +45,14 @@
             "137": true
         }
     },
+    "OETH": {
+        "decimals": 18,
+        "small_number": 10000000000000000000,
+        "native_chains": {
+            "10": true,
+            "69": true
+        }
+    },
     "UBQ": {
         "decimals": 18,
         "small_number": 1000000000000000000,
@@ -59,6 +75,13 @@
             "4": "0x56AE5fd086823d1892BACE27034Eb5531Fcdc3f8"
         }
     },
+    "DEXE": {
+        "decimals": 18,
+        "small_number": 1000000000000000000,
+        "erc20_chains": {
+            "56": "0x039cb485212f996a9dbb85a9a75d898f94d38da6"
+        }
+    },
     "FOX": {
         "decimals": 18,
         "small_number": 1000000000000000000,
@@ -70,7 +93,8 @@
         "decimals": 18,
         "small_number": 10000000,
         "erc20_chains": {
-            "1": "0x6810e776880c02933d47db1b9fc05908e5386b96"
+            "1": "0x6810e776880c02933d47db1b9fc05908e5386b96",
+            "100": "0x9C58BAcC331c9aa871AFD802DB6379a98e80CEdb"
         }
     },
     "POLK": {
@@ -80,6 +104,14 @@
             "42": "0x222E11E134F9AB3750812b37F0DA51B4467EaA7a"
         }
     },
+    "SWISE": {
+        "decimals": 18,
+        "small_number": 1000000000000000000,
+        "erc20_chains": {
+            "1": "0x48C3399719B582dD63eB5AADf12A40B4C3f52FA2",
+            "100": "0xfdA94F056346d2320d4B5E468D6Ad099b2277746"
+        }
+    },
     "TRST": {
         "decimals": 6,
         "small_number": 100000000,

package/index.js

@@ -1,4 +1,3 @@
-const fs = require('fs');
 const all_config = require('./generated/contracts.json');
 const token_info = require('./generated/tokens.json');
 const chain_info = require('./generated/chains.json');
@@ -8,6 +7,7 @@ function realityETHInstance(config) {
     const abis = {
         'RealityETH-2.0': require('./abi/solc-0.8.6/RealityETH-2.0.abi.json'), 
         'RealityETH-2.1': require('./abi/solc-0.8.6/RealityETH-2.1.abi.json'),
+        'RealityETH-2.1-rc1': require('./abi/solc-0.8.6/RealityETH-2.1.abi.json'),
         'RealityETH-3.0': require('./abi/solc-0.8.6/RealityETH-3.0.abi.json'),
         'RealityETH_ERC20-2.0': require('./abi/solc-0.8.6/RealityETH_ERC20-2.0.abi.json'),
         'RealityETH_ERC20-3.0': require('./abi/solc-0.8.6/RealityETH_ERC20-3.0.abi.json')
@@ -50,7 +50,7 @@ function erc20Instance(config) {
 function chainTokenList(chain_id) {
     let ret = {};
     for (t in token_info) {
-        if (all_config[""+chain_id][t]) {
+        if (all_config[""+chain_id] && all_config[""+chain_id][t]) {
             ret[t] = token_info[t];
             ret[t].is_native = (token_info[t].native_chains && token_info[t].native_chains[""+chain_id]);
         }
@@ -78,7 +78,7 @@ function tokenConfig(token, chain_id) {
 }
 
 function realityETHConfig(chain_id, token, version) {
-    const versions = ['2.1', '2.1-rc1', '2.0', '3.0'];
+    const versions = ['3.0', '2.1', '2.1-rc1', '2.0'];
     const token_info = chainTokenList(chain_id);
     if (!token_info[token]) {
         console.log("Token not found for chain");
@@ -118,7 +118,7 @@ function realityETHConfig(chain_id, token, version) {
 
 function realityETHConfigs(chain_id, token) {
     let configs = {};
-    const versions = ['2.1', '2.1-rc1', '2.0', '3.0'];
+    const versions = ['3.0', '2.1', '2.1-rc1', '2.0'];
     const token_info = chainTokenList(chain_id);
     if (!token_info[token]) {
         console.log("Token not found for network");
@@ -158,6 +158,10 @@ function chainData(chain_id) {
     return chain_info[""+chain_id];
 }
 
+function isChainSupported(chain_id) {
+    return (""+chain_id in chain_info);
+}
+
 function walletAddParameters(chain_id) {
     var params = ['chainId', 'chainName', 'nativeCurrency', 'rpcUrls', 'blockExplorerUrls']
     var ret = {};
@@ -217,3 +221,4 @@ module.exports.walletAddParameters = walletAddParameters;
 module.exports.templateConfig = templateConfig;
 module.exports.defaultTokenForChain = defaultTokenForChain;
 module.exports.versionHasFeature = versionHasFeature;
+module.exports.isChainSupported = isChainSupported;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@reality.eth/contracts",
-  "version": "3.0.1",
+  "version": "3.0.4",
   "description": "Collection of smart contracts for the Realitio fact verification platform",
   "scripts": {
     "generate-chains": "node scripts/generate_chains_json.js",
@@ -30,8 +30,8 @@
     "url": "https://github.com/RealityETH/monorepo/issues"
   },
   "homepage": "https://reality.eth.link",
-  "gitHead": "ec3439b604fe5fc18f20ad26cb30f2e511629a71",
+  "gitHead": "585f419ceedf800c2f6bfed357f31bb7fbb3bbcc",
   "dependencies": {
-    "ethers": "^5.4.6"
+    "ethers": "^5.6.8"
   }
 }

package/scripts/deploy.js

@@ -14,7 +14,10 @@ const defaultConfigs = {
 //    maxFeePerGas:         61000000000,
 //    maxPriorityFeePerGas:  1000000000,
     //gasPrice: 70000000000
-    //; gasLimit: 6000000,
+    // gasPrice: 10000, // optimism 1000000,
+    gasPrice: 5000000000,
+    // gasLimit: 6000000, // optimism 4500000
+    gasLimit: 4500000,
     //etherscanApiKey: 'TPA4BFDDIH8Q7YBQ4JMGN6WDDRRPAV6G34'
     // gasLimit: 155734867 // arbitrum
 }
@@ -33,14 +36,18 @@ const chains = {
     'rinkeby': 4,
     'goerli': 5,
     'ubiq': 8,
+    'optimism': 10,
     'kovan': 42,
     'bsc': 56,
     'sokol': 77,
+    'cheapeth': 777,
     'xdai': 100,
     'polygon': 137,
     'ava': 43114,
     'arbitrum': 42161,
-    'arbitrum-rinkeby': 421611
+    'arbitrum-rinkeby': 421611,
+    'kovan-optimistic': 69,
+    'kintsugi': 1337702,
 }
 const non_infura_chains = {
     'xdai': 'https://xdai.poanetwork.dev',
@@ -50,7 +57,11 @@ const non_infura_chains = {
     'ava': 'https://api.avax.network/ext/bc/C/rpc',
     'arbitrum': 'https://arb1.arbitrum.io/rpc',
     'arbitrum-rinkeby': 'https://rinkeby.arbitrum.io/rpc',
-    'ubiq': 'https://rpc.octano.dev'
+    'ubiq': 'https://rpc.octano.dev',
+    'cheapeth': 'https://node.cheapeth.org/rpc',
+    'kovan-optimistic': 'https://kovan.optimism.io',
+    'optimism': 'https://mainnet.optimism.io',
+    'kintsugi': 'https://rpc.kintsugi.themerge.dev',
 }
 
 function constructContractTemplate(contract_name) {

package/scripts/fetch_and_reformat_chains_json.js

@@ -0,0 +1,31 @@
+/*
+Add new lines to the abi file for more meaningful version control
+*/
+
+const request = require('request');
+const fs = require('fs');
+
+const url = 'https://chainid.network/chains.json';
+const out = './../chains/chainid.network.json';
+
+let options = {json: true};
+
+request(url, options, (error, res, body) => {
+    if (error) {
+        console.log(error)
+    };
+
+    if (!error && res.statusCode == 200) {
+        // console.log(body);
+        fs.writeFileSync(out, JSON.stringify(body, null, 4));
+        // do something with JSON, using the 'body' variable
+    };
+});
+// 
+
+
+/*
+
+const file = process.argv[2]
+const abi = JSON.parse(fs.readFileSync(file));
+*/

package/scripts/generate_chains_json.js

@@ -42,6 +42,9 @@ for (var ci = 0; ci< chain_id_list.length; ci++) {
             if (thisr.indexOf('INFURA_API_KEY') !== -1) {
                 continue;
             }
+            if (thisr.indexOf('ALCHEMY_API_KEY') !== -1) {
+                continue;
+            }
             rpc.push(thisr);
         }
     }