Merge remote-tracking branch 'origin/fix/relayer-sdk' into setup-pipeline

2026-01-09 01:17:58 -05:00 · 2025-02-18 15:18:29 -08:00
parent f36608f507 022e4df79f
commit 444c915776
19 changed files with 17 additions and 39 deletions
--- a/.github/workflows/circuits.yml
+++ b/.github/workflows/circuits.yml
@@ -43,11 +43,6 @@ jobs:
      - name: Print Circom version
        run: circom --version

-      - name: Setup .npmrc file
-        run: |
-          echo "@defi-wonderland:registry=https://npm.pkg.github.com" > .npmrc
-          echo "//npm.pkg.github.com/:_authToken=${{ secrets.PKG_REGISTRY_TOKEN }}" >> .npmrc
-
      - name: Install dependencies
        run: yarn

--- a/.github/workflows/contracts.yml
+++ b/.github/workflows/contracts.yml
@@ -38,11 +38,6 @@ jobs:
          node-version: 20.x
          cache: "yarn"

-      - name: Setup .npmrc file
-        run: |
-          echo "@defi-wonderland:registry=https://npm.pkg.github.com" > .npmrc
-          echo "//npm.pkg.github.com/:_authToken=${{ secrets.PKG_REGISTRY_TOKEN }}" >> .npmrc
-
      - name: Install dependencies
        run: yarn --frozen-lockfile --network-concurrency 1

@@ -153,7 +148,7 @@ jobs:

      - name: Run Medusa
        run: medusa fuzz --test-limit 200000
-      
+
  upload-coverage:
    name: Upload Coverage
    runs-on: ubuntu-latest
--- a/.github/workflows/relayer.yml
+++ b/.github/workflows/relayer.yml
@@ -27,11 +27,6 @@ jobs:
        with:
          fetch-depth: 1

-      - name: Setup .npmrc file
-        run: |
-          echo "@defi-wonderland:registry=https://npm.pkg.github.com" > .npmrc
-          echo "//npm.pkg.github.com/:_authToken=${{ secrets.PKG_REGISTRY_TOKEN }}" >> .npmrc
-
      - name: Install dependencies
        run: yarn --frozen-lockfile --network-concurrency 1
        env:
--- a/.github/workflows/sdk.yml
+++ b/.github/workflows/sdk.yml
@@ -27,11 +27,6 @@ jobs:
        with:
          fetch-depth: 1

-      - name: Setup .npmrc file
-        run: |
-          echo "@defi-wonderland:registry=https://npm.pkg.github.com" > .npmrc
-          echo "//npm.pkg.github.com/:_authToken=${{ secrets.PKG_REGISTRY_TOKEN }}" >> .npmrc
-
      - name: Install dependencies
        run: yarn --frozen-lockfile --network-concurrency 1

--- a/packages/contracts/package.json
+++ b/packages/contracts/package.json
@@ -31,7 +31,7 @@
    "package.json": "sort-package-json"
  },
  "dependencies": {
-    "@defi-wonderland/privacy-pool-core-sdk": "^0.0.0-bc6bbf37",
+    "@0xbow/privacy-pools-core-sdk": "^0.1.5",
    "@openzeppelin/contracts": "5.1.0",
    "@openzeppelin/contracts-upgradeable": "5.0.2",
    "@openzeppelin/foundry-upgrades": "0.3.6",
--- a/packages/contracts/test/helper/MerkleProofGenerator.mjs
+++ b/packages/contracts/test/helper/MerkleProofGenerator.mjs
@@ -1,6 +1,6 @@
 #!/usr/bin/env node
 import { encodeAbiParameters } from "viem";
-import { generateMerkleProof } from "@defi-wonderland/privacy-pool-core-sdk";
+import { generateMerkleProof } from "@0xbow/privacy-pools-core-sdk";

 // Function to temporarily redirect stdout
 function withSilentStdout(fn) {
--- a/packages/contracts/test/helper/RagequitProofGenerator.mjs
+++ b/packages/contracts/test/helper/RagequitProofGenerator.mjs
@@ -2,7 +2,7 @@
 import {
  PrivacyPoolSDK,
  Circuits,
-} from "@defi-wonderland/privacy-pool-core-sdk";
+} from "@0xbow/privacy-pools-core-sdk";
 import { encodeAbiParameters } from "viem";

 // Function to temporarily redirect stdout
--- a/packages/contracts/test/helper/WithdrawalProofGenerator.mjs
+++ b/packages/contracts/test/helper/WithdrawalProofGenerator.mjs
@@ -3,7 +3,7 @@ import {
  PrivacyPoolSDK,
  Circuits,
  getCommitment,
-} from "@defi-wonderland/privacy-pool-core-sdk";
+} from "@0xbow/privacy-pools-core-sdk";
 import { encodeAbiParameters, decodeAbiParameters } from "viem";

 function padSiblings(siblings, treeDepth) {
--- a/packages/relayer/Dockerfile
+++ b/packages/relayer/Dockerfile
@@ -4,7 +4,7 @@ WORKDIR /build
 RUN yarn global add typescript

 # Copy package files
-COPY package.json .npmrc tsconfig.build.json config.json ./
+COPY package.json tsconfig.build.json config.json ./
 RUN yarn install

 COPY src/ ./src/
--- a/packages/relayer/docker-compose.yml
+++ b/packages/relayer/docker-compose.yml
@@ -8,6 +8,6 @@ services:
    volumes:
      - /tmp/pp_relayer.sqlite:/pp_relayer.sqlite
      - ./config.example.json:/build/config.json
-      - ../circuits/artifacts:/build/node_modules/@defi-wonderland/privacy-pool-core-sdk/dist/node/artifacts
+      - ../circuits/artifacts:/build/node_modules/@0xbow/privacy-pools-core-sdk/dist/node/artifacts
    ports:
      - "3000:3000" # HOST:CONTAINER
--- a/packages/relayer/package.json
+++ b/packages/relayer/package.json
@@ -33,7 +33,7 @@
    "docker:run": "docker-compose up"
  },
  "dependencies": {
-    "@defi-wonderland/privacy-pool-core-sdk": "0.0.0-bc6bbf37",
+    "@0xbow/privacy-pools-core-sdk": "0.1.5",
    "ajv": "8.17.1",
    "body-parser": "1.20.3",
    "express": "4.21.2",
--- a/packages/relayer/src/interfaces/relayer/request.ts
+++ b/packages/relayer/src/interfaces/relayer/request.ts
@@ -1,7 +1,7 @@
 import {
  Withdrawal,
  WithdrawalProof,
-} from "@defi-wonderland/privacy-pool-core-sdk";
+} from "@0xbow/privacy-pools-core-sdk";

 /**
 * Represents the proof payload for a relayer request.
--- a/packages/relayer/src/providers/sdk.provider.ts
+++ b/packages/relayer/src/providers/sdk.provider.ts
@@ -11,7 +11,7 @@ import {
  WithdrawalProof,
  SDKError,
  type Hash,
-} from "@defi-wonderland/privacy-pool-core-sdk";
+} from "@0xbow/privacy-pools-core-sdk";
 import { Address } from "viem";
 import {
  CHAIN,
--- a/packages/relayer/src/types/sdk.types.ts
+++ b/packages/relayer/src/types/sdk.types.ts
@@ -2,7 +2,7 @@ import {
  Address,
  Withdrawal,
  WithdrawalProof,
-} from "@defi-wonderland/privacy-pool-core-sdk";
+} from "@0xbow/privacy-pools-core-sdk";
 import { WithdrawalPayload } from "../interfaces/relayer/request.js";

 export interface SdkProviderInterface {
--- a/packages/relayer/test/integration/relay/package.json
+++ b/packages/relayer/test/integration/relay/package.json
@@ -12,7 +12,7 @@
    "main": "node dist/main.js"
  },
  "devDependencies": {
-    "@defi-wonderland/privacy-pool-core-sdk": "0.1.0",
+    "@0xbow/privacy-pools-core-sdk": "0.1.5",
    "@types/node": "^22.13.0",
    "typescript": "5.5.4"
  }
--- a/packages/relayer/test/integration/relay/src/create-withdrawal.ts
+++ b/packages/relayer/test/integration/relay/src/create-withdrawal.ts
@@ -10,7 +10,7 @@ import {
  Withdrawal,
  WithdrawalProof,
  WithdrawalProofInput,
-} from "@defi-wonderland/privacy-pool-core-sdk";
+} from "@0xbow/privacy-pools-core-sdk";
 import { Address, defineChain, Hex } from "viem";
 import { localhost } from "viem/chains";

--- a/packages/relayer/test/integration/relay/src/main.ts
+++ b/packages/relayer/test/integration/relay/src/main.ts
@@ -1,7 +1,7 @@
 import { encodeAbiParameters, getAddress, Hex } from "viem";
 import { request } from "./api-test.js";
 import { deposit, proveWithdrawal } from "./create-withdrawal.js";
-import { Hash, Withdrawal } from "@defi-wonderland/privacy-pool-core-sdk";
+import { Hash, Withdrawal } from "@0xbow/privacy-pools-core-sdk";

 const FeeDataAbi = [
  {
--- a/packages/relayer/test/unit/privacyPoolRelayer.service.spec.ts
+++ b/packages/relayer/test/unit/privacyPoolRelayer.service.spec.ts
@@ -14,7 +14,7 @@ import {
  dataMismatchFeeRecipient,
 } from "../inputs/validateWithdrawal.input.ts";

-import { WithdrawalProof } from "@defi-wonderland/privacy-pool-core-sdk";
+import { WithdrawalProof } from "@0xbow/privacy-pools-core-sdk";
 import * as Config from "../../src/config.ts";
 import { PrivacyPoolRelayer } from "../../src/services/privacyPoolRelayer.service.ts";
 import { RelayerDatabase } from "../../src/types/db.types.ts";
--- a/packages/sdk/package.json
+++ b/packages/sdk/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@0xbow/privacy-pools-core-sdk",
-  "version": "0.1.0",
+  "version": "0.1.1",
  "description": "Typescript SDK for the Privacy Pool protocol",
  "repository": "https://github.com/0xbow-io/privacy-pools-core",
  "license": "Apache-2.0",
@@ -9,9 +9,7 @@
  "main": "./dist/node/index.mjs",
  "module": "./dist/esm/index.mjs",
  "browser": "./dist/esm/index.mjs",
-  "types": {
-    "import": "./dist/index.d.mts"
-  },
+  "types": "./dist/index.d.mts",
  "exports": {
    "node": {
      "types": "./dist/index.d.mts",