@reality.eth/contracts 3.0.12 → 3.0.15

package/chains/deployments/5/ETH/RealityETH-3.0.json

@@ -1,6 +1,6 @@
 {
     "address": "0x6F80C5cBCF9FbC2dA2F0675E56A5900BB70Df72f",
-    "block": 7313547,
+    "block": 7313546,
     "notes": null,
     "arbitrators": {}
 }

package/chains/deployments/80001/MATIC/RealityETH-3.0.json

@@ -0,0 +1,6 @@
+{
+    "address": "0x92115220C28e78312cCe86f3d1dE652CFBD0357A",
+    "block": 27425354,
+    "notes": null,
+    "arbitrators": {}
+}

package/chains/supported.json

@@ -72,6 +72,12 @@
          "explorerURL": "https://zksync2-testnet.zkscan.io",
          "network_name": "zkSync2-testnet"
     },
+    "80001": {
+         "hostedRPC": "https://rpc.ankr.com/polygon_mumbai",
+         "graphURL": "https://api.thegraph.com/subgraphs/name/realityeth/realityeth-mumbai",
+         "explorerURL": "https://mumbai.polygonscan.com",
+         "network_name": "mumbai"
+    },
     "43114": {
         "explorerURL": "https://cchain.explorer.avax.network/",
         "graphURL": "https://api.thegraph.com/subgraphs/name/realityeth/realityeth-ava",

package/generated/chains.json

@@ -317,6 +317,26 @@
             "https://cchain.explorer.avax.network/"
         ]
     },
+    "80001": {
+        "chainId": "0x13881",
+        "chainName": "Mumbai",
+        "nativeCurrency": {
+            "name": "MATIC",
+            "symbol": "MATIC",
+            "decimals": 18
+        },
+        "network_name": "mumbai",
+        "rpcUrls": [
+            "https://matic-mumbai.chainstacklabs.com",
+            "https://rpc-mumbai.maticvigil.com",
+            "https://matic-testnet-archive-rpc.bwarelabs.com"
+        ],
+        "hostedRPC": "https://rpc.ankr.com/polygon_mumbai",
+        "graphURL": "https://api.thegraph.com/subgraphs/name/realityeth/realityeth-mumbai",
+        "blockExplorerUrls": [
+            "https://mumbai.polygonscan.com"
+        ]
+    },
     "421611": {
         "chainId": "0x66eeb",
         "chainName": "Arbitrum Rinkeby",

package/generated/contracts.json

@@ -122,16 +122,6 @@
                 }
             }
         },
-        "LINK": {
-            "RealityETH_ERC20-3.0": {
-                "address": "0x4a38a9EdE2f997E97Cac2D7BF8e002Ec20d2c2Ca",
-                "block": 11107294,
-                "token_address": "0x01be23585060835e02b77ef475b0cc51aa1e0709",
-                "notes": null,
-                "arbitrators": {},
-                "factory_address": "0x9e862794f4f80386185b9d3baa532668e988c530"
-            }
-        },
         "TRST": {
             "Arbitrator": {
                 "address": "0xa682C58333F4959cbF728c2a871548E3D8978Fa2",
@@ -153,7 +143,7 @@
         "ETH": {
             "RealityETH-3.0": {
                 "address": "0x6F80C5cBCF9FbC2dA2F0675E56A5900BB70Df72f",
-                "block": 7313547,
+                "block": 7313546,
                 "notes": null,
                 "arbitrators": {}
             }
@@ -424,6 +414,16 @@
             }
         }
     },
+    "80001": {
+        "MATIC": {
+            "RealityETH-3.0": {
+                "address": "0x92115220C28e78312cCe86f3d1dE652CFBD0357A",
+                "block": 27425354,
+                "notes": null,
+                "arbitrators": {}
+            }
+        }
+    },
     "421611": {
         "ARETH": {
             "Arbitrator": {

package/generated/tokens.json

@@ -44,7 +44,8 @@
         "decimals": 18,
         "small_number": 1000000000000000000,
         "native_chains": {
-            "137": true
+            "137": true,
+            "80001": true
         }
     },
     "OETH": {
@@ -99,13 +100,6 @@
             "100": "0x9C58BAcC331c9aa871AFD802DB6379a98e80CEdb"
         }
     },
-    "LINK": {
-        "decimals": 18,
-        "small_number": 1000000000000000000,
-        "erc20_chains": {
-            "4": "0x01be23585060835e02b77ef475b0cc51aa1e0709"
-        }
-    },
     "POLK": {
         "decimals": 18,
         "small_number": 1000000000000000000,

package/index.js

@@ -1,7 +1,26 @@
-const all_config = require('./generated/contracts.json');
-const token_info = require('./generated/tokens.json');
+let all_config = require('./generated/contracts.json');
+let token_info = require('./generated/tokens.json');
 const chain_info = require('./generated/chains.json');
 const template_config = require('./config/templates.json');
+const factory_config = require('./generated/factories.json');
+
+function populateImports(imported_contracts, chain_id) {
+    for(var ctr in imported_contracts) {
+        let to_imp = imported_contracts[ctr];
+        to_imp.realityETH= ctr; 
+        const imp = tokenAndContractConfigFromFactory(to_imp, chain_id); 
+        const token = imp.token.ticker;
+        if (!all_config[chain_id][token]) {
+            all_config[chain_id][token] = {};
+        }
+        const ver = imp.contract.version_number;
+        all_config[chain_id][token][ver] = imp.contract;
+
+        if (!token_info[token]) {
+            token_info[token] = imp.token;
+        }
+    }
+}
 
 function realityETHInstance(config) {
     const abis = {
@@ -35,7 +54,7 @@ function arbitratorInstance(chain_id) {
 function erc20Instance(config) {
     const abi = require('./abi/solc-0.4.25/ERC20.abi.json');
     if (!config.token_address) {
-        console.log('config', config);
+        // console.log('config', config);
         throw new Error("token address for erc20 instance not found");
         return null;
     }
@@ -165,7 +184,7 @@ function isChainSupported(chain_id) {
 function walletAddParameters(chain_id) {
     var params = ['chainId', 'chainName', 'nativeCurrency', 'rpcUrls', 'blockExplorerUrls']
     var ret = {};
-console.log('looking for config for chain', chain_id);
+    // console.log('looking for config for chain', chain_id);
     var config = chain_info[""+chain_id];
     for (var i=0; i<params.length; i++) {
         var item = params[i];
@@ -209,6 +228,93 @@ function versionHasFeature(vernum, feature_name) {
     }
 }
 
+function factoryConfigForAddress(address, chain_id) {
+
+    for(var cid in factory_config) {
+        if (chain_id && cid != chain_id) {
+            continue;
+        }
+        for(var ver in factory_config[cid]) {
+            const config = factory_config[cid][ver];
+            if (address.toLowerCase() == config.address.toLowerCase()) {
+                return config;
+            }
+        }
+    }
+    return null;
+
+}
+
+function configForAddress(addr, chain_id) {
+    for(var cid in all_config) {
+        if (chain_id && cid != chain_id) {
+            continue;
+        }
+        for(var ticker in all_config[cid]) {
+            for(var ver in all_config[cid][ticker]) {
+                const config = all_config[cid][ticker][ver];
+                if (addr.toLowerCase() == config.address.toLowerCase()) {
+                    if (!config.arbitrators) {
+                        config.arbitrators = [];
+                    }
+                    const [contract_name, contract_version] = ver.split('-');
+                    config.version_number = ver;
+                    config.chain_id = cid;
+                    config.contract_name = contract_name;
+                    config.contract_version = contract_version;
+                    return config;
+                }
+            }
+        }
+    }
+    return null;
+
+}
+
+function factoryList(chain_id) {
+    if (!factory_config[chain_id]) {
+        return {};
+    }
+    return factory_config[chain_id];
+}
+
+function tokenAndContractConfigFromFactory(factory_data, chain_id) {
+    // Get the library for the factory
+    const factory_config = factoryConfigForAddress(factory_data.factory, chain_id);
+
+    const template_orig = configForAddress(factory_config.library_address, chain_id);
+    let template = {};
+    for (let k in template_orig) {
+      template[k] = template_orig[k];
+    }
+
+    if (!template) {
+        console.log('no template found for', factory_data, factory_config, chain_id);
+        return null;
+    }
+
+    template.address = factory_data.realityETH;
+    template.block = parseInt(factory_data.createdBlock);
+    template.token_address = factory_data.token_address;
+    template.token_ticker = factory_data.token_symbol;
+
+    const erc20_chains_val = {};
+    erc20_chains_val[chain_id] = factory_data.token_address;
+
+    return {
+        'token': {
+            'ticker': factory_data.token_symbol,
+            'decimals': factory_data.token_decimals,
+            'is_native': false,
+            'small_number': 1000000000000000000,
+            'erc20_chains': erc20_chains_val
+        },
+        'contract': template
+    }
+        
+}
+
+
 module.exports.realityETHConfig = realityETHConfig;
 module.exports.realityETHConfigs = realityETHConfigs;
 module.exports.realityETHInstance = realityETHInstance;
@@ -222,3 +328,7 @@ module.exports.templateConfig = templateConfig;
 module.exports.defaultTokenForChain = defaultTokenForChain;
 module.exports.versionHasFeature = versionHasFeature;
 module.exports.isChainSupported = isChainSupported;
+module.exports.factoryList = factoryList;
+module.exports.tokenAndContractConfigFromFactory = tokenAndContractConfigFromFactory;
+module.exports.configForAddress = configForAddress;
+module.exports.populateImports = populateImports;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@reality.eth/contracts",
-  "version": "3.0.12",
+  "version": "3.0.15",
   "description": "Collection of smart contracts for the Realitio fact verification platform",
   "scripts": {
     "generate-chains": "node scripts/generate_chains_json.js",
@@ -30,7 +30,7 @@
     "url": "https://github.com/RealityETH/monorepo/issues"
   },
   "homepage": "https://reality.eth.link",
-  "gitHead": "f9933bfbc17dd8a796e0c3200acc4bd098e9aaaf",
+  "gitHead": "4601364942fcc90d5f93f10f53e3934c7e772d46",
   "dependencies": {
     "ethers": "^5.6.8"
   }

package/scripts/deploy.js

@@ -11,13 +11,14 @@ const deployed_at = null;
 var undef;
 
 const defaultConfigs = {
-//    maxFeePerGas:         61000000000,
-//    maxPriorityFeePerGas:  1000000000,
+     //maxFeePerGas:         610000000000,
+     //maxPriorityFeePerGas:  10000000000,
     //gasPrice: 70000000000
+    // gasPrice:   10000000000,
     // gasPrice: 10000, // optimism 1000000,
     /// gasPrice: 5000000000,
     // gasLimit: 6000000, // optimism 4500000
-    // gasLimit: 4500000,
+    gasLimit: 4500000,
     //etherscanApiKey: 'TPA4BFDDIH8Q7YBQ4JMGN6WDDRRPAV6G34'
     // gasLimit: 155734867 // arbitrum
 }
@@ -43,6 +44,7 @@ const chains = {
     'cheapeth': 777,
     'xdai': 100,
     'polygon': 137,
+    'mumbai': 80001,
     'ava': 43114,
     'arbitrum': 42161,
     'arbitrum-rinkeby': 421611,
@@ -62,6 +64,7 @@ const non_infura_chains = {
     'kovan-optimistic': 'https://kovan.optimism.io',
     'optimism': 'https://mainnet.optimism.io',
     'kintsugi': 'https://rpc.kintsugi.themerge.dev',
+    'mumbai': 'https://matic-mumbai.chainstacklabs.com',
 }
 
 function constructContractTemplate(contract_name) {

package/tokens/MATIC.json

@@ -2,6 +2,7 @@
     "decimals": 18,
     "small_number": 1000000000000000000,
     "native_chains": {
-        "137": true
+        "137": true,
+        "80001": true
     }
 }

package/chains/deployments/4/LINK/RealityETH_ERC20-3.0.json

@@ -1,8 +0,0 @@
-{
-    "address": "0x4a38a9EdE2f997E97Cac2D7BF8e002Ec20d2c2Ca",
-    "block": 11107294,
-    "token_address": "0x01be23585060835e02b77ef475b0cc51aa1e0709",
-    "notes": null,
-    "arbitrators": {},
-    "factory_address": "0x9e862794f4f80386185b9d3baa532668e988c530"
-}

package/tokens/LINK.json

@@ -1,7 +0,0 @@
-{
-    "decimals": 18,
-    "small_number": 1000000000000000000,
-    "erc20_chains": {
-        "4": "0x01be23585060835e02b77ef475b0cc51aa1e0709"
-    }
-}