@ceramicnetwork/blockchain-utils-validation 2.0.0-alpha.2 → 2.0.0-rc.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -1 +1 @@
1
- {"version":3,"file":"ethereum.d.ts","sourceRoot":"","sources":["../../src/blockchains/ethereum.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,iBAAiB,EAAE,MAAM,0BAA0B,CAAA;AA0E5D,eAAO,MAAM,OAAO,EAAE,iBAGrB,CAAA"}
1
+ {"version":3,"file":"ethereum.d.ts","sourceRoot":"","sources":["../../src/blockchains/ethereum.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,iBAAiB,EAAE,MAAM,0BAA0B,CAAA;AAqE5D,eAAO,MAAM,OAAO,EAAE,iBAGrB,CAAA"}
@@ -3,6 +3,7 @@ import { Contract } from '@ethersproject/contracts';
3
3
  import * as providers from '@ethersproject/providers';
4
4
  import { AccountId } from 'caip';
5
5
  import * as uint8arrays from 'uint8arrays';
6
+ import { asOldCaipString } from '@ceramicnetwork/blockchain-utils-linking';
6
7
  import { normalizeAccountId } from '@ceramicnetwork/common';
7
8
  const ADDRESS_TYPES = {
8
9
  ethereumEOA: 'ethereum-eoa',
@@ -25,13 +26,14 @@ function getEthersProvider(chainId) {
25
26
  return network._defaultProvider(providers);
26
27
  }
27
28
  function toV2Proof(proof, address) {
28
- proof.account = new AccountId({
29
+ const account = new AccountId({
29
30
  address: (proof.version === 1 ? proof.address : address) || '',
30
31
  chainId: {
31
32
  namespace,
32
33
  reference: proof.chainId ? proof.chainId.toString() : '1',
33
34
  },
34
- }).toString();
35
+ });
36
+ proof.account = asOldCaipString(account);
35
37
  delete proof.address;
36
38
  delete proof.chainId;
37
39
  proof.version = 2;
@@ -41,7 +43,7 @@ async function validateEoaLink(proof) {
41
43
  const recoveredAddr = verifyMessage(proof.message, proof.signature).toLowerCase();
42
44
  if (proof.version !== 2)
43
45
  proof = toV2Proof(proof, recoveredAddr);
44
- const account = new AccountId(proof.account);
46
+ const account = normalizeAccountId(proof.account);
45
47
  if (account.address !== recoveredAddr) {
46
48
  return null;
47
49
  }
@@ -50,7 +52,7 @@ async function validateEoaLink(proof) {
50
52
  async function validateErc1271Link(proof) {
51
53
  if (proof.version === 1)
52
54
  proof = toV2Proof(proof);
53
- const account = new AccountId(proof.account);
55
+ const account = normalizeAccountId(proof.account);
54
56
  const provider = getEthersProvider(account.chainId.reference);
55
57
  const contract = new Contract(account.address, ERC1271_ABI, provider);
56
58
  const message = utf8toHex(proof.message);
@@ -58,15 +60,11 @@ async function validateErc1271Link(proof) {
58
60
  return returnValue === MAGIC_ERC1271_VALUE ? proof : null;
59
61
  }
60
62
  async function validateLink(proof) {
61
- const proofCopy = { ...proof };
62
- if (proofCopy.account) {
63
- proofCopy.account = normalizeAccountId(proofCopy.account).toString();
64
- }
65
- if (proofCopy.type === ADDRESS_TYPES.erc1271) {
66
- return await validateErc1271Link(proofCopy);
63
+ if (proof.type === ADDRESS_TYPES.erc1271) {
64
+ return validateErc1271Link(proof);
67
65
  }
68
66
  else {
69
- return await validateEoaLink(proofCopy);
67
+ return validateEoaLink(proof);
70
68
  }
71
69
  }
72
70
  export const handler = {
@@ -1 +1 @@
1
- {"version":3,"file":"ethereum.js","sourceRoot":"","sources":["../../src/blockchains/ethereum.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"ethereum.js","sourceRoot":"","sources":["../../src/blockchains/ethereum.ts"],"names":[],"mappings":"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"}
@@ -1 +1 @@
1
- {"version":3,"file":"solana.d.ts","sourceRoot":"","sources":["../../src/blockchains/solana.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,0BAA0B,CAAA;AAC5D,OAAO,EAAE,SAAS,EAAE,MAAM,0CAA0C,CAAA;AAgBpE,wBAAsB,YAAY,CAAC,KAAK,EAAE,SAAS,GAAG,OAAO,CAAC,SAAS,GAAG,IAAI,CAAC,CAM9E;AAED,eAAO,MAAM,OAAO,EAAE,iBAGrB,CAAA"}
1
+ {"version":3,"file":"solana.d.ts","sourceRoot":"","sources":["../../src/blockchains/solana.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,0BAA0B,CAAA;AAC5D,OAAO,EAAE,SAAS,EAAE,MAAM,0CAA0C,CAAA;AAgBpE,wBAAsB,YAAY,CAAC,KAAK,EAAE,SAAS,GAAG,OAAO,CAAC,SAAS,GAAG,IAAI,CAAC,CAO9E;AAED,eAAO,MAAM,OAAO,EAAE,iBAGrB,CAAA"}
@@ -1,13 +1,14 @@
1
- import { AccountId } from 'caip';
2
1
  import * as uint8arrays from 'uint8arrays';
3
2
  import { verify } from '@stablelib/ed25519';
3
+ import { normalizeAccountId } from '@ceramicnetwork/common';
4
4
  const verifySignature = async (pubKey, message, signature) => {
5
5
  const verified = verify(pubKey, uint8arrays.fromString(message), signature);
6
6
  return verified;
7
7
  };
8
8
  const namespace = 'solana';
9
9
  export async function validateLink(proof) {
10
- const pubKey = uint8arrays.fromString(new AccountId(proof.account).address, 'base58btc');
10
+ const account = normalizeAccountId(proof.account);
11
+ const pubKey = uint8arrays.fromString(account.address, 'base58btc');
11
12
  const msg = proof.message;
12
13
  const sig = uint8arrays.fromString(proof.signature, 'base64');
13
14
  const is_sig_valid = await verifySignature(pubKey, msg, sig);
@@ -1 +1 @@
1
- {"version":3,"file":"solana.js","sourceRoot":"","sources":["../../src/blockchains/solana.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,SAAS,EAAE,MAAM,MAAM,CAAA;AAChC,OAAO,KAAK,WAAW,MAAM,aAAa,CAAA;AAC1C,OAAO,EAAE,MAAM,EAAE,MAAM,oBAAoB,CAAA;AAE3C,MAAM,eAAe,GAAG,KAAK,EAC3B,MAAkB,EAClB,OAAe,EACf,SAAqB,EACH,EAAE;IACpB,MAAM,QAAQ,GAAG,MAAM,CAAC,MAAM,EAAE,WAAW,CAAC,UAAU,CAAC,OAAO,CAAC,EAAE,SAAS,CAAC,CAAA;IAC3E,OAAO,QAAQ,CAAA;AACjB,CAAC,CAAA;AAED,MAAM,SAAS,GAAG,QAAQ,CAAA;AAE1B,MAAM,CAAC,KAAK,UAAU,YAAY,CAAC,KAAgB;IACjD,MAAM,MAAM,GAAG,WAAW,CAAC,UAAU,CAAC,IAAI,SAAS,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,OAAO,EAAE,WAAW,CAAC,CAAA;IACxF,MAAM,GAAG,GAAG,KAAK,CAAC,OAAO,CAAA;IACzB,MAAM,GAAG,GAAG,WAAW,CAAC,UAAU,CAAC,KAAK,CAAC,SAAS,EAAE,QAAQ,CAAC,CAAA;IAC7D,MAAM,YAAY,GAAG,MAAM,eAAe,CAAC,MAAM,EAAE,GAAG,EAAE,GAAG,CAAC,CAAA;IAC5D,OAAO,YAAY,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,CAAA;AACpC,CAAC;AAED,MAAM,CAAC,MAAM,OAAO,GAAsB;IACxC,SAAS;IACT,YAAY;CACb,CAAA"}
1
+ {"version":3,"file":"solana.js","sourceRoot":"","sources":["../../src/blockchains/solana.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,WAAW,MAAM,aAAa,CAAA;AAC1C,OAAO,EAAE,MAAM,EAAE,MAAM,oBAAoB,CAAA;AAC3C,OAAO,EAAE,kBAAkB,EAAE,MAAM,wBAAwB,CAAA;AAE3D,MAAM,eAAe,GAAG,KAAK,EAC3B,MAAkB,EAClB,OAAe,EACf,SAAqB,EACH,EAAE;IACpB,MAAM,QAAQ,GAAG,MAAM,CAAC,MAAM,EAAE,WAAW,CAAC,UAAU,CAAC,OAAO,CAAC,EAAE,SAAS,CAAC,CAAA;IAC3E,OAAO,QAAQ,CAAA;AACjB,CAAC,CAAA;AAED,MAAM,SAAS,GAAG,QAAQ,CAAA;AAE1B,MAAM,CAAC,KAAK,UAAU,YAAY,CAAC,KAAgB;IACjD,MAAM,OAAO,GAAG,kBAAkB,CAAC,KAAK,CAAC,OAAO,CAAC,CAAA;IACjD,MAAM,MAAM,GAAG,WAAW,CAAC,UAAU,CAAC,OAAO,CAAC,OAAO,EAAE,WAAW,CAAC,CAAA;IACnE,MAAM,GAAG,GAAG,KAAK,CAAC,OAAO,CAAA;IACzB,MAAM,GAAG,GAAG,WAAW,CAAC,UAAU,CAAC,KAAK,CAAC,SAAS,EAAE,QAAQ,CAAC,CAAA;IAC7D,MAAM,YAAY,GAAG,MAAM,eAAe,CAAC,MAAM,EAAE,GAAG,EAAE,GAAG,CAAC,CAAA;IAC5D,OAAO,YAAY,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,CAAA;AACpC,CAAC;AAED,MAAM,CAAC,MAAM,OAAO,GAAsB;IACxC,SAAS;IACT,YAAY;CACb,CAAA"}
@@ -1 +1 @@
1
- {"version":3,"file":"tezos.d.ts","sourceRoot":"","sources":["../../src/blockchains/tezos.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,iBAAiB,EAAE,MAAM,0BAA0B,CAAA;AAC5D,OAAO,EAAE,SAAS,EAAS,MAAM,0CAA0C,CAAA;AAK3E,eAAO,MAAM,uBAAuB,OAAyD,CAAA;AAC7F,eAAO,MAAM,8BAA8B,OAE1C,CAAA;AAuDD,wBAAsB,YAAY,CAAC,KAAK,EAAE,SAAS,GAAG,OAAO,CAAC,SAAS,GAAG,IAAI,CAAC,CAoB9E;AAED,eAAO,MAAM,OAAO,EAAE,iBAGrB,CAAA"}
1
+ {"version":3,"file":"tezos.d.ts","sourceRoot":"","sources":["../../src/blockchains/tezos.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,iBAAiB,EAAE,MAAM,0BAA0B,CAAA;AAC5D,OAAO,EAAE,SAAS,EAAS,MAAM,0CAA0C,CAAA;AAK3E,eAAO,MAAM,uBAAuB,OAAyD,CAAA;AAC7F,eAAO,MAAM,8BAA8B,OAE1C,CAAA;AAqDD,wBAAsB,YAAY,CAAC,KAAK,EAAE,SAAS,GAAG,OAAO,CAAC,SAAS,GAAG,IAAI,CAAC,CAkB9E;AAED,eAAO,MAAM,OAAO,EAAE,iBAGrB,CAAA"}
@@ -1,5 +1,5 @@
1
1
  import { ChainId } from 'caip';
2
- import { RemoteSigner } from '@taquito/remote-signer';
2
+ import { verifySignature } from '@taquito/utils';
3
3
  import { tezos } from '@ceramicnetwork/blockchain-utils-linking';
4
4
  import fetch from 'cross-fetch';
5
5
  import * as uint8arrays from 'uint8arrays';
@@ -15,21 +15,18 @@ function encodeMessage(text) {
15
15
  text = uint8arrays.toString(uint8arrays.fromString(text, 'utf-8'), 'hex');
16
16
  return michelinePrefix + stringPrefix + len + text;
17
17
  }
18
- function publicKeyFinder(address) {
19
- const request = fetch(`https://api.tzstats.com/explorer/account/${address}`).catch(() => {
18
+ async function findPublicKey(address) {
19
+ const response = await fetch(`https://api.tzstats.com/explorer/account/${address}`).catch(() => {
20
20
  throw ADDRESS_NOT_FOUND_ERROR;
21
21
  });
22
- return async () => {
23
- const response = await request;
24
- const json = await response.json();
25
- const result = json?.pubkey;
26
- if (result) {
27
- return result;
28
- }
29
- else {
30
- throw PUBLIC_KEY_NOT_PUBLISHED_ERROR;
31
- }
32
- };
22
+ const json = await response.json();
23
+ const result = json?.pubkey;
24
+ if (result) {
25
+ return result;
26
+ }
27
+ else {
28
+ throw PUBLIC_KEY_NOT_PUBLISHED_ERROR;
29
+ }
33
30
  }
34
31
  export async function validateLink(proof) {
35
32
  const account = normalizeAccountId(proof.account);
@@ -38,10 +35,9 @@ export async function validateLink(proof) {
38
35
  return null;
39
36
  }
40
37
  const msg = encodeMessage(proof.message);
41
- const verifier = new RemoteSigner(account.address, FAKE_API_ENDPOINT);
42
- verifier.publicKey = publicKeyFinder(account.address);
43
38
  try {
44
- const is_sig_valid = await verifier.verify(msg, proof.signature);
39
+ const pk = await findPublicKey(account.address);
40
+ const is_sig_valid = await verifySignature(msg, pk, proof.signature);
45
41
  return is_sig_valid ? proof : null;
46
42
  }
47
43
  catch (ignored) {
@@ -1 +1 @@
1
- {"version":3,"file":"tezos.js","sourceRoot":"","sources":["../../src/blockchains/tezos.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,MAAM,CAAA;AAC9B,OAAO,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAA;AAErD,OAAO,EAAa,KAAK,EAAE,MAAM,0CAA0C,CAAA;AAC3E,OAAO,KAAK,MAAM,aAAa,CAAA;AAC/B,OAAO,KAAK,WAAW,MAAM,aAAa,CAAA;AAC1C,OAAO,EAAE,kBAAkB,EAAE,MAAM,wBAAwB,CAAA;AAE3D,MAAM,CAAC,MAAM,uBAAuB,GAAG,IAAI,KAAK,CAAC,2CAA2C,CAAC,CAAA;AAC7F,MAAM,CAAC,MAAM,8BAA8B,GAAG,IAAI,KAAK,CACrD,kDAAkD,CACnD,CAAA;AAID,MAAM,EAAE,eAAe,EAAE,eAAe,EAAE,GAAG,KAAK,CAAA;AAElD,MAAM,iBAAiB,GAAG,8BAA8B,CAAA;AAYxD,SAAS,aAAa,CAAC,IAAY;IACjC,MAAM,eAAe,GAAG,IAAI,CAAA;IAC5B,MAAM,YAAY,GAAG,IAAI,CAAA;IACzB,MAAM,GAAG,GAAG,CAAC,SAAS,GAAG,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAA;IAE5D,IAAI,GAAG,WAAW,CAAC,QAAQ,CAAC,WAAW,CAAC,UAAU,CAAC,IAAI,EAAE,OAAO,CAAC,EAAE,KAAK,CAAC,CAAA;IACzE,OAAO,eAAe,GAAG,YAAY,GAAG,GAAG,GAAG,IAAI,CAAA;AACpD,CAAC;AAUD,SAAS,eAAe,CAAC,OAAe;IAEtC,MAAM,OAAO,GAAG,KAAK,CAAC,4CAA4C,OAAO,EAAE,CAAC,CAAC,KAAK,CAAC,GAAG,EAAE;QACtF,MAAM,uBAAuB,CAAA;IAC/B,CAAC,CAAC,CAAA;IACF,OAAO,KAAK,IAAqB,EAAE;QACjC,MAAM,QAAQ,GAAG,MAAM,OAAO,CAAA;QAC9B,MAAM,IAAI,GAAG,MAAM,QAAQ,CAAC,IAAI,EAAE,CAAA;QAClC,MAAM,MAAM,GAAG,IAAI,EAAE,MAAM,CAAA;QAC3B,IAAI,MAAM,EAAE;YACV,OAAO,MAAM,CAAA;SACd;aAAM;YACL,MAAM,8BAA8B,CAAA;SACrC;IACH,CAAC,CAAA;AACH,CAAC;AAKD,MAAM,CAAC,KAAK,UAAU,YAAY,CAAC,KAAgB;IACjD,MAAM,OAAO,GAAG,kBAAkB,CAAC,KAAK,CAAC,OAAO,CAAC,CAAA;IACjD,MAAM,OAAO,GAAG,IAAI,OAAO,CAAC,OAAO,CAAC,OAAO,CAAC,CAAA;IAG5C,IAAI,OAAO,CAAC,SAAS,KAAK,eAAe,EAAE;QACzC,OAAO,IAAI,CAAA;KACZ;IACD,MAAM,GAAG,GAAG,aAAa,CAAC,KAAK,CAAC,OAAO,CAAC,CAAA;IAExC,MAAM,QAAQ,GAAG,IAAI,YAAY,CAAC,OAAO,CAAC,OAAO,EAAE,iBAAiB,CAAC,CAAA;IACrE,QAAQ,CAAC,SAAS,GAAG,eAAe,CAAC,OAAO,CAAC,OAAO,CAAC,CAAA;IAErD,IAAI;QACF,MAAM,YAAY,GAAY,MAAM,QAAQ,CAAC,MAAM,CAAC,GAAG,EAAE,KAAK,CAAC,SAAS,CAAC,CAAA;QAEzE,OAAO,YAAY,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,CAAA;KACnC;IAAC,OAAO,OAAO,EAAE;QAChB,OAAO,IAAI,CAAA;KACZ;AACH,CAAC;AAED,MAAM,CAAC,MAAM,OAAO,GAAsB;IACxC,SAAS,EAAE,eAAe;IAC1B,YAAY;CACb,CAAA"}
1
+ {"version":3,"file":"tezos.js","sourceRoot":"","sources":["../../src/blockchains/tezos.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,MAAM,CAAA;AAC9B,OAAO,EAAE,eAAe,EAAE,MAAM,gBAAgB,CAAA;AAEhD,OAAO,EAAa,KAAK,EAAE,MAAM,0CAA0C,CAAA;AAC3E,OAAO,KAAK,MAAM,aAAa,CAAA;AAC/B,OAAO,KAAK,WAAW,MAAM,aAAa,CAAA;AAC1C,OAAO,EAAE,kBAAkB,EAAE,MAAM,wBAAwB,CAAA;AAE3D,MAAM,CAAC,MAAM,uBAAuB,GAAG,IAAI,KAAK,CAAC,2CAA2C,CAAC,CAAA;AAC7F,MAAM,CAAC,MAAM,8BAA8B,GAAG,IAAI,KAAK,CACrD,kDAAkD,CACnD,CAAA;AAID,MAAM,EAAE,eAAe,EAAE,eAAe,EAAE,GAAG,KAAK,CAAA;AAElD,MAAM,iBAAiB,GAAG,8BAA8B,CAAA;AAYxD,SAAS,aAAa,CAAC,IAAY;IACjC,MAAM,eAAe,GAAG,IAAI,CAAA;IAC5B,MAAM,YAAY,GAAG,IAAI,CAAA;IACzB,MAAM,GAAG,GAAG,CAAC,SAAS,GAAG,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAA;IAE5D,IAAI,GAAG,WAAW,CAAC,QAAQ,CAAC,WAAW,CAAC,UAAU,CAAC,IAAI,EAAE,OAAO,CAAC,EAAE,KAAK,CAAC,CAAA;IACzE,OAAO,eAAe,GAAG,YAAY,GAAG,GAAG,GAAG,IAAI,CAAA;AACpD,CAAC;AAUD,KAAK,UAAU,aAAa,CAAC,OAAe;IAE1C,MAAM,QAAQ,GAAG,MAAM,KAAK,CAAC,4CAA4C,OAAO,EAAE,CAAC,CAAC,KAAK,CAAC,GAAG,EAAE;QAC7F,MAAM,uBAAuB,CAAA;IAC/B,CAAC,CAAC,CAAA;IAEF,MAAM,IAAI,GAAG,MAAM,QAAQ,CAAC,IAAI,EAAE,CAAA;IAClC,MAAM,MAAM,GAAG,IAAI,EAAE,MAAM,CAAA;IAC3B,IAAI,MAAM,EAAE;QACV,OAAO,MAAM,CAAA;KACd;SAAM;QACL,MAAM,8BAA8B,CAAA;KACrC;AACH,CAAC;AAKD,MAAM,CAAC,KAAK,UAAU,YAAY,CAAC,KAAgB;IACjD,MAAM,OAAO,GAAG,kBAAkB,CAAC,KAAK,CAAC,OAAO,CAAC,CAAA;IACjD,MAAM,OAAO,GAAG,IAAI,OAAO,CAAC,OAAO,CAAC,OAAO,CAAC,CAAA;IAG5C,IAAI,OAAO,CAAC,SAAS,KAAK,eAAe,EAAE;QACzC,OAAO,IAAI,CAAA;KACZ;IACD,MAAM,GAAG,GAAG,aAAa,CAAC,KAAK,CAAC,OAAO,CAAC,CAAA;IAExC,IAAI;QACF,MAAM,EAAE,GAAG,MAAM,aAAa,CAAC,OAAO,CAAC,OAAO,CAAC,CAAA;QAC/C,MAAM,YAAY,GAAY,MAAM,eAAe,CAAC,GAAG,EAAE,EAAE,EAAE,KAAK,CAAC,SAAS,CAAC,CAAA;QAE7E,OAAO,YAAY,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,CAAA;KACnC;IAAC,OAAO,OAAO,EAAE;QAChB,OAAO,IAAI,CAAA;KACZ;AACH,CAAC;AAED,MAAM,CAAC,MAAM,OAAO,GAAsB;IACxC,SAAS,EAAE,eAAe;IAC1B,YAAY;CACb,CAAA"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@ceramicnetwork/blockchain-utils-validation",
3
- "version": "2.0.0-alpha.2",
3
+ "version": "2.0.0-rc.0",
4
4
  "description": "Blockchain utils for validation of linked blockchain accounts",
5
5
  "keywords": [
6
6
  "ceramic",
@@ -22,23 +22,23 @@
22
22
  ".": "./lib/index.js"
23
23
  },
24
24
  "scripts": {
25
- "test": "node --experimental-vm-modules ../../node_modules/jest/bin/jest.js --silent --coverage --runInBand",
26
- "build": "../../node_modules/.bin/tsc --project tsconfig.json",
25
+ "test": "NODE_OPTIONS=--experimental-vm-modules npx jest --silent --coverage --runInBand --forceExit",
26
+ "build": "npx tsc --project tsconfig.json",
27
27
  "prepublishOnly": "npm run build",
28
28
  "prebuild": "npm run clean",
29
- "lint": "../../node_modules/.bin/eslint ./src --ext .js,.jsx,.ts,.tsx",
30
- "clean": "rm -rf ./lib"
29
+ "lint": "npx eslint ./src --ext .js,.jsx,.ts,.tsx",
30
+ "clean": "npx rimraf ./lib"
31
31
  },
32
32
  "dependencies": {
33
- "@ceramicnetwork/blockchain-utils-linking": "^2.0.0-alpha.2",
34
- "@ceramicnetwork/common": "^2.0.0-alpha.2",
33
+ "@ceramicnetwork/blockchain-utils-linking": "^2.0.0-rc.0",
34
+ "@ceramicnetwork/common": "^2.0.0-rc.0",
35
35
  "@ethersproject/contracts": "^5.5.0",
36
36
  "@ethersproject/providers": "^5.5.1",
37
37
  "@ethersproject/wallet": "^5.5.0",
38
38
  "@polkadot/util-crypto": "^7.0.2",
39
39
  "@smontero/eosio-signing-tools": "^0.0.6",
40
40
  "@stablelib/ed25519": "^1.0.2",
41
- "@taquito/remote-signer": "^9.2.0-stablelib.0",
41
+ "@taquito/utils": "^11.2.0",
42
42
  "@tendermint/sig": "^0.6.0",
43
43
  "@zondax/filecoin-signing-tools": "^0.18.2",
44
44
  "caip": "~1.0.0",
@@ -52,13 +52,12 @@
52
52
  "@polkadot/keyring": "^6.2.1",
53
53
  "@polkadot/types": "^4.6.2",
54
54
  "@polkadot/util": "^7.1.1",
55
- "@polkadot/util-crypto": "^7.0.2",
56
55
  "@smontero/eosio-local-provider": "^0.0.3",
57
56
  "@solana/wallet-adapter-base": "^0.7.1",
58
- "@taquito/signer": "^11.0.2",
57
+ "@taquito/signer": "^11.2.0",
59
58
  "eth-sig-util": "^3.0.1",
60
59
  "ganache-core": "^2.13.2",
61
60
  "near-api-js": "^0.44.2"
62
61
  },
63
- "gitHead": "56c344ee94ab26dde88fb1dbee7441c9339b1d45"
62
+ "gitHead": "d4586fe9349d7bac9b0d224833e6508bfb1f2e51"
64
63
  }