@reality.eth/contracts 3.0.80 → 3.2.0

package/generated/contracts.json

@@ -324,6 +324,12 @@
                 "arbitrators": {
                     "0x29f39de98d750eb77b5fafb31b2837f079fce222": "Kleros"
                 }
+            },
+            "RealityETH-3.2": {
+                "address": "0xEb51d9d9717906c981C57af09C4a3449eF30705b",
+                "block": 39142627,
+                "notes": null,
+                "arbitrators": {}
             }
         }
     },
@@ -477,6 +483,12 @@
                 "block": 10438389,
                 "notes": null,
                 "arbitrators": {}
+            },
+            "RealityETH-3.2": {
+                "address": "0x012fb3aDce7D60672cF634e730927Fa5822b3cAb",
+                "block": 14880291,
+                "notes": null,
+                "arbitrators": {}
             }
         }
     },
@@ -626,6 +638,12 @@
                 "arbitrators": {
                     "0x05b942faecfb3924970e3a28e0f230910cedff45": "Kleros"
                 }
+            },
+            "RealityETH-3.2": {
+                "address": "0xB7982f20CC159a40eba4b0eA86fd6cbA6Ff810e1",
+                "block": 7898415,
+                "notes": null,
+                "arbitrators": {}
             }
         }
     },
@@ -652,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.80",
+  "version": "3.2.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": "4a690cfacbd1d55ccda7f5c26686853cc5c8cb0f",
+  "gitHead": "3657381c3ba9f62bb6d3f07e59e38f7cebf8ffdd",
   "dependencies": {
     "ethers": "^5.8.0"
   }

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',