@snapshot-labs/snapshot.js 0.14.17 → 0.14.19

package/dist/src/sign/types.d.ts

@@ -163,24 +163,6 @@ export declare const voteStringTypes: {
         type: string;
     }[];
 };
-export declare const vote2Types: {
-    Vote: {
-        name: string;
-        type: string;
-    }[];
-};
-export declare const voteArray2Types: {
-    Vote: {
-        name: string;
-        type: string;
-    }[];
-};
-export declare const voteString2Types: {
-    Vote: {
-        name: string;
-        type: string;
-    }[];
-};
 export declare const followTypes: {
     Follow: {
         name: string;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@snapshot-labs/snapshot.js",
-  "version": "0.14.17",
+  "version": "0.14.19",
   "repository": "snapshot-labs/snapshot.js",
   "license": "MIT",
   "main": "dist/snapshot.cjs.js",

package/src/sign/index.ts

@@ -25,9 +25,6 @@ import {
   voteTypes,
   voteArrayTypes,
   voteStringTypes,
-  vote2Types,
-  voteArray2Types,
-  voteString2Types,
   followTypes,
   subscribeTypes,
   unfollowTypes,
@@ -169,15 +166,14 @@ export default class Client {
     if (!message.reason) message.reason = '';
     if (!message.app) message.app = '';
     if (!message.metadata) message.metadata = '{}';
-    const type2 = message.proposal.startsWith('0x');
-    let type = type2 ? vote2Types : voteTypes;
+    let type = voteTypes;
     if (['approval', 'ranked-choice'].includes(message.type))
-      type = type2 ? voteArray2Types : voteArrayTypes;
+      type = voteArrayTypes;
     if (!isShutter && ['quadratic', 'weighted'].includes(message.type)) {
-      type = type2 ? voteString2Types : voteStringTypes;
+      type = voteStringTypes;
       message.choice = JSON.stringify(message.choice);
     }
-    if (isShutter) type = type2 ? voteString2Types : voteStringTypes;
+    if (isShutter) type = voteStringTypes;
     delete message.privacy;
     // @ts-ignore
     delete message.type;

package/src/sign/types.ts

@@ -197,7 +197,7 @@ export const cancelProposal2Types = {
     { name: 'from', type: 'string' },
     { name: 'space', type: 'string' },
     { name: 'timestamp', type: 'uint64' },
-    { name: 'proposal', type: 'bytes32' }
+    { name: 'proposal', type: 'string' }
   ]
 };
 
@@ -240,45 +240,6 @@ export const voteStringTypes = {
   ]
 };
 
-export const vote2Types = {
-  Vote: [
-    { name: 'from', type: 'string' },
-    { name: 'space', type: 'string' },
-    { name: 'timestamp', type: 'uint64' },
-    { name: 'proposal', type: 'bytes32' },
-    { name: 'choice', type: 'uint32' },
-    { name: 'reason', type: 'string' },
-    { name: 'app', type: 'string' },
-    { name: 'metadata', type: 'string' }
-  ]
-};
-
-export const voteArray2Types = {
-  Vote: [
-    { name: 'from', type: 'string' },
-    { name: 'space', type: 'string' },
-    { name: 'timestamp', type: 'uint64' },
-    { name: 'proposal', type: 'bytes32' },
-    { name: 'choice', type: 'uint32[]' },
-    { name: 'reason', type: 'string' },
-    { name: 'app', type: 'string' },
-    { name: 'metadata', type: 'string' }
-  ]
-};
-
-export const voteString2Types = {
-  Vote: [
-    { name: 'from', type: 'string' },
-    { name: 'space', type: 'string' },
-    { name: 'timestamp', type: 'uint64' },
-    { name: 'proposal', type: 'bytes32' },
-    { name: 'choice', type: 'string' },
-    { name: 'reason', type: 'string' },
-    { name: 'app', type: 'string' },
-    { name: 'metadata', type: 'string' }
-  ]
-};
-
 export const followTypes = {
   Follow: [
     { name: 'from', type: 'address' },

package/src/utils.ts

@@ -734,14 +734,12 @@ async function getEnsSpaceController(
 ): Promise<string> {
   const spaceUri = await getSpaceUri(id, network, options);
   if (spaceUri) {
-    let isUriAddress = isAddress(spaceUri);
-    if (isUriAddress) return spaceUri;
+    if (isAddress(spaceUri)) return getAddress(spaceUri);
 
     const uriParts = spaceUri.split('/');
     const position = uriParts.includes('testnet') ? 5 : 4;
     const address = uriParts[position];
-    isUriAddress = isAddress(address);
-    if (isUriAddress) return address;
+    if (isAddress(address)) return getAddress(address);
   }
   return await getEnsOwner(id, network, options);
 }