@reality.eth/contracts 3.0.7 → 3.0.10

package/non_standard_deployments/zksync2/deploy/deploy.ts

@@ -1,3 +1,6 @@
+/*
+Set the token address, it shouldn't be 0x000000000000000000000000000000000000800A
+*/
 
 import { utils, Wallet } from "zksync-web3";
 import * as ethers from "ethers";
@@ -17,7 +20,7 @@ export default async function (hre: HardhatRuntimeEnvironment) {
 
   // Create deployer object and load the artifact of the contract we want to deploy.
   const deployer = new Deployer(hre, wallet);
-  const artifact = await deployer.loadArtifact("RealityETH_ERC20_v3_0");
+  const artifact = await deployer.loadArtifact("RealityETH_v3_0");
 
   /*
   // Deposit some funds to L2 in order to be able to perform L2 transactions.
@@ -38,6 +41,7 @@ export default async function (hre: HardhatRuntimeEnvironment) {
   const contractAddress = realityContract.address;
   console.log(`${artifact.contractName} was deployed to ${contractAddress}`);
 
+  /*
   // Edit the greeting of the contract
   const token = "0x000000000000000000000000000000000000800A"
   const setTokenHandle = await realityContract.setToken(token);
@@ -49,5 +53,6 @@ export default async function (hre: HardhatRuntimeEnvironment) {
   } else {
     console.error(`Contract said something unexpected: ${tokenFromContract}`);
   }
+  */
 }
 

package/non_standard_deployments/zksync2/deploy/deploy_erc20.ts

@@ -0,0 +1,56 @@
+/*
+Set the token address, it shouldn't be 0x000000000000000000000000000000000000800A
+*/
+
+import { utils, Wallet } from "zksync-web3";
+import * as ethers from "ethers";
+import { HardhatRuntimeEnvironment } from "hardhat/types";
+import { Deployer } from "@matterlabs/hardhat-zksync-deploy";
+const fs = require('fs');
+
+// An example of a deploy script that will deploy and call a simple contract.
+export default async function (hre: HardhatRuntimeEnvironment) {
+  console.log(`Running deploy script for the reality.eth contract`);
+
+  const key_file = '/home/ed/secrets/zksync_goerli.sec';
+  const priv = fs.readFileSync(key_file, 'utf8').replace(/\n$/, "");
+
+  // Initialize the wallet.
+  const wallet = new Wallet(priv);
+
+  // Create deployer object and load the artifact of the contract we want to deploy.
+  const deployer = new Deployer(hre, wallet);
+  const artifact = await deployer.loadArtifact("RealityETH_ERC20_v3_0");
+
+  /*
+  // Deposit some funds to L2 in order to be able to perform L2 transactions.
+  const depositAmount = ethers.utils.parseEther("0.00001");
+  const depositHandle = await deployer.zkWallet.deposit({
+    to: deployer.zkWallet.address,
+    token: utils.ETH_ADDRESS,
+    amount: depositAmount,
+  });
+  // Wait until the deposit is processed on zkSync
+  await depositHandle.wait();
+ */
+
+  // Deploy this contract. The returned object will be of a `Contract` type, similarly to ones in `ethers`.
+  const realityContract = await deployer.deploy(artifact, []);
+
+  // Show the contract info.
+  const contractAddress = realityContract.address;
+  console.log(`${artifact.contractName} was deployed to ${contractAddress}`);
+
+  // Edit the greeting of the contract
+  const token = "0x000000000000000000000000000000000000800A"
+  const setTokenHandle = await realityContract.setToken(token);
+  await setTokenHandle.wait();
+
+  const tokenFromContract = await realityContract.token();
+  if (tokenFromContract == token) {
+    console.log(`Contract greets us with ${token}!`);
+  } else {
+    console.error(`Contract said something unexpected: ${tokenFromContract}`);
+  }
+}
+

package/package.json

@@ -1,12 +1,12 @@
 {
   "name": "@reality.eth/contracts",
-  "version": "3.0.7",
+  "version": "3.0.10",
   "description": "Collection of smart contracts for the Realitio fact verification platform",
   "scripts": {
     "generate-chains": "node scripts/generate_chains_json.js",
     "generate-contracts": "node scripts/generate_contract_json.js",
     "generate-tokens": "node scripts/generate_token_json.js",
-    "generate": "node scripts/generate_token_json.js && node scripts/generate_chains_json.js && node scripts/generate_contract_json.js"
+    "generate": "node scripts/generate_token_json.js && node scripts/generate_chains_json.js && node scripts/generate_contract_json.js && node scripts/generate_factory_json.js"
   },
   "main": "index.js",
   "keywords": [
@@ -30,7 +30,7 @@
     "url": "https://github.com/RealityETH/monorepo/issues"
   },
   "homepage": "https://reality.eth.link",
-  "gitHead": "90c0439e77228028629bd5433698b2022b3f7eb6",
+  "gitHead": "eb91a74ab4008aad90abffe25e0f6d0d1e5e68af",
   "dependencies": {
     "ethers": "^5.6.8"
   }

package/scripts/deploy.js

@@ -15,9 +15,9 @@ const defaultConfigs = {
 //    maxPriorityFeePerGas:  1000000000,
     //gasPrice: 70000000000
     // gasPrice: 10000, // optimism 1000000,
-    gasPrice: 5000000000,
+    /// gasPrice: 5000000000,
     // gasLimit: 6000000, // optimism 4500000
-    gasLimit: 4500000,
+    // gasLimit: 4500000,
     //etherscanApiKey: 'TPA4BFDDIH8Q7YBQ4JMGN6WDDRRPAV6G34'
     // gasLimit: 155734867 // arbitrum
 }
@@ -50,7 +50,7 @@ const chains = {
     'kintsugi': 1337702,
 }
 const non_infura_chains = {
-    'xdai': 'https://xdai.poanetwork.dev',
+    'xdai': 'https://rpc.ankr.com/gnosis',
     'sokol': 'https://sokol.poa.network',
     'bsc': 'https://bsc-dataseed.binance.org',
     'polygon': 'https://rpc-mainnet.maticvigil.com',
@@ -69,7 +69,11 @@ function constructContractTemplate(contract_name) {
     try {
         abi = JSON.parse(fs.readFileSync(project_base + '/abi/solc-0.4.25/'+contract_name+'.abi.json'));
     } catch(e) {
-        abi = JSON.parse(fs.readFileSync(project_base + '/abi/solc-0.8.6/'+contract_name+'.abi.json'));
+        try {
+            abi = JSON.parse(fs.readFileSync(project_base + '/abi/solc-0.8.6/'+contract_name+'.abi.json'));
+        } catch(e) {
+            abi = JSON.parse(fs.readFileSync(project_base + '/abi/solc-0.8.10/'+contract_name+'.abi.json'));
+        }
     }
     const bytecode = fs.readFileSync(project_base + '/bytecode/'+contract_name+'.bin', 'utf8').replace(/\n/, ''); 
     //console.log('bytecode', bytecode);
@@ -82,7 +86,7 @@ function constructContractTemplate(contract_name) {
 
 function usage_error(msg) {
     msg = msg + "\n";
-    msg += "Usage: node deploy.js <RealityETH|Arbitrator|ERC20> <version> <chain_name> <token_name> [<dispute_fee>] [<arbitrator_owner>]";
+    msg += "Usage: node deploy.js <RealityETH|Arbitrator|ERC20|Factory> <version> <chain_name> <token_name> [<dispute_fee>] [<arbitrator_owner>]";
     throw msg;
 }
 
@@ -126,6 +130,8 @@ if (task == 'RealityETH') {
     deployArbitrator();
 } else if (task == 'ERC20') {
     deployERC20();
+} else if (task == 'Factory') {
+    deployFactory();
 }
 
 function ensure_chain_directory_exists(chain, token) {
@@ -136,6 +142,13 @@ function ensure_chain_directory_exists(chain, token) {
             recursive: true
         });
     }
+    const dir2 = project_base + '/chains/factories/' + chain;
+    if (!fs.existsSync(dir2)) {
+        console.log('creating directory for factories', chain, dir);
+        fs.mkdirSync(dir2, {
+            recursive: true
+        });
+    }
     return true;
 }
 
@@ -145,6 +158,13 @@ function store_deployed_contract(template, chain_id, token_name, out_json) {
     console.log('wrote file', file);
 }
 
+function store_deployed_factory_contract(template, chain_id, out_json) {
+    const file = project_base + '/chains/factories/' + chain_id + '/' + template + '.json';
+    fs.writeFileSync(file, JSON.stringify(out_json, null, 4));
+    console.log('wrote file', file);
+}
+
+
 function provider_for_chain() {
     if (non_infura_chains[chain]) {
         console.log('Using chain', non_infura_chains[chain]);
@@ -334,3 +354,43 @@ function deployERC20() {
         //result.setToken(result.contractAddress);
     });
 }
+
+async function deployFactory() {
+    
+    const config = rc.realityETHConfig(chain_id, token_name, version); 
+    const lib = config.address;
+
+    var tmpl = realityETHName();
+
+    var txt = 'deploying reality.eth factory [library '+lib+']';
+
+    const provider = provider_for_chain();
+    const t = constructContractTemplate('RealityETH_ERC20_Factory');
+    const signer = new ethers.Wallet(priv, provider);
+    const confac = new ethers.ContractFactory(t.abi, t.bytecode, signer);
+    // console.log(signer);
+
+    txt = txt + ' (from address ' + signer.address + ')';
+    console.log(txt);
+
+    await waitForGas(provider);
+
+    confac.deploy(lib, defaultConfigs).then(function(result) {
+        const txid = result.deployTransaction.hash;
+        const address = result.address;
+        console.log('storing address', address);
+        console.log('deploying at address with tx ', txid);
+        result.deployed().then(function(depres) {
+            // console.log('depres', depres);
+            const settings = {
+                "address": address,
+                "block": depres.provider._lastBlockNumber,
+                "library_address": lib,
+            }
+
+            //console.log('result was', result);
+            store_deployed_factory_contract(tmpl, chain_id, settings); 
+        });
+
+    });
+}

package/scripts/generate_factory_json.js

@@ -0,0 +1,26 @@
+const requireGlob = require('require-glob');
+const fs = require('fs');
+const path = require('path');
+
+var SEPARATOR_PATTERN = /[\\\/]/;
+
+function toCombinedValues(a, b) {
+        return a.concat(b);
+}
+
+function toSplitPath(filePath) {
+        return filePath.split(SEPARATOR_PATTERN);
+}
+
+function keygen(options, fileObj) {
+        var uniquePath = fileObj.path.replace(fileObj.base, '');
+        var parsedPath = path.parse(uniquePath);
+
+        return [parsedPath.dir, parsedPath.name]
+                .map(toSplitPath)
+                .reduce(toCombinedValues)
+                .filter(Boolean);
+}
+
+const all_config = requireGlob.sync('./../chains/factories/*/*.json', {"keygen": keygen});
+fs.writeFileSync(__dirname + '/../generated/factories.json', JSON.stringify(all_config, null, 4));

package/tokens/ETH.json

@@ -5,6 +5,7 @@
         "1": true,  
         "4": true,
         "42": true,
+        "280": true,
         "1337702": true
     }
 }

package/tokens/LINK.json

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

package/chains/deployments/280/WETH/RealityETH_ERC20-3.0.json

@@ -1,8 +0,0 @@
-{
-    "address": "0x7955DFA097Cd5474b2773dFe85F1988014d85C01",
-    "block": 444697,
-    "token_address": "0x000000000000000000000000000000000000800A",
-    "notes": null,
-    "arbitrators": {
-    }
-}

package/tokens/WETH.json

@@ -1,7 +0,0 @@
-{
-    "decimals": 18,
-    "small_number": 10000000000000000,
-    "erc20_chains": {
-        "280": "0x000000000000000000000000000000000000800a"
-    }
-}