@snapshot-labs/snapshot.js 0.12.0 → 0.12.2

package/dist/snapshot.cjs.js

@@ -14,6 +14,7 @@ var set = require('lodash.set');
 var providers$1 = require('@ethersproject/providers');
 var bytes = require('@ethersproject/bytes');
 var starknet$1 = require('starknet');
+var bignumber = require('@ethersproject/bignumber');
 var wallet = require('@ethersproject/wallet');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
@@ -260,7 +261,7 @@ const deleteSpaceType = {
     ]
 };
 
-var livenet = {
+var mainnet = {
 	hub: "https://hub.snapshot.org",
 	sequencer: "https://seq.snapshot.org"
 };
@@ -273,7 +274,7 @@ var local = {
 	sequencer: "http://localhost:3001"
 };
 var constants = {
-	livenet: livenet,
+	mainnet: mainnet,
 	testnet: testnet,
 	local: local
 };
@@ -286,8 +287,8 @@ const domain = {
     // chainId: 1
 };
 class Client {
-    constructor(address = constants.livenet.sequencer, options = {}) {
-        address = address.replace(constants.livenet.hub, constants.livenet.sequencer);
+    constructor(address = constants.mainnet.sequencer, options = {}) {
+        address = address.replace(constants.mainnet.hub, constants.mainnet.sequencer);
         address = address.replace(constants.testnet.hub, constants.testnet.sequencer);
         address = address.replace(constants.local.hub, constants.local.sequencer);
         this.address = address;
@@ -1405,11 +1406,11 @@ const RPC_URLS = {
 };
 const ABI = [
     {
-        name: 'argent::account::interface::IDeprecatedArgentAccount',
+        name: 'argent::common::account::IAccount',
         type: 'interface',
         items: [
             {
-                name: 'isValidSignature',
+                name: 'is_valid_signature',
                 type: 'function',
                 inputs: [
                     {
@@ -1417,7 +1418,7 @@ const ABI = [
                         type: 'core::felt252'
                     },
                     {
-                        name: 'signatures',
+                        name: 'signature',
                         type: 'core::array::Array::<core::felt252>'
                     }
                 ],
@@ -1448,12 +1449,20 @@ function getHash(data, address) {
 }
 function verify(address_1, sig_1, data_1) {
     return __awaiter(this, arguments, void 0, function* (address, sig, data, network = 'SN_MAIN', options = {}) {
-        const contractAccount = new starknet$1.Contract(ABI, address, getProvider$1(network, options));
-        yield contractAccount.isValidSignature(getHash(data, address), [
-            sig[0],
-            sig[1]
-        ]);
-        return true;
+        try {
+            const contractAccount = new starknet$1.Contract(ABI, address, getProvider$1(network, options));
+            if (sig.length < 2) {
+                throw new Error('Invalid signature format');
+            }
+            const result = yield contractAccount.is_valid_signature(getHash(data, address), sig.slice(-2));
+            return bignumber.BigNumber.from(result).eq(bignumber.BigNumber.from('370462705988'));
+        }
+        catch (e) {
+            if (e.message.includes('Contract not found')) {
+                throw new Error('Contract not deployed');
+            }
+            throw e;
+        }
     });
 }
 

package/dist/snapshot.esm.js

@@ -12,6 +12,7 @@ import set from 'lodash.set';
 import { StaticJsonRpcProvider } from '@ethersproject/providers';
 import { hexlify, arrayify } from '@ethersproject/bytes';
 import { Contract, RpcProvider, typedData, validateAndParseAddress } from 'starknet';
+import { BigNumber } from '@ethersproject/bignumber';
 import { verifyTypedData } from '@ethersproject/wallet';
 
 /*! *****************************************************************************
@@ -250,7 +251,7 @@ const deleteSpaceType = {
     ]
 };
 
-var livenet = {
+var mainnet = {
 	hub: "https://hub.snapshot.org",
 	sequencer: "https://seq.snapshot.org"
 };
@@ -263,7 +264,7 @@ var local = {
 	sequencer: "http://localhost:3001"
 };
 var constants = {
-	livenet: livenet,
+	mainnet: mainnet,
 	testnet: testnet,
 	local: local
 };
@@ -276,8 +277,8 @@ const domain = {
     // chainId: 1
 };
 class Client {
-    constructor(address = constants.livenet.sequencer, options = {}) {
-        address = address.replace(constants.livenet.hub, constants.livenet.sequencer);
+    constructor(address = constants.mainnet.sequencer, options = {}) {
+        address = address.replace(constants.mainnet.hub, constants.mainnet.sequencer);
         address = address.replace(constants.testnet.hub, constants.testnet.sequencer);
         address = address.replace(constants.local.hub, constants.local.sequencer);
         this.address = address;
@@ -1395,11 +1396,11 @@ const RPC_URLS = {
 };
 const ABI = [
     {
-        name: 'argent::account::interface::IDeprecatedArgentAccount',
+        name: 'argent::common::account::IAccount',
         type: 'interface',
         items: [
             {
-                name: 'isValidSignature',
+                name: 'is_valid_signature',
                 type: 'function',
                 inputs: [
                     {
@@ -1407,7 +1408,7 @@ const ABI = [
                         type: 'core::felt252'
                     },
                     {
-                        name: 'signatures',
+                        name: 'signature',
                         type: 'core::array::Array::<core::felt252>'
                     }
                 ],
@@ -1438,12 +1439,20 @@ function getHash(data, address) {
 }
 function verify(address_1, sig_1, data_1) {
     return __awaiter(this, arguments, void 0, function* (address, sig, data, network = 'SN_MAIN', options = {}) {
-        const contractAccount = new Contract(ABI, address, getProvider$1(network, options));
-        yield contractAccount.isValidSignature(getHash(data, address), [
-            sig[0],
-            sig[1]
-        ]);
-        return true;
+        try {
+            const contractAccount = new Contract(ABI, address, getProvider$1(network, options));
+            if (sig.length < 2) {
+                throw new Error('Invalid signature format');
+            }
+            const result = yield contractAccount.is_valid_signature(getHash(data, address), sig.slice(-2));
+            return BigNumber.from(result).eq(BigNumber.from('370462705988'));
+        }
+        catch (e) {
+            if (e.message.includes('Contract not found')) {
+                throw new Error('Contract not deployed');
+            }
+            throw e;
+        }
     });
 }