Merge remote-tracking branch 'origin/master'

Author: bonustrack

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "@snapshot-labs/snapshot.js",
-  "version": "0.2.18",
+  "version": "0.3.0",
   "repository": "snapshot-labs/snapshot.js",
   "license": "MIT",
   "main": "dist/snapshot.cjs.js",
@@ -9,14 +9,10 @@
   "types": "dist/index.d.ts",
   "dependencies": {
     "@ethersproject/abi": "^5.0.4",
-    "@ethersproject/address": "^5.0.4",
-    "@ethersproject/bignumber": "^5.0.12",
     "@ethersproject/bytes": "^5.0.8",
     "@ethersproject/contracts": "^5.0.3",
     "@ethersproject/hash": "^5.0.9",
     "@ethersproject/providers": "^5.3.1",
-    "@ethersproject/solidity": "^5.0.10",
-    "@ethersproject/strings": "^5.0.5",
     "@ethersproject/wallet": "^5.4.0",
     "ajv": "^8.6.0",
     "ajv-formats": "^2.1.0",

package.json

@@ -437,13 +437,12 @@
   },
   "42161": {
     "key": "42161",
-    "disabled": true,
     "name": "Arbitrum One",
     "chainId": 42161,
     "network": "Arbitrum mainnet",
     "multicall": "0x7A7443F8c577d537f1d8cD4a629d40a3148Dd7ee",
     "rpc": [
-      "https://arb-mainnet.g.alchemy.com/v2/m_ihy38lo1YvShY4RP8JMJncWLudTCQY"
+      "https://arb-mainnet.g.alchemy.com/v2/JDvtNGwnHhTltIwfnxQocKwKkCTKA1DL"
     ],
     "explorer": "https://arbiscan.io"
   },

src/networks.json

@@ -50,7 +50,7 @@ export default class Client {
     if (web3 instanceof Wallet) signer = web3;
     if (web3 instanceof Web3Provider) signer = web3.getSigner();
     if (!message.from) message.from = address;
-    if (!message.timestamp) message.timestamp = ~~(Date.now() / 1e3);
+    if (!message.timestamp) message.timestamp = parseInt((Date.now() / 1e3).toFixed());
     const data: any = { domain, types, message };
     const sig = await signer._signTypedData(domain, data.types, message);
     console.log('Sign', { address, sig, data });

src/sign/index.ts

@@ -1,7 +1,7 @@
 import fetch from 'cross-fetch';
 import { Interface } from '@ethersproject/abi';
 import { Contract } from '@ethersproject/contracts';
-import { StaticJsonRpcProvider } from '@ethersproject/providers';
+import { namehash } from '@ethersproject/hash';
 import { jsonToGraphQLQuery } from 'json-to-graphql-query';
 import Ajv from 'ajv';
 import addFormats from 'ajv-formats';
@@ -19,8 +19,6 @@ export const SNAPSHOT_SUBGRAPH_URL = {
   '42': 'https://api.thegraph.com/subgraphs/name/snapshot-labs/snapshot-kovan'
 };
 
-export const SNAPSHOT_SCORE_API = 'https://score.snapshot.org/api/scores';
-
 export async function call(provider, abi: any[], call: any[], options?) {
   const contract = new Contract(call[0], abi, provider);
   try {
@@ -116,9 +114,9 @@ export async function getScores(
   space: string,
   strategies: any[],
   network: string,
-  provider: StaticJsonRpcProvider | string,
   addresses: string[],
-  snapshot: number | string = 'latest'
+  snapshot: number | string = 'latest',
+  scoreApiUrl = 'https://score.snapshot.org/api/scores'
 ) {
   try {
     const params = {
@@ -128,7 +126,7 @@ export async function getScores(
       strategies,
       addresses
     };
-    const res = await fetch(SNAPSHOT_SCORE_API, {
+    const res = await fetch(scoreApiUrl, {
       method: 'POST',
       headers: { 'Content-Type': 'application/json' },
       body: JSON.stringify({ params })
@@ -149,6 +147,36 @@ export function validateSchema(schema, data) {
   return valid ? valid : validate.errors;
 }
 
+export async function getSpaceUri(id) {
+  const abi =
+    'function text(bytes32 node, string calldata key) external view returns (string memory)';
+  const address = '0x4976fb03C32e5B8cfe2b6cCB31c09Ba78EBaBa41';
+
+  let uri: any = false;
+  try {
+    const hash = namehash(id);
+    const provider = getProvider('1');
+    uri = await call(
+      provider,
+      [abi],
+      [address, 'text', [hash, 'snapshot']]
+    );
+  } catch (e) {
+    console.log('getSpaceUriFromTextRecord failed', id, e);
+  }
+  return uri;
+}
+
+export function clone(item) {
+  return JSON.parse(JSON.stringify(item));
+}
+
+export async function sleep(time) {
+  return new Promise(resolve => {
+    setTimeout(resolve, time);
+  });
+}
+
 export default {
   call,
   multicall,
@@ -158,6 +186,9 @@ export default {
   sendTransaction,
   getScores,
   validateSchema,
+  getSpaceUri,
+  clone,
+  sleep,
   getProvider,
   signMessage,
   getBlockNumber,

src/utils.ts

@@ -42,7 +42,6 @@ export default async function validate(
       space.id || space.key,
       strategies,
       space.network,
-      '',
       [author]
     );
     const totalScore: any = scores

src/validations/aave/index.ts

@@ -20,7 +20,6 @@ export default async function validate(
       space.id || space.key,
       strategies,
       space.network,
-      '',
       [author]
     );
     const totalScore: any = scores