Merge branch 'polytope-labs:main' into main

Author: haroldsphinx

.github/workflows/publish-sdk.yml

@@ -32,12 +32,12 @@ jobs:
               run: pnpm install
 
             - name: Build SDK
-              run: pnpm --filter="hyperbridge-sdk" build
+              run: pnpm --filter="@hyperbridge/sdk" build
 
             - name: Publish to npm
               run: |
                   echo "//registry.npmjs.org/:_authToken=${NODE_AUTH_TOKEN}" > ~/.npmrc
-                  pnpm --filter="hyperbridge-sdk" publish --no-git-checks
+                  pnpm --filter="@hyperbridge/sdk" publish --no-git-checks
               env:
                   NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
 
@@ -66,22 +66,26 @@ jobs:
               id: changelog
               run: |
                   if [ -n "${{ steps.get_previous_tag.outputs.PREVIOUS_TAG }}" ]; then
-                    echo "CHANGELOG<<EOF" >> $GITHUB_OUTPUT
-                    echo "## Changes since ${{ steps.get_previous_tag.outputs.PREVIOUS_TAG }}" >> $GITHUB_OUTPUT
-                    git log --pretty=format:"* %s (%h)" ${{ steps.get_previous_tag.outputs.PREVIOUS_TAG }}..${{ steps.get_version.outputs.VERSION }} >> $GITHUB_OUTPUT
-                    echo "EOF" >> $GITHUB_OUTPUT
+                    {
+                      echo "CHANGELOG<<EOF"
+                      echo "## Changes since ${{ steps.get_previous_tag.outputs.PREVIOUS_TAG }}"
+                      git log --pretty=format:"* %s (%h)" ${{ steps.get_previous_tag.outputs.PREVIOUS_TAG }}..${{ steps.get_version.outputs.VERSION }} >> $GITHUB_OUTPUT
+                      echo "EOF"
+                    } >> $GITHUB_OUTPUT
                   else
-                    echo "CHANGELOG<<EOF" >> $GITHUB_OUTPUT
-                    echo "## Initial Release" >> $GITHUB_OUTPUT
-                    git log --pretty=format:"* %s (%h)" >> $GITHUB_OUTPUT
-                    echo "EOF" >> $GITHUB_OUTPUT
+                    {
+                      echo "CHANGELOG<<EOF"
+                      echo "## Initial Release"
+                      git log --pretty=format:"* %s (%h)"
+                      echo "EOF"
+                    } >> $GITHUB_OUTPUT
                   fi
 
             - name: Create GitHub Release
               uses: softprops/action-gh-release@v1
               with:
-                  tag_name: ${{ steps.get_version.outputs.VERSION }}
-                  name: Release ${{ steps.get_version.outputs.VERSION }}
+                  tag_name: hyperbridge-sdk-${{ steps.get_version.outputs.VERSION }}
+                  name: Hyperbridge SDK ${{ steps.get_version.outputs.VERSION }}
                   body: ${{ steps.changelog.outputs.CHANGELOG }}
                   draft: true
               env:

.github/workflows/test-sdk.yml

@@ -103,7 +103,7 @@ jobs:
                   sleep 10  # Give it a few more seconds to fully initialize
 
             - name: Run SDK tests
-              run: pnpm --filter="hyperbridge-sdk" test
+              run: pnpm --filter="@hyperbridge/sdk" test
 
             - name: Run Intent Filler tests
               run: pnpm --filter="filler" test

.gitignore

@@ -77,8 +77,7 @@ Thumbs.db
 .tsconfig
 .tsbuildinfo
 
-evm-ws.json
-substrate-ws.json
+env-config.json
 chain-ids-by-genesis.ts
 chains-by-ismp-host.ts
 

package.json

@@ -7,7 +7,7 @@
 		"packages/*"
 	],
 	"scripts": {
-		"build": "pnpm --filter=\"hyperbridge-sdk\" build && pnpm --filter=\"@hyperbridge/indexer\" build && pnpm --filter=\"@hyperbridge/filler\" build",
+		"build": "pnpm --filter=\"@hyperbridge/sdk\" build && pnpm --filter=\"@hyperbridge/indexer\" build && pnpm --filter=\"@hyperbridge/filler\" build",
 		"test": "pnpm --filter=\"*\" test",
 		"lint": "pnpm --filter=\"*\" lint",
 		"format": "pnpm --filter=\"*\" format",

packages/filler/package.json

@@ -42,6 +42,7 @@
 		"node": ">=18.0.0"
 	},
 	"dependencies": {
+		"@hyperbridge/sdk": "workspace:*",
 		"@polkadot/api": "^15.9.1",
 		"@polkadot/util-crypto": "^13.4.4",
 		"@safe-global/api-kit": "^3.0.1",
@@ -50,7 +51,6 @@
 		"ckb-mmr-wasm": "link:wasm-b",
 		"dotenv": "^16.4.7",
 		"ethers": "^5.7.2",
-		"hyperbridge-sdk": "workspace:*",
 		"p-queue": "^8.1.0",
 		"scale-ts": "^1.6.1",
 		"viem": "^2.23.5"

packages/filler/pnpm-lock.yaml

@@ -6,7 +6,7 @@ import {
 	DUMMY_PRIVATE_KEY,
 	hexToString,
 	DecodedOrderPlacedLog,
-} from "hyperbridge-sdk"
+} from "@hyperbridge/sdk"
 import { INTENT_GATEWAY_ABI } from "@/config/abis/IntentGateway"
 import { PublicClient } from "viem"
 import { addresses } from "@/config/chain"

packages/filler/src/core/event-monitor.ts

@@ -1,7 +1,7 @@
 import { chainIds } from "@/config/chain"
 import { EventMonitor } from "./event-monitor"
 import { FillerStrategy } from "@/strategies/base"
-import { Order, FillerConfig, ChainConfig, DUMMY_PRIVATE_KEY, ADDRESS_ZERO, bytes20ToBytes32 } from "hyperbridge-sdk"
+import { Order, FillerConfig, ChainConfig, DUMMY_PRIVATE_KEY, ADDRESS_ZERO, bytes20ToBytes32 } from "@hyperbridge/sdk"
 import pQueue from "p-queue"
 import { ChainClientManager, ChainConfigService, ContractInteractionService } from "@/services"
 import { fetchTokenUsdPriceOnchain } from "@/utils"
@@ -76,7 +76,7 @@ export class IntentFiller {
 					orderValue,
 				)
 				console.log(
-					`For order ${order.id}, required confirmations: ${requiredConfirmations}, 
+					`For order ${order.id}, required confirmations: ${requiredConfirmations},
 					current confirmations: ${currentConfirmations}`,
 				)
 

packages/filler/src/core/filler.ts

@@ -1,6 +1,6 @@
 import { PublicClient, WalletClient, createPublicClient, createWalletClient, http, type Chain } from "viem"
 import { privateKeyToAccount } from "viem/accounts"
-import { Order, HexString, ChainConfig } from "hyperbridge-sdk"
+import { Order, HexString, ChainConfig } from "@hyperbridge/sdk"
 import { ChainConfigService } from "./ChainConfigService"
 import { viemChains } from "@/config/chain"
 

packages/filler/src/services/ChainClientManager.ts

@@ -1,5 +1,5 @@
 import { toHex } from "viem"
-import { ChainConfig, HexString } from "hyperbridge-sdk"
+import { ChainConfig, HexString } from "@hyperbridge/sdk"
 import {
 	addresses,
 	assets,