Merge branch 'staging/v7' into feature/lit-3748-naga

Author: Ansonhkg

lerna.json

@@ -2,5 +2,5 @@
   "$schema": "node_modules/lerna/schemas/lerna-schema.json",
   "useNx": true,
   "useWorkspaces": true,
-  "version": "6.7.0"
+  "version": "6.8.0"
 }

local-tests/tests/wrapped-keys/testGenerateSolanaWrappedKey.ts

@@ -2,9 +2,9 @@ import { log } from '@lit-protocol/misc';
 import { TinnyEnvironment } from 'local-tests/setup/tinny-environment';
 import { api } from '@lit-protocol/wrapped-keys';
 import { getPkpSessionSigs } from 'local-tests/setup/session-sigs/get-pkp-session-sigs';
-import nacl from 'tweetnacl';
-import bs58 from 'bs58';
 import { Keypair } from '@solana/web3.js';
+import { ethers } from 'ethers';
+import nacl from 'tweetnacl';
 
 const { generatePrivateKey, signMessageWithEncryptedKey, exportPrivateKey } =
   api;
@@ -68,8 +68,8 @@ export const testGenerateSolanaWrappedKey = async (
 
     const signatureIsValidForPublicKey = nacl.sign.detached.verify(
       Buffer.from(messageToSign),
-      bs58.decode(signature),
-      bs58.decode(generatedPublicKey)
+      ethers.utils.base58.decode(signature),
+      ethers.utils.base58.decode(generatedPublicKey)
     );
 
     if (!signatureIsValidForPublicKey)

local-tests/tests/wrapped-keys/testSignMessageWithSolanaEncryptedKey.ts

@@ -2,7 +2,7 @@ import { log } from '@lit-protocol/misc';
 import { TinnyEnvironment } from 'local-tests/setup/tinny-environment';
 import { api } from '@lit-protocol/wrapped-keys';
 import { Keypair } from '@solana/web3.js';
-import bs58 from 'bs58';
+import { ethers } from 'ethers';
 import nacl from 'tweetnacl';
 import { getPkpSessionSigs } from 'local-tests/setup/session-sigs/get-pkp-session-sigs';
 
@@ -68,7 +68,7 @@ export const testSignMessageWithSolanaEncryptedKey = async (
 
     const signatureIsValidForPublicKey = nacl.sign.detached.verify(
       Buffer.from(messageToSign),
-      bs58.decode(signature),
+      ethers.utils.base58.decode(signature),
       solanaKeypair.publicKey.toBuffer()
     );
 

package.json

@@ -42,8 +42,8 @@
     "@dotenvx/dotenvx": "^1.6.4",
     "@ethersproject/abi": "^5.7.0",
     "@ethersproject/providers": "^5.7.2",
-    "@lit-protocol/contracts": "^0.0.63",
     "@lit-protocol/accs-schemas": "^0.0.12",
+    "@lit-protocol/contracts": "^0.0.63",
     "@metamask/eth-sig-util": "5.0.2",
     "@mysten/sui.js": "^0.37.1",
     "@openagenda/verror": "^3.1.4",
@@ -57,7 +57,6 @@
     "ajv": "^8.12.0",
     "base64url": "^3.0.1",
     "bech32": "^2.0.0",
-    "bs58": "^5.0.0",
     "cbor-web": "^9.0.2",
     "cross-fetch": "3.1.8",
     "date-and-time": "^2.4.1",
@@ -98,11 +97,11 @@
     "buffer": "^6.0.3",
     "chalk": "^5.3.0",
     "cypress": "11.0.1",
-    "esbuild-node-externals": "^1.14.0",
     "cypress-metamask": "^1.0.5-development",
     "cypress-metamask-v2": "^1.7.2",
     "esbuild": "^0.17.3",
     "esbuild-node-builtins": "^0.1.0",
+    "esbuild-node-externals": "^1.14.0",
     "esbuild-plugin-tsc": "^0.4.0",
     "eslint": "8.48.0",
     "eslint-config-next": "12.2.3",

packages/access-control-conditions/package.json

@@ -21,7 +21,7 @@
   "tags": [
     "universal"
   ],
-  "version": "6.7.0",
+  "version": "6.8.0",
   "main": "./dist/src/index.js",
   "typings": "./dist/src/index.d.ts"
 }

packages/auth-browser/package.json

@@ -30,7 +30,7 @@
   "tags": [
     "browser"
   ],
-  "version": "6.7.0",
+  "version": "6.8.0",
   "main": "./dist/src/index.js",
   "typings": "./dist/src/index.d.ts"
 }

packages/auth-helpers/package.json

@@ -25,7 +25,7 @@
     "crypto": false,
     "stream": false
   },
-  "version": "6.7.0",
+  "version": "6.8.0",
   "main": "./dist/src/index.js",
   "typings": "./dist/src/index.d.ts"
 }

packages/constants/package.json

@@ -20,7 +20,7 @@
   "tags": [
     "universal"
   ],
-  "version": "6.7.0",
+  "version": "6.8.0",
   "main": "./dist/src/index.js",
   "typings": "./dist/src/index.d.ts"
 }

packages/constants/src/lib/version.ts

@@ -1 +1 @@
-export const version = '6.7.0';
+export const version = '6.8.0';

packages/contracts-sdk/package.json

@@ -18,15 +18,14 @@
     "directory": "../../dist/packages/contracts-sdk"
   },
   "peerDependencies": {
-    "bs58": "^5.0.0",
     "date-and-time": "^2.4.1",
     "multiformats": "^9.7.1"
   },
   "gitHead": "0d7334c2c55f448e91fe32f29edc5db8f5e09e4b",
   "tags": [
     "universal"
   ],
-  "version": "6.7.0",
+  "version": "6.8.0",
   "main": "./dist/src/index.js",
   "typings": "./dist/src/index.d.ts"
 }