@reality.eth/contracts 3.0.46 → 3.0.48

package/non_standard_deployments/zksync/package.json

@@ -0,0 +1,34 @@
+{
+  "name": "zksync-hardhat-template",
+  "description": "A template for zkSync smart contracts development with Hardhat",
+  "private": true,
+  "author": "Matter Labs",
+  "license": "MIT",
+  "repository": "https://github.com/matter-labs/zksync-hardhat-template.git",
+  "scripts": {
+    "deploy": "hardhat deploy-zksync --script deploy.ts",
+    "interact": "hardhat deploy-zksync --script interact.ts",
+    "compile": "hardhat compile",
+    "clean": "hardhat clean",
+    "test": "hardhat test --network hardhat"
+  },
+  "devDependencies": {
+    "@matterlabs/hardhat-zksync-deploy": "^1.1.2",
+    "@matterlabs/hardhat-zksync-node": "^1.0.1",
+    "@matterlabs/hardhat-zksync-solc": "^1.0.6",
+    "@matterlabs/hardhat-zksync-verify": "^1.2.2",
+    "@matterlabs/zksync-contracts": "^0.6.1",
+    "@nomiclabs/hardhat-etherscan": "^3.1.7",
+    "@openzeppelin/contracts": "^4.6.0",
+    "@types/chai": "^4.3.4",
+    "@types/mocha": "^10.0.1",
+    "chai": "^4.3.7",
+    "dotenv": "^16.0.3",
+    "ethers": "^6.9.2",
+    "hardhat": "^2.12.4",
+    "mocha": "^10.2.0",
+    "ts-node": "^10.9.1",
+    "typescript": "^4.9.5",
+    "zksync-ethers": "^6.0.0"
+  }
+}

package/package.json

@@ -1,12 +1,14 @@
 {
   "name": "@reality.eth/contracts",
-  "version": "3.0.46",
+  "version": "3.0.48",
   "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 && node scripts/generate_factory_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",
+    "fmt": "prettier 'development/contracts/*.sol' -w",
+    "fmt:check": "prettier 'development/contracts/*.sol' -c"
   },
   "main": "index.js",
   "keywords": [
@@ -20,6 +22,8 @@
   "author": "Edmund Edgar (https://reality.eth.link)",
   "license": "GPL-3.0",
   "devDependencies": {
+    "prettier": "^3.2.4",
+    "prettier-plugin-solidity": "^1.3.1",
     "require-glob": "^3.2.0"
   },
   "repository": {
@@ -30,7 +34,7 @@
     "url": "https://github.com/RealityETH/monorepo/issues"
   },
   "homepage": "https://reality.eth.link",
-  "gitHead": "53818da8004aa8227d545643910a0ebc0bdcd8b5",
+  "gitHead": "94611f2560bbff608c8c481d9ed6e65efba70159",
   "dependencies": {
     "ethers": "^5.6.8"
   }

package/scripts/transfer_arbitrator.js

@@ -0,0 +1,60 @@
+const fs = require('fs');
+const ethers = require('ethers');
+
+const usage_message = "Usage: node transfer_arbitrator.js <key> <arbitrator> <to> <rpc>";
+
+const from = process.argv[2]
+
+if (!from) {
+    throw new Error(usage_message);
+}
+
+const arbitrator = process.argv[3]
+if (!arbitrator) {
+    throw new Error(usage_message);
+}
+
+
+const to = process.argv[4]
+if (!to) {
+    throw new Error(usage_message);
+}
+
+const rpc = process.argv[5];
+if (!rpc) {
+    throw new Error(usage_message);
+}
+
+const arb_abi = require('../abi/solc-0.4.25/Arbitrator.abi.json');
+
+// For infura we just pass the network name eg kovan
+const provider = (rpc.startsWith('http')) ? new ethers.providers.JsonRpcProvider(rpc) : new ethers.providers.InfuraProvider(rpc);
+
+const fpriv = fs.readFileSync(from, 'utf8').replace(/\n/, '')
+const f = new ethers.Wallet(fpriv, provider);
+
+transferArbitrator(f, arbitrator, to);
+
+async function transferArbitrator(f, arb, to_addr) {
+
+    const arb_contract = new ethers.Contract(arb, arb_abi, f);
+    
+    const gas_price = await provider.getGasPrice()
+    const nonce = await provider.getTransactionCount(f.address, 'latest')
+    const gas_limit = 80000;
+
+    console.log('Using gas price', gas_price);
+
+    const override_options = {
+        gasLimit: 80000,
+        gasPrice: gas_price,
+        nonce: nonce
+    };
+
+    // console.log(f)
+
+    console.log('Transferring ownership of arbitration contract', arb, 'to address', to_addr);
+    const response = await arb_contract.transferOwnership(to_addr, override_options);
+    console.log('sent tx', response.hash)
+
+};

package/tests/python/requirements.txt

@@ -1,62 +1,63 @@
-aiohttp==3.7.4.post0
-asn1crypto==1.4.0
-async-timeout==3.0.1
-attrs==21.2.0
-base58==2.1.0
-bitarray==1.2.2
+aiohttp==3.9.1
+aiosignal==1.3.1
+asn1crypto==1.5.1
+async-timeout==4.0.3
+attrs==23.2.0
+bitarray==2.9.2
 bitcoin==1.1.42
-blake2b-py==0.1.4
 cached-property==1.5.2
-certifi==2021.5.30
-cffi==1.14.6
-chardet==4.0.0
-charset-normalizer==2.0.3
-coincurve==15.0.0
-cytoolz==0.11.0
-eth-abi==2.1.1
-eth-account==0.5.4
-eth-bloom==1.0.4
-eth-hash==0.3.1
-eth-keyfile==0.5.1
-eth-keys==0.3.3
-eth-rlp==0.2.1
-eth-tester==0.5.0b4
-eth-typing==2.2.2
-eth-utils==1.10.0
+certifi==2023.11.17
+cffi==1.16.0
+charset-normalizer==3.3.2
+coincurve==18.0.0
+cytoolz==0.12.2
+eth-abi==4.2.1
+eth-account==0.10.0
+eth-bloom==3.0.0
+eth-hash==0.5.2
+eth-keyfile==0.7.0
+eth-keys==0.4.0
+eth-rlp==1.0.0
+eth-tester==0.10.0b1
+eth-typing==3.5.2
+eth-utils==2.3.1
 ethereum==2.3.2
-future==0.18.2
-hexbytes==0.2.1
-idna==3.2
-ipfshttpclient==0.7.0
-jsonschema==3.2.0
-lru-dict==1.1.7
-multiaddr==0.0.9
-multidict==5.1.0
-mypy-extensions==0.4.3
-netaddr==0.8.0
-parsimonious==0.8.1
+frozenlist==1.4.1
+future==0.18.3
+hexbytes==0.3.1
+idna==3.6
+importlib-resources==6.1.1
+jsonschema==4.20.0
+jsonschema-specifications==2023.12.1
+lru-dict==1.2.0
+multidict==6.0.4
+mypy-extensions==1.0.0
+parsimonious==0.9.0
 pbkdf2==1.3
-protobuf==3.17.3
-py-ecc==4.1.0
-py-evm==0.4.0a4
-pycparser==2.20
-pycryptodome==3.10.1
+pkgutil-resolve-name==1.3.10
+protobuf==4.25.1
+py-ecc==6.0.0
+py-evm==0.8.0b1
+pycparser==2.21
+pycryptodome==3.19.1
 pyethash==0.1.27
-pyrsistent==0.18.0
 pysha3==1.0.2
-PyYAML==5.4.1
+pyunormalize==15.1.0
+PyYAML==6.0.1
+referencing==0.32.1
+regex==2023.12.25
 repoze.lru==0.7
-requests==2.26.0
-rlp==2.0.1
-scrypt==0.8.18
-semantic-version==2.8.5
-six==1.16.0
+requests==2.31.0
+rlp==3.0.0
+rpds-py==0.16.2
+scrypt==0.8.20
+semantic-version==2.10.0
 sortedcontainers==2.4.0
-toolz==0.11.1
-trie==2.0.0a5
-typing-extensions==3.10.0.0
-urllib3==1.26.6
-varint==1.0.2
-web3==5.21.0
-websockets==9.1
-yarl==1.6.3
+toolz==0.12.0
+trie==2.2.0
+typing-extensions==4.9.0
+urllib3==2.1.0
+web3==6.13.0
+websockets==12.0
+yarl==1.9.4
+zipp==3.17.0