Merge branch 'dev' of github.com:omnisat/lasereyes-mono into feat/spa…

…rrow-wallet-connect
omnisat · Jan 27, 2025 · 7243341 · 7243341
2 parents 6a63674 + 916e628
commit 7243341
Show file tree

Hide file tree

Showing 5 changed files with 34 additions and 10 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -100,7 +100,12 @@ jobs:
           corepack prepare [email protected] --activate
 
       - name: Install dependencies
-        run: pnpm install
+        id: install_dependencies
+        run: pnpm install --no-frozen-lockfile
+
+      - name: Build all packages
+        id: build_packages
+        run: pnpm build --filter="@omnisat*"
 
       - name: Create .npmrc file
         run: |
@@ -116,27 +121,31 @@ jobs:
                 "${{ needs.check-package-changes.outputs.lasereyes_react_changed }}" == "true" ]]; then
               cd packages/lasereyes
               pnpm version prerelease --preid=rc
+              pnpm publish --access public --no-git-checks --tag next
               cd ../..
           fi
 
           # Bump lasereyes-core if changed
           if [[ "${{ needs.check-package-changes.outputs.lasereyes_core_changed }}" == "true" ]]; then
               cd packages/lasereyes-core
               pnpm version prerelease --preid=rc
+              pnpm publish --access public --no-git-checks --tag next
               cd ../..
           fi
 
           # Bump lasereyes-react if changed
           if [[ "${{ needs.check-package-changes.outputs.lasereyes_react_changed }}" == "true" ]]; then
               cd packages/lasereyes-react
               pnpm version prerelease --preid=rc
+              pnpm publish --access public --no-git-checks --tag next
               cd ../..
           fi
 
           # Bump lasereyes-vue if changed
           if [[ "${{ needs.check-package-changes.outputs.lasereyes_vue_changed }}" == "true" ]]; then
               cd packages/lasereyes-vue
               pnpm version prerelease --preid=rc
+              pnpm publish --access public --no-git-checks --tag next
               cd ../..
           fi
         env:

diff --git a/packages/lasereyes-core/README.md b/packages/lasereyes-core/README.md
@@ -41,9 +41,11 @@ Providers are modular, making it easy to add support for additional wallets. Cur
 - **Leather**
 - **Magic Eden**
 - **OKX**
+- OP_NET
 - **Orange**
 - **Oyl**
 - **Phantom**
+- Sparrow (coming soon)
 - **UniSat**
 - **Wizz**
 - **Xverse**
@@ -481,7 +483,7 @@ This documentation provides an overview of the `LaserEyesClient` class, its cons
 
 ## Contributing
 
-If you'd like to contribute to `@omnisat/lasereyes-core`, feel free to submit pull requests or open issues on the GitHub repository.
+If you'd like to contribute to `@omnisat/lasereyes`, feel free to submit pull requests or open issues on the GitHub repository.
 
 ## License
 

diff --git a/packages/lasereyes-core/package.json b/packages/lasereyes-core/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@omnisat/lasereyes-core",
   "private": false,
-  "version": "0.0.57-rc.0",
+  "version": "0.0.57-rc.2",
   "type": "module",
   "main": "./dist/index.umd.cjs",
   "module": "./dist/index.js",

diff --git a/packages/lasereyes-core/src/client/providers/magic-eden.ts b/packages/lasereyes-core/src/client/providers/magic-eden.ts
@@ -255,10 +255,10 @@ export default class MagicEdenProvider extends WalletProvider {
     broadcast?: boolean | undefined
   ): Promise<
     | {
-      signedPsbtHex: string | undefined
-      signedPsbtBase64: string | undefined
-      txId?: string | undefined
-    }
+        signedPsbtHex: string | undefined
+        signedPsbtBase64: string | undefined
+        txId?: string | undefined
+      }
     | undefined
   > {
     console.log('signPsbt', psbtBase64, _finalize, broadcast)
@@ -269,11 +269,16 @@ export default class MagicEdenProvider extends WalletProvider {
 
     const inputs = toSignPsbt.data.inputs
     const inputsToSign = []
-    const ordinalAddressData = {
+    type InputAddressData = {
+      address: string
+      signingIndexes: number[]
+      sigHash?: number
+    }
+    const ordinalAddressData: InputAddressData = {
       address: address,
       signingIndexes: [] as number[],
     }
-    const paymentsAddressData = {
+    const paymentsAddressData: InputAddressData = {
       address: paymentAddress,
       signingIndexes: [] as number[],
     }
@@ -288,8 +293,16 @@ export default class MagicEdenProvider extends WalletProvider {
 
       if (addressFromScript === paymentAddress) {
         paymentsAddressData.signingIndexes.push(Number(counter))
+        if (input.sighashType) {
+          console.log("Updating sigHash for paymentsAddressData")
+          paymentsAddressData.sigHash = input.sighashType
+        }
       } else if (addressFromScript === address) {
         ordinalAddressData.signingIndexes.push(Number(counter))
+        if (input.sighashType) {
+          console.log("Updating sigHash for ordinalAddressData")
+          ordinalAddressData.sigHash = input.sighashType
+        }
       }
       counter++
     }

diff --git a/packages/lasereyes/package.json b/packages/lasereyes/package.json
@@ -20,7 +20,7 @@
     "url": "https://github.com/omnisat/lasereyes-mono.git"
   },
   "private": false,
-  "version": "0.0.135-rc.0",
+  "version": "0.0.135-rc.2",
   "type": "module",
   "main": "./dist/index.umd.cjs",
   "module": "./dist/index.js",