Merge branch 'develop' into virtual-wallet-support

# Conflicts:
#	packages/core/package.json
#	packages/core/src/main.ts
#	packages/core/src/wallet/filter.ts
#	pnpm-lock.yaml

.github/workflows/pr.yml

@@ -1,30 +1,36 @@
-name: PR
+name: PR integration
+
 on:
   pull_request:
     branches:
-      - develop
       - master
+      - develop
 
 jobs:
   version:
     timeout-minutes: 15
     runs-on: ubuntu-latest
     steps:
       - name: checkout code repository
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
         with:
           fetch-depth: 0
-      - uses: pnpm/[email protected]
+
+      - uses: pnpm/action-setup@v4
         with:
           version: 8
+
       - name: setup node.js
-        uses: actions/setup-node@v2
+        uses: actions/setup-node@v4
         with:
-          node-version: 16
+          node-version: 18
           cache: "pnpm"
+
       - name: install dependencies
         run: pnpm install
-      - name: run tests
-        run: pnpm test
+
       - name: check formatting
         run: pnpm format:check
+
+      - name: run tests
+        run: pnpm test

.github/workflows/release.yml

@@ -1,4 +1,5 @@
 name: Release
+
 on:
   push:
     branches:
@@ -11,45 +12,51 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: checkout code repository
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
         with:
           fetch-depth: 0
-      - uses: pnpm/[email protected]
+
+      - uses: pnpm/action-setup@v4
         with:
           version: 8
+
       - name: setup node.js
-        uses: actions/setup-node@v2
+        uses: actions/setup-node@v4
         with:
-          node-version: 16
+          node-version: 18
           cache: "pnpm"
+
       - name: Setup npmrc
         run: |
           echo "//registry.npmjs.org/:_authToken=${{ secrets.NPM_ACCESS_TOKEN }}" >> .npmrc
+
       - name: install dependencies
         run: pnpm install
+
       - name: run tests
         run: pnpm test
+
       - name: copy readme to every package
         run: echo "./packages/core/ ./packages/ui/" | xargs -n 1 cp README.md
 
-      - name: Create Pre-release
-        if: github.ref == 'refs/heads/develop'
+      - name: Create Master Release
+        if: github.ref == 'refs/heads/master'
         uses: changesets/action@v1
         with:
           version: pnpm run version
-          commit: "chore: pre-release version bump"
-          title: "Pre-release version bump"
-          publish: pnpm run publish:next
+          commit: "chore: version bump"
+          title: "Master branch version bump"
+          publish: pnpm run publish
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
-      - name: Create Release
-        if: github.ref == 'refs/heads/master'
+      - name: Create Develop Release
+        if: github.ref == 'refs/heads/develop'
         uses: changesets/action@v1
         with:
           version: pnpm run version
-          commit: "chore: release version bump"
-          title: "Release version bump"
-          publish: pnpm run publish
+          commit: "chore: version bump"
+          title: "Develop branch version bump"
+          publish: pnpm run publish:next
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

package.json

@@ -8,8 +8,8 @@
     "format": "prettier --ignore-path .gitignore --plugin-search-dir=. --write '**/*.{js,cjs,ts,tsx,svelte,md,yml,json}'",
     "format:check": "prettier --ignore-path .gitignore --plugin-search-dir=. --check '**/*.{js,cjs,ts,tsx,svelte,md,yml,json}'",
     "prepare": "pnpm run build && husky install",
-    "publish": "pnpm publish -r --no-git-checks",
-    "publish:next": "pnpm publish -r --no-git-checks --tag next",
+    "publish": "pnpm publish -r --no-git-checks && changeset tag",
+    "publish:next": "pnpm publish -r --no-git-checks --tag next && changeset tag",
     "test": "CI=true pnpm run -r test",
     "version": "changeset version && pnpm install --lockfile-only"
   },

packages/core/CHANGELOG.md

@@ -1,5 +1,11 @@
 # get-starknet-core
 
+## 4.0.0-next.5
+
+### Minor Changes
+
+- 5cd8150: Spec update
+
 ## 4.0.0-next.4
 
 ### Minor Changes

packages/core/package.json

@@ -1,6 +1,6 @@
 {
   "name": "get-starknet-core",
-  "version": "4.0.0-next.4",
+  "version": "4.0.0",
   "keywords": [
     "starknet",
     "starkware",
@@ -30,8 +30,8 @@
     "test": "vitest"
   },
   "dependencies": {
-    "starknet-types": "^0.0.4",
-    "@module-federation/runtime": "^0.1.2"
+    "@module-federation/runtime": "^0.1.2",
+    "@starknet-io/types-js": "^0.7.7"
   },
   "devDependencies": {
     "c8": "^7.12.0",

packages/core/src/__test__/wallet.mock.ts

@@ -1,5 +1,5 @@
 import wallets from "../discovery"
-import { Permission, type StarknetWindowObject } from "starknet-types"
+import { Permission, type StarknetWindowObject } from "@starknet-io/types-js"
 
 type WalletMock = Pick<StarknetWindowObject, "id" | "name" | "icon" | "request">
 
@@ -47,7 +47,7 @@ export function makeAuthorized(authorized: boolean) {
       request: async (request) => {
         switch (request.type) {
           case "wallet_getPermissions":
-            return authorized ? [Permission.Accounts] : []
+            return authorized ? [Permission.ACCOUNTS] : []
           default:
             return wallet.request(request)
         }
@@ -62,7 +62,7 @@ export function makeConnected(isConnected: boolean) {
       request: async ({ type }) => {
         switch (type) {
           case "wallet_getPermissions":
-            return isConnected ? [Permission.Accounts] : []
+            return isConnected ? [Permission.ACCOUNTS] : []
           default:
             return []
         }

packages/core/src/main.ts

@@ -14,20 +14,18 @@ import {
   initiateVirtualWallets,
   resolveVirtualWallet,
 } from "./wallet/virtualWallets"
-import { Permission, type StarknetWindowObject } from "starknet-types"
+import { Permission, type StarknetWindowObject } from "@starknet-io/types-js"
 
 export type {
   StarknetWindowObject,
   AddDeclareTransactionParameters,
   AddDeclareTransactionResult,
-  AddDeployAccountTransactionParameters,
-  AddDeployAccountTransactionResult,
   AddInvokeTransactionParameters,
   AddInvokeTransactionResult,
   AddStarknetChainParameters,
   RequestAccountsParameters,
   SwitchStarknetChainParameters,
-  GetDeploymentDataResult,
+  AccountDeploymentData,
   WatchAssetParameters,
   TypedData,
   RequestFn,
@@ -39,9 +37,7 @@ export type {
   NetworkChangeEventHandler,
   WalletEventHandlers,
   WalletEvents,
-} from "starknet-types"
-
-export { StarknetChainId, Permission } from "starknet-types"
+} from "@starknet-io/types-js"
 
 export { scanObjectForWallets } from "./wallet/scan"
 export { isWalletObject } from "./wallet/isWalletObject"
@@ -131,15 +127,15 @@ export function getStarknet(
       await wallet.request({
         type: "wallet_requestAccounts",
         params: {
-          silentMode: options?.silentMode,
+          silent_mode: options?.silent_mode,
         },
       })
 
       // check for permissions
-      const permissions = await wallet.request({
+      const permissions: Permission[] = await wallet.request({
         type: "wallet_getPermissions",
       })
-      if (!permissions?.includes(Permission.Accounts)) {
+      if (!permissions?.includes(Permission.ACCOUNTS)) {
         throw new Error("Failed to connect to wallet")
       }
       lastConnectedStore.set(wallet.id)

packages/core/src/types.ts

@@ -6,7 +6,7 @@ import { Sort } from "./wallet/sort"
 import type {
   RequestAccountsParameters,
   StarknetWindowObject,
-} from "starknet-types"
+} from "@starknet-io/types-js"
 
 export type { WalletProvider } from "./discovery"
 

packages/core/src/wallet/filter.ts

@@ -1,5 +1,5 @@
 import type { WalletProvider } from "../discovery"
-import { Permission, type StarknetWindowObject } from "starknet-types"
+import { Permission, type StarknetWindowObject } from "@starknet-io/types-js"
 
 export type FilterList = string[]
 interface FilterByOptions {
@@ -34,13 +34,14 @@ export const filterByAuthorized = async (
   const preAuthResponses = await Promise.all(
     wallets.map(async (wallet) => {
       try {
-        const result = await wallet.request({ type: "wallet_getPermissions" })
-        return result.includes(Permission.Accounts)
+        const result: Permission[] = await wallet.request({
+          type: "wallet_getPermissions",
+        })
+        return result.includes(Permission.ACCOUNTS)
       } catch {
         return false
       }
-    }
-    ),
+    }),
   )
   return wallets.filter((_, i) => preAuthResponses[i])
 }

packages/core/src/wallet/scan.ts

@@ -1,4 +1,4 @@
-import type { StarknetWindowObject } from "starknet-types"
+import type { StarknetWindowObject } from "@starknet-io/types-js"
 
 export function scanObjectForWallets(
   obj: Record<string, any>,

packages/core/src/wallet/sort.ts

@@ -1,6 +1,6 @@
 import { WalletProvider } from "../discovery"
 import { shuffle } from "../utils"
-import { type StarknetWindowObject } from "starknet-types"
+import { type StarknetWindowObject } from "@starknet-io/types-js"
 
 export type Sort = string[] | "random" | null | undefined
 

packages/ui/package.json

@@ -1,6 +1,6 @@
 {
   "name": "get-starknet",
-  "version": "4.0.0-next.2",
+  "version": "4.0.0",
   "keywords": [
     "starknet",
     "starkware",
@@ -31,7 +31,7 @@
   },
   "dependencies": {
     "bowser": "^2.11.0",
-    "get-starknet-core": "workspace:^4.0.0-next.2"
+    "get-starknet-core": "workspace:^4.0.0"
   },
   "devDependencies": {
     "@sveltejs/vite-plugin-svelte": "^1.0.1",