@reality.eth/contracts 3.0.79 → 3.1.0

package/generated/contracts.json

@@ -17,8 +17,9 @@
                 "block": 13194676,
                 "notes": null,
                 "arbitrators": {
-                    "0x728cba71a3723caab33ea416cb46e2cc9215a596": "Kleros (General Court)",
-                    "0xf72cfd1b34a91a64f9a98537fe63fbab7530adca": "Kleros DAO Governance (Technical Court)"
+                    "0xFf32eff53459485074b4Db14633252C9dcA3791A": "Kleros General Court",
+                    "0xf72cfd1b34a91a64f9a98537fe63fbab7530adca": "Kleros DAO Governance (Technical Court)",
+                    "0x728cba71a3723caab33ea416cb46e2cc9215a596": "Kleros (Old General Court, deprecated)"
                 }
             }
         },
@@ -323,6 +324,12 @@
                 "arbitrators": {
                     "0x29f39de98d750eb77b5fafb31b2837f079fce222": "Kleros"
                 }
+            },
+            "RealityETH-3.2": {
+                "address": "0xEb51d9d9717906c981C57af09C4a3449eF30705b",
+                "block": 39142627,
+                "notes": null,
+                "arbitrators": {}
             }
         }
     },
@@ -476,6 +483,12 @@
                 "block": 10438389,
                 "notes": null,
                 "arbitrators": {}
+            },
+            "RealityETH-3.2": {
+                "address": "0x012fb3aDce7D60672cF634e730927Fa5822b3cAb",
+                "block": 14880291,
+                "notes": null,
+                "arbitrators": {}
             }
         }
     },
@@ -625,6 +638,12 @@
                 "arbitrators": {
                     "0x05b942faecfb3924970e3a28e0f230910cedff45": "Kleros"
                 }
+            },
+            "RealityETH-3.2": {
+                "address": "0xB7982f20CC159a40eba4b0eA86fd6cbA6Ff810e1",
+                "block": 7898415,
+                "notes": null,
+                "arbitrators": {}
             }
         }
     },
@@ -651,6 +670,12 @@
                 "notes": null,
                 "arbitrators": {}
             },
+            "RealityETH-3.2": {
+                "address": "0x3a9Ef99956021d545214B7021D449ACb20fCF2b3",
+                "block": 240,
+                "notes": null,
+                "arbitrators": {}
+            },
             "RealityETH-4.0": {
                 "address": "0x74549fdf4e00C7c564bB193a911887d8C291b13C",
                 "block": 2,

package/index.js

@@ -1,7 +1,6 @@
 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) {
@@ -28,6 +27,7 @@ function realityETHInstance(config) {
         '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-3.2': require('./abi/solc-0.8.6/RealityETH-3.2.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')
     }
@@ -97,7 +97,7 @@ function tokenConfig(token, chain_id) {
 }
 
 function realityETHConfig(chain_id, token, version) {
-    const versions = ['3.0', '2.1', '2.1-rc1', '2.0'];
+    const versions = ['3.0', '3.2', '2.1', '2.1-rc1', '2.0'];
     const token_info = chainTokenList(chain_id);
     if (!token_info[token]) {
         console.log("Token not found for chain");
@@ -138,7 +138,7 @@ function realityETHConfig(chain_id, token, version) {
 
 function realityETHConfigs(chain_id, token) {
     let configs = {};
-    const versions = ['3.0', '2.1', '2.1-rc1', '2.0'];
+    const versions = ['3.2', '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");
@@ -204,8 +204,19 @@ function walletAddParameters(chain_id) {
     return ret; 
 }
 
-function templateConfig() {
-    return template_config;
+function templateConfig(vernum) {
+    const old_templates = require('./config/templates.json');
+    const new_templates = require('./config/templates_3.2.json'); // This is also backported to 2.2
+    if (vernum == 2.2 || vernum < 3.2) {
+        return old_templates;
+    } else {
+        return new_templates;
+    }
+}
+
+function defaultTemplateIDForType(template_type, vernum) {
+    const tc = templateConfig(vernum);
+    return tc.base_ids[template_type];
 }
 
 function defaultTokenForChain(chain_id) {
@@ -229,11 +240,22 @@ function defaultTokenForChain(chain_id) {
 }
 
 function versionHasFeature(vernum, feature_name) {
+    vernum = ""+vernum;
     if (feature_name == 'min-bond' || feature_name == 'reopen-question') {
         const min_maj = 3;
-        const bits = vernum+"".split('.');    
+        const bits = vernum.split('.');
         const maj = parseInt(bits[0]);
         return (maj >= min_maj);
+    } else if (feature_name == 'description' || feature_name == 'hash-type') {
+        const min_min = 2;
+        const bits = vernum.split('.');
+        const min = parseInt(bits[1]);
+        return (min >= min_min);
+    } else if (feature_name == 'category') {
+        const min_min = 2;
+        const bits = vernum.split('.');
+        const min = parseInt(bits[1]);
+        return (min < min_min);
     } else {
         throw new Error('Feature not known: '+feature_name);
     }
@@ -369,6 +391,7 @@ module.exports.tokenConfig = tokenConfig
 module.exports.chainData = chainData;
 module.exports.walletAddParameters = walletAddParameters;
 module.exports.templateConfig = templateConfig;
+module.exports.defaultTemplateIDForType = defaultTemplateIDForType;
 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.79",
+  "version": "3.1.0",
   "description": "Collection of smart contracts for the Realitio fact verification platform",
   "scripts": {
     "generate-chains": "node scripts/generate_chains_json.js",
@@ -34,7 +34,7 @@
     "url": "https://github.com/RealityETH/monorepo/issues"
   },
   "homepage": "https://reality.eth.link",
-  "gitHead": "1207db24b4b352ec046820a58b4705bba70f3458",
+  "gitHead": "a2085e2003e071267ec59b80da9bc7e52356b5f4",
   "dependencies": {
     "ethers": "^5.8.0"
   }

package/scripts/create_templates.js

@@ -0,0 +1,95 @@
+const fs = require('fs');
+const ethers = require('ethers');
+const project_base = './../';
+const rc = require('../index.js');
+const { join } = require('path');
+const chain_configs = require('./../generated/chains.json');
+
+let secrets_dir = join(__dirname, '../secrets');
+if (process.env.SECRETS) {
+    secrets_dir = process.env.SECRETS;
+}
+
+const deployed_at = null;
+
+var undef;
+
+console.log(process.argv);
+if (process.argv.length > 6 || process.argv.length < 6) {
+    usage_error();
+}
+
+const version = process.argv[2]
+const chain = process.argv[3]
+const token = process.argv[4]
+const template_files = process.argv[5].split(',');
+
+function usage_error(msg) {
+    msg = msg + "\n";
+    msg += "Usage: node create_template.js <version> <chain_name> <token> <template_files>";
+    throw msg;
+}
+
+
+let chain_id;
+let rpc;
+for (const c in chain_configs) {
+    const cn = chain_configs[c].chainName.toLowerCase().replace(' ', '-');
+    if (cn == chain || ""+c == ""+chain) {
+        rpc = chain_configs[c].hostedRPC;
+        chain_id = c;
+        break;
+    }
+    if (chain_configs[c].network_name) {
+        const cn2 = chain_configs[c].network_name.toLowerCase();
+        if (cn2 == chain) {
+            rpc = chain_configs[c].hostedRPC;
+            chain_id = c;
+            break;
+        }
+    }
+}
+
+if (!chain_id) {
+    usage_error("Network unknown");
+}
+
+if (token == undef) {
+    usage_error("token_name not supplied");
+}
+
+const priv = fs.readFileSync(secrets_dir + '/' + chain + '.sec', 'utf8').replace(/\n/, '')
+
+const config = rc.realityETHConfig(chain_id, token, version)
+const contract = rc.realityETHInstance(config);
+console.log('using rpc', rpc);
+const provider = new ethers.providers.JsonRpcProvider(rpc);
+const signer = new ethers.Wallet(priv, provider);
+const ethers_instance = new ethers.Contract(contract.address, contract.abi, signer);
+
+createMultiple(template_files);
+
+async function createMultiple(template_files) {
+    const latest = await provider.getBlock('latest');
+    console.log('starting at block', latest.number);
+    for (let ti=0; ti<template_files.length; ti++) {
+        const template_file = template_files[ti];
+        console.log('template is', template_file)
+        const template_content = fs.readFileSync(template_file, 'utf8');
+        await createTemplate(template_content.trim());
+    }
+}
+
+/*
+function store_deployed_template(template, chain_id, token_name, out_json) {
+    const file = project_base + '/chains/deployments/' + chain_id + '/' + token_name + '/' + template + '.json';
+    fs.writeFileSync(file, JSON.stringify(out_json, null, 4));
+    console.log('wrote file', file);
+}
+*/
+
+async function createTemplate(template_content) {
+    // console.log('creating template', template_content);
+    const tx = await ethers_instance.createTemplate(template_content);
+    // console.log('tx was', tx);
+}

package/scripts/deploy.js

@@ -72,7 +72,7 @@ const chains = {
     'backstopTestnet1': 88558801
 }
 const non_infura_chains = {
-    'gnosis': 'https://rpc.ankr.com/gnosis',
+    'gnosis': 'https://gnosis.oat.farm',
     'scroll-alpha-testnet': 'https://alpha-rpc.scroll.io/l2',
     'sokol': 'https://sokol.poa.network',
     'bsc': 'https://bsc-dataseed.binance.org',
@@ -90,7 +90,7 @@ const non_infura_chains = {
     'optimism': 'https://mainnet.optimism.io',
     'kintsugi': 'https://rpc.kintsugi.themerge.dev',
     'mumbai': 'https://matic-mumbai.chainstacklabs.com',
-    'sepolia': 'https://rpc.sepolia.org',
+    'sepolia': 'https://sepolia.backstop.technology/', // 'https://rpc.sepolia.org',
     'holesky': 'https://ethereum-holesky.publicnode.com',
     'telosevm': 'https://mainnet.telos.net/evm',
     'unichain': 'https://mainnet.unichain.org',

package/scripts/description_templates/1.json

@@ -0,0 +1 @@
+{"title": "%s", "description": "%s", "type": "bool", "category": "%s", "lang": "%s"}

package/scripts/description_templates/2.json

@@ -0,0 +1 @@
+{"title": "%s", "description": "%s", "type": "uint", "decimals": 18, "category": "%s", "lang": "%s"}

package/scripts/description_templates/3.json

@@ -0,0 +1 @@
+{"title": "%s", "description": "%s", "type": "single-select", "outcomes": [%s], "category": "%s", "lang": "%s"}

package/scripts/description_templates/4.json

@@ -0,0 +1 @@
+{"title": "%s", "description": "%s", "type": "multiple-select", "outcomes": [%s], "category": "%s", "lang": "%s"}

package/scripts/description_templates/5.json

@@ -0,0 +1 @@
+{"title": "%s", "description": "%s", "type": "datetime", "category": "%s", "lang": "%s"}

package/scripts/store_template_ids.js

@@ -20,7 +20,8 @@ const settings = require(deployment_json);
 const address = settings.address;
 const chain_data = rc.chainData(chain_id);
 const rpc = chain_data.hostedRPC ? chain_data.hostedRPC : chain_data.rpcUrls[0];
-const start_block = config.block-1;
+const deployment_start_block = config.block-1;
+const start_block = process.argv[3] ? parseInt(process.argv[3]) : deployment_start_block;
 
 const provider = new ethers.providers.JsonRpcProvider(rpc);
 const abi = JSON.parse(fs.readFileSync('../abi/solc-0.8.6/RealityETH-all.abi.json'));