diff --git a/LICENSE b/LICENSE index 5dbd3fd..bde3196 100644 --- a/LICENSE +++ b/LICENSE @@ -1,21 +1,201 @@ -MIT License + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ -Copyright (c) 2024 Wonderland + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: + 1. Definitions. -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -SOFTWARE. + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright 2025 0XBOW LTD + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. diff --git a/package.json b/package.json index 475179a..bf0d252 100644 --- a/package.json +++ b/package.json @@ -6,7 +6,7 @@ "type": "git", "url": "git+https://github.com/defi-wonderland/privacy-pool-core.git" }, - "license": "MIT", + "license": "Apache-2.0", "author": "Wonderland", "private": true, "workspaces": [ diff --git a/packages/circuits/.gitignore b/packages/circuits/.gitignore index dd16538..c2de51e 100644 --- a/packages/circuits/.gitignore +++ b/packages/circuits/.gitignore @@ -119,3 +119,6 @@ tmp.ptau # ignore auto generated test circuits circuits/test ptau + +# artifacts +artifacts/** diff --git a/packages/circuits/package.json b/packages/circuits/package.json index 08a3264..56ba31b 100644 --- a/packages/circuits/package.json +++ b/packages/circuits/package.json @@ -3,7 +3,7 @@ "version": "0.1.0", "description": "Circom circuits for the Privacy Pool protocol", "repository": "https://github.com/defi-wonderland/privacy-pool-core", - "license": "MIT", + "license": "Apache-2.0", "author": "Wonderland", "scripts": { "compile": "npx ts-node ./src/index.ts", diff --git a/packages/circuits/scripts/present.sh b/packages/circuits/scripts/present.sh old mode 100644 new mode 100755 diff --git a/packages/contracts/package.json b/packages/contracts/package.json index c3114c4..547597b 100644 --- a/packages/contracts/package.json +++ b/packages/contracts/package.json @@ -3,7 +3,7 @@ "version": "0.1.0", "description": "Solidity smart contracts for the Privacy Pool protocol", "repository": "https://github.com/defi-wonderland/privacy-pool-core", - "license": "MIT", + "license": "Apache-2.0", "author": "Wonderland", "scripts": { "assignrole:sepolia": "bash -c 'source .env && forge script script/Entrypoint.s.sol:AssignRole --account $SEPOLIA_DEPLOYER_NAME --rpc-url $SEPOLIA_RPC -vv $0'", @@ -23,7 +23,7 @@ "test:symbolic": "echo 'update this yarn script when symbolic testing is implemented'", "test:unit": "forge test --match-contract Unit -vvv", "test:unit:deep": "FOUNDRY_FUZZ_RUNS=5000 yarn test:unit", - "updateroot:sepolia": "bash -c 'source .env && forge script script/Entrypoint.s.sol:UpdateRoot --ffi --account $SEPOLIA_DEPLOYER_NAME --rpc-url $SEPOLIA_RPC -vv $0'" + "updateroot:sepolia": "bash -c 'source .env && forge script script/Entrypoint.s.sol:UpdateRoot --ffi --account $SEPOLIA_POSTMAN --rpc-url $SEPOLIA_RPC -vv $0'" }, "lint-staged": { "*.{js,css,md,ts,sol}": "forge fmt", @@ -31,7 +31,7 @@ "package.json": "sort-package-json" }, "dependencies": { - "@defi-wonderland/privacy-pool-core-sdk": "^0.0.0-febd6b85", + "@defi-wonderland/privacy-pool-core-sdk": "^0.0.0-bc6bbf37", "@openzeppelin/contracts": "5.1.0", "@openzeppelin/contracts-upgradeable": "5.0.2", "@openzeppelin/foundry-upgrades": "0.3.6", diff --git a/packages/contracts/script/utils/leaves.txt b/packages/contracts/script/utils/leaves.txt index 26a64bd..f3a1b10 100644 --- a/packages/contracts/script/utils/leaves.txt +++ b/packages/contracts/script/utils/leaves.txt @@ -1,3 +1 @@ -123456789 -987654321 -246813579 +8145717498805628540975654055034449486006540375691386240327607327068104494011 diff --git a/packages/contracts/script/utils/tree.mjs b/packages/contracts/script/utils/tree.mjs index d49b407..e3931da 100644 --- a/packages/contracts/script/utils/tree.mjs +++ b/packages/contracts/script/utils/tree.mjs @@ -1,21 +1,22 @@ import { LeanIMT } from "@zk-kit/lean-imt"; import { poseidon } from "maci-crypto/build/ts/hashing.js"; import * as fs from "fs"; -import { fileURLToPath } from 'url'; -import { dirname, resolve } from 'path'; +import { fileURLToPath } from "url"; +import { dirname, resolve } from "path"; +import { encodeAbiParameters } from "viem"; const __filename = fileURLToPath(import.meta.url); const __dirname = dirname(__filename); const leaves = fs - .readFileSync( - resolve(__dirname, "leaves.txt"), - "utf8", - ) + .readFileSync(resolve(__dirname, "leaves.txt"), "utf8") .split("\n") .filter((line) => line.trim() !== "") .map((line) => BigInt(line)); const tree = new LeanIMT((a, b) => poseidon([a, b])); tree.insertMany(leaves); -process.stdout.write(tree.root.toString()); + +const encodedRoot = encodeAbiParameters([{ type: "uint256" }], [tree.root]); + +process.stdout.write(encodedRoot); diff --git a/packages/relayer/package.json b/packages/relayer/package.json index c956262..142e8ae 100644 --- a/packages/relayer/package.json +++ b/packages/relayer/package.json @@ -3,7 +3,7 @@ "version": "0.1.0", "private": true, "description": "A simple note relayer", - "license": "MIT", + "license": "Apache-2.0", "author": "Wonderland", "type": "module", "main": "./dist/src/index.js", @@ -29,11 +29,11 @@ "lint:fix": "eslint \"{src,test}/**/*.{js,ts,json}\" --fix", "test": "vitest run --config vitest.config.ts --passWithNoTests", "test:cov": "vitest run --config vitest.config.ts --coverage", - "docker:build": "docker-compose build", + "docker:build": "cd ../circuits && yarn present && cd ../relayer && docker-compose build --no-cache", "docker:run": "docker-compose up" }, "dependencies": { - "@defi-wonderland/privacy-pool-core-sdk": "0.0.0-febd6b85", + "@defi-wonderland/privacy-pool-core-sdk": "0.0.0-bc6bbf37", "ajv": "8.17.1", "body-parser": "1.20.3", "express": "4.21.2", diff --git a/packages/sdk/package.json b/packages/sdk/package.json index ef0ca4a..ae0fdbb 100644 --- a/packages/sdk/package.json +++ b/packages/sdk/package.json @@ -3,7 +3,7 @@ "version": "0.1.0", "description": "Typescript SDK for the Privacy Pool protocol", "repository": "https://github.com/defi-wonderland/privacy-pool-core", - "license": "MIT", + "license": "Apache-2.0", "author": "Wonderland", "type": "module", "main": "./dist/node/index.mjs", @@ -57,6 +57,7 @@ "@zk-kit/lean-imt": "2.2.2", "maci-crypto": "2.5.0", "snarkjs": "0.7.5", + "typescript": "^5.7.3", "viem": "2.22.14" }, "devDependencies": { diff --git a/packages/sdk/src/core/contracts.service.ts b/packages/sdk/src/core/contracts.service.ts index ce68aef..35f5504 100644 --- a/packages/sdk/src/core/contracts.service.ts +++ b/packages/sdk/src/core/contracts.service.ts @@ -185,7 +185,7 @@ export class ContractInteractionsService implements ContractInteractions { address: this.entrypointAddress, abi: [...(IEntrypointABI as Abi), ...(IPrivacyPoolABI as Abi)], functionName: "relay", - account: this.account.address as Address, + account: this.account, args: [withdrawal, formattedProof, scope], }); diff --git a/yarn.lock b/yarn.lock index 349db98..bd3764f 100644 --- a/yarn.lock +++ b/yarn.lock @@ -351,7 +351,19 @@ solc-typed-ast "18.1.6" yargs "17.7.2" -"@defi-wonderland/privacy-pool-core-sdk@0.0.0-febd6b85", "@defi-wonderland/privacy-pool-core-sdk@^0.0.0-febd6b85": +"@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==