Merge branch 'dev' into setup-pipeline

This commit is contained in:
moebius
2025-02-19 14:45:41 +01:00
committed by GitHub
6 changed files with 44 additions and 78 deletions

View File

@@ -65,28 +65,8 @@ 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
working-directory: .
- name: Install root dependencies
- name: Install dependencies
run: yarn --frozen-lockfile --network-concurrency 1
working-directory: .
- name: Build SDK
run: |
yarn build
chmod +x ./scripts/copy_circuits.sh
bash ./scripts/copy_circuits.sh
working-directory: packages/sdk
- name: Link SDK
run: |
cd ../sdk && yarn link
cd ../contracts && yarn link "@defi-wonderland/privacy-pool-core-sdk"
shell: bash
- name: Precompile
run: yarn build
@@ -116,11 +96,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
@@ -137,11 +112,11 @@ jobs:
with:
submodules: recursive
- 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
working-directory: .
- name: Use Node.js
uses: actions/setup-node@v4
with:
node-version: 20.x
cache: "yarn"
- name: Install dependencies
run: yarn --frozen-lockfile --network-concurrency 1
@@ -165,15 +140,7 @@ jobs:
uses: actions/setup-node@v4
with:
node-version: 20.x
# cache: "yarn"
- name: Install Yarn
run: npm install -g 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
cache: "yarn"
- name: Install dependencies
run: yarn --frozen-lockfile --network-concurrency 1

View File

@@ -28,10 +28,14 @@ jobs:
with:
fetch-depth: 1
- name: Use Node.js
uses: actions/setup-node@v4
with:
node-version: 20.x
cache: "yarn"
- name: Install dependencies
run: yarn --frozen-lockfile --network-concurrency 1
env:
NODE_AUTH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
- name: Run Build
run: yarn build
@@ -51,15 +55,14 @@ 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: Use Node.js
uses: actions/setup-node@v4
with:
node-version: 20.x
cache: "yarn"
- name: Install dependencies
run: yarn install --frozen-lockfile
env:
NODE_AUTH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
- name: Run tests with coverage
run: yarn test:cov

View File

@@ -27,6 +27,12 @@ jobs:
with:
fetch-depth: 1
- name: Use Node.js
uses: actions/setup-node@v4
with:
node-version: 20.x
cache: "yarn"
- name: Install dependencies
run: yarn --frozen-lockfile --network-concurrency 1
@@ -45,10 +51,11 @@ 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: Use Node.js
uses: actions/setup-node@v4
with:
node-version: 20.x
cache: "yarn"
- name: Install dependencies
run: yarn install --frozen-lockfile

View File

@@ -11,7 +11,7 @@ template CommitmentHasher() {
//////////////////////// SIGNALS ////////////////////////
signal input value; // Value of commitment
signal input label; // keccak256(pool_scope, nonce)
signal input label; // keccak256(pool_scope, nonce) % SNARK_SCALAR_FIELD
signal input nullifier; // Nullifier of commitment
signal input secret; // Secret of commitment

View File

@@ -21,7 +21,7 @@ template Withdraw(maxTreeDepth) {
signal input stateTreeDepth; // Current state tree depth
signal input ASPRoot; // Latest ASP root
signal input ASPTreeDepth; // Current ASP tree depth
signal input context; // keccak256(IPrivacyPool.Withdrawal, scope)
signal input context; // keccak256(IPrivacyPool.Withdrawal, scope) % SNARK_SCALAR_FIELD
//////////////////// END OF PUBLIC SIGNALS ////////////////////
@@ -29,7 +29,7 @@ template Withdraw(maxTreeDepth) {
/////////////////////// PRIVATE SIGNALS ///////////////////////
// Signals to compute commitments
signal input label; // keccak256(scope, nonce)
signal input label; // keccak256(scope, nonce) % SNARK_SCALAR_FIELD
signal input existingValue; // Value of the existing commitment
signal input existingNullifier; // Nullifier of the existing commitment
signal input existingSecret; // Secret of the existing commitment

View File

@@ -2,6 +2,18 @@
# yarn lockfile v1
"@0xbow/privacy-pools-core-sdk@0.1.5", "@0xbow/privacy-pools-core-sdk@^0.1.5":
version "0.1.5"
resolved "https://registry.yarnpkg.com/@0xbow/privacy-pools-core-sdk/-/privacy-pools-core-sdk-0.1.5.tgz#a574a1ade5f886c7e2c1e5d4907959cdf68e9de5"
integrity sha512-iWLyhvfV5z6MPB5EBXyVRtpytbn8GsMSFlKVgnJ2goPb089KNHfMzwvmcgqPh2P8+i6bgB+9bBCrxvgOnLncmA==
dependencies:
"@types/snarkjs" "0.7.9"
"@zk-kit/lean-imt" "2.2.2"
maci-crypto "2.5.0"
snarkjs "0.7.5"
typescript "^5.7.3"
viem "2.22.14"
"@adraffy/ens-normalize@1.10.1":
version "1.10.1"
resolved "https://registry.yarnpkg.com/@adraffy/ens-normalize/-/ens-normalize-1.10.1.tgz#63430d04bd8c5e74f8d7d049338f1cd9d4f02069"
@@ -351,29 +363,6 @@
solc-typed-ast "18.1.6"
yargs "17.7.2"
"@defi-wonderland/privacy-pool-core-sdk@0.0.0-bc6bbf37":
version "0.0.0-bc6bbf37"
resolved "https://npm.pkg.github.com/download/@defi-wonderland/privacy-pool-core-sdk/0.0.0-bc6bbf37/fab308c2ea6c43803561140f7774bfdad89a0fdd#fab308c2ea6c43803561140f7774bfdad89a0fdd"
integrity sha512-hjdlt7ZpR8pPsgyuhBihOLp+HBovxVOkIzn0jr00paPwbFGYr0iQBnHDW7Z3Gb4i/x5V/exPvlMyhC+KlChqWQ==
dependencies:
"@types/snarkjs" "0.7.9"
"@zk-kit/lean-imt" "2.2.2"
maci-crypto "2.5.0"
snarkjs "0.7.5"
typescript "^5.7.3"
viem "2.22.14"
"@defi-wonderland/privacy-pool-core-sdk@^0.0.0-bc6bbf37":
version "0.0.0-febd6b85"
resolved "https://npm.pkg.github.com/download/@defi-wonderland/privacy-pool-core-sdk/0.0.0-febd6b85/a93a34744093ead2257dd8f078faccd25d050234#a93a34744093ead2257dd8f078faccd25d050234"
integrity sha512-aIdlOm/vrt87/TxZ/GywI1obFKLBaPc/cTmuV9lFSd1tGQb3BafgNYrryCCcmrLAlNxZ8p88xHDJVywxW0mJhA==
dependencies:
"@types/snarkjs" "0.7.9"
"@zk-kit/lean-imt" "2.2.2"
maci-crypto "2.5.0"
snarkjs "0.7.5"
viem "2.22.14"
"@esbuild/aix-ppc64@0.24.2":
version "0.24.2"
resolved "https://registry.yarnpkg.com/@esbuild/aix-ppc64/-/aix-ppc64-0.24.2.tgz#38848d3e25afe842a7943643cbcd387cc6e13461"