Skip to content

Commit 5299e07

Browse files
authored
Merge branch 'master' into gnosAA
2 parents 1db6d01 + e93f5fd commit 5299e07

File tree

17 files changed

+247
-61
lines changed

17 files changed

+247
-61
lines changed

.github/workflows/pr-reminder.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
1818
with:
1919
webhook-url: ${{ secrets.DISCORD_WEBHOOK_URL }}
20-
freeze-date: '2025-02-17T18:00:00Z'
20+
freeze-date: '2025-03-17T18:00:00Z'
2121
- name: Reminder for standup
2222
if: github.event.schedule == '55 9 * * 1-5'
2323
uses: Aniket-Engg/pr-reviews-reminder-action@master

LICENSE

Lines changed: 202 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,202 @@
1-
The MIT License (MIT)
2-
3-
Copyright (c) 2016-2018 Contributors
4-
5-
Permission is hereby granted, free of charge, to any person obtaining a copy
6-
of this software and associated documentation files (the "Software"), to deal
7-
in the Software without restriction, including without limitation the rights
8-
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
9-
copies of the Software, and to permit persons to whom the Software is
10-
furnished to do so, subject to the following conditions:
11-
12-
The above copyright notice and this permission notice shall be included in all
13-
copies or substantial portions of the Software.
14-
15-
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
16-
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
17-
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
18-
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
19-
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
20-
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
21-
SOFTWARE.
1+
2+
Apache License
3+
Version 2.0, January 2004
4+
http://www.apache.org/licenses/
5+
6+
TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
7+
8+
1. Definitions.
9+
10+
"License" shall mean the terms and conditions for use, reproduction,
11+
and distribution as defined by Sections 1 through 9 of this document.
12+
13+
"Licensor" shall mean the copyright owner or entity authorized by
14+
the copyright owner that is granting the License.
15+
16+
"Legal Entity" shall mean the union of the acting entity and all
17+
other entities that control, are controlled by, or are under common
18+
control with that entity. For the purposes of this definition,
19+
"control" means (i) the power, direct or indirect, to cause the
20+
direction or management of such entity, whether by contract or
21+
otherwise, or (ii) ownership of fifty percent (50%) or more of the
22+
outstanding shares, or (iii) beneficial ownership of such entity.
23+
24+
"You" (or "Your") shall mean an individual or Legal Entity
25+
exercising permissions granted by this License.
26+
27+
"Source" form shall mean the preferred form for making modifications,
28+
including but not limited to software source code, documentation
29+
source, and configuration files.
30+
31+
"Object" form shall mean any form resulting from mechanical
32+
transformation or translation of a Source form, including but
33+
not limited to compiled object code, generated documentation,
34+
and conversions to other media types.
35+
36+
"Work" shall mean the work of authorship, whether in Source or
37+
Object form, made available under the License, as indicated by a
38+
copyright notice that is included in or attached to the work
39+
(an example is provided in the Appendix below).
40+
41+
"Derivative Works" shall mean any work, whether in Source or Object
42+
form, that is based on (or derived from) the Work and for which the
43+
editorial revisions, annotations, elaborations, or other modifications
44+
represent, as a whole, an original work of authorship. For the purposes
45+
of this License, Derivative Works shall not include works that remain
46+
separable from, or merely link (or bind by name) to the interfaces of,
47+
the Work and Derivative Works thereof.
48+
49+
"Contribution" shall mean any work of authorship, including
50+
the original version of the Work and any modifications or additions
51+
to that Work or Derivative Works thereof, that is intentionally
52+
submitted to Licensor for inclusion in the Work by the copyright owner
53+
or by an individual or Legal Entity authorized to submit on behalf of
54+
the copyright owner. For the purposes of this definition, "submitted"
55+
means any form of electronic, verbal, or written communication sent
56+
to the Licensor or its representatives, including but not limited to
57+
communication on electronic mailing lists, source code control systems,
58+
and issue tracking systems that are managed by, or on behalf of, the
59+
Licensor for the purpose of discussing and improving the Work, but
60+
excluding communication that is conspicuously marked or otherwise
61+
designated in writing by the copyright owner as "Not a Contribution."
62+
63+
"Contributor" shall mean Licensor and any individual or Legal Entity
64+
on behalf of whom a Contribution has been received by Licensor and
65+
subsequently incorporated within the Work.
66+
67+
2. Grant of Copyright License. Subject to the terms and conditions of
68+
this License, each Contributor hereby grants to You a perpetual,
69+
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
70+
copyright license to reproduce, prepare Derivative Works of,
71+
publicly display, publicly perform, sublicense, and distribute the
72+
Work and such Derivative Works in Source or Object form.
73+
74+
3. Grant of Patent License. Subject to the terms and conditions of
75+
this License, each Contributor hereby grants to You a perpetual,
76+
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
77+
(except as stated in this section) patent license to make, have made,
78+
use, offer to sell, sell, import, and otherwise transfer the Work,
79+
where such license applies only to those patent claims licensable
80+
by such Contributor that are necessarily infringed by their
81+
Contribution(s) alone or by combination of their Contribution(s)
82+
with the Work to which such Contribution(s) was submitted. If You
83+
institute patent litigation against any entity (including a
84+
cross-claim or counterclaim in a lawsuit) alleging that the Work
85+
or a Contribution incorporated within the Work constitutes direct
86+
or contributory patent infringement, then any patent licenses
87+
granted to You under this License for that Work shall terminate
88+
as of the date such litigation is filed.
89+
90+
4. Redistribution. You may reproduce and distribute copies of the
91+
Work or Derivative Works thereof in any medium, with or without
92+
modifications, and in Source or Object form, provided that You
93+
meet the following conditions:
94+
95+
(a) You must give any other recipients of the Work or
96+
Derivative Works a copy of this License; and
97+
98+
(b) You must cause any modified files to carry prominent notices
99+
stating that You changed the files; and
100+
101+
(c) You must retain, in the Source form of any Derivative Works
102+
that You distribute, all copyright, patent, trademark, and
103+
attribution notices from the Source form of the Work,
104+
excluding those notices that do not pertain to any part of
105+
the Derivative Works; and
106+
107+
(d) If the Work includes a "NOTICE" text file as part of its
108+
distribution, then any Derivative Works that You distribute must
109+
include a readable copy of the attribution notices contained
110+
within such NOTICE file, excluding those notices that do not
111+
pertain to any part of the Derivative Works, in at least one
112+
of the following places: within a NOTICE text file distributed
113+
as part of the Derivative Works; within the Source form or
114+
documentation, if provided along with the Derivative Works; or,
115+
within a display generated by the Derivative Works, if and
116+
wherever such third-party notices normally appear. The contents
117+
of the NOTICE file are for informational purposes only and
118+
do not modify the License. You may add Your own attribution
119+
notices within Derivative Works that You distribute, alongside
120+
or as an addendum to the NOTICE text from the Work, provided
121+
that such additional attribution notices cannot be construed
122+
as modifying the License.
123+
124+
You may add Your own copyright statement to Your modifications and
125+
may provide additional or different license terms and conditions
126+
for use, reproduction, or distribution of Your modifications, or
127+
for any such Derivative Works as a whole, provided Your use,
128+
reproduction, and distribution of the Work otherwise complies with
129+
the conditions stated in this License.
130+
131+
5. Submission of Contributions. Unless You explicitly state otherwise,
132+
any Contribution intentionally submitted for inclusion in the Work
133+
by You to the Licensor shall be under the terms and conditions of
134+
this License, without any additional terms or conditions.
135+
Notwithstanding the above, nothing herein shall supersede or modify
136+
the terms of any separate license agreement you may have executed
137+
with Licensor regarding such Contributions.
138+
139+
6. Trademarks. This License does not grant permission to use the trade
140+
names, trademarks, service marks, or product names of the Licensor,
141+
except as required for reasonable and customary use in describing the
142+
origin of the Work and reproducing the content of the NOTICE file.
143+
144+
7. Disclaimer of Warranty. Unless required by applicable law or
145+
agreed to in writing, Licensor provides the Work (and each
146+
Contributor provides its Contributions) on an "AS IS" BASIS,
147+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
148+
implied, including, without limitation, any warranties or conditions
149+
of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
150+
PARTICULAR PURPOSE. You are solely responsible for determining the
151+
appropriateness of using or redistributing the Work and assume any
152+
risks associated with Your exercise of permissions under this License.
153+
154+
8. Limitation of Liability. In no event and under no legal theory,
155+
whether in tort (including negligence), contract, or otherwise,
156+
unless required by applicable law (such as deliberate and grossly
157+
negligent acts) or agreed to in writing, shall any Contributor be
158+
liable to You for damages, including any direct, indirect, special,
159+
incidental, or consequential damages of any character arising as a
160+
result of this License or out of the use or inability to use the
161+
Work (including but not limited to damages for loss of goodwill,
162+
work stoppage, computer failure or malfunction, or any and all
163+
other commercial damages or losses), even if such Contributor
164+
has been advised of the possibility of such damages.
165+
166+
9. Accepting Warranty or Additional Liability. While redistributing
167+
the Work or Derivative Works thereof, You may choose to offer,
168+
and charge a fee for, acceptance of support, warranty, indemnity,
169+
or other liability obligations and/or rights consistent with this
170+
License. However, in accepting such obligations, You may act only
171+
on Your own behalf and on Your sole responsibility, not on behalf
172+
of any other Contributor, and only if You agree to indemnify,
173+
defend, and hold each Contributor harmless for any liability
174+
incurred by, or claims asserted against, such Contributor by reason
175+
of your accepting any such warranty or additional liability.
176+
177+
END OF TERMS AND CONDITIONS
178+
179+
APPENDIX: How to apply the Apache License to your work.
180+
181+
To apply the Apache License to your work, attach the following
182+
boilerplate notice, with the fields enclosed by brackets "[]"
183+
replaced with your own identifying information. (Don't include
184+
the brackets!) The text should be enclosed in the appropriate
185+
comment syntax for the file format. We also recommend that a
186+
file or class name and description of purpose be included on the
187+
same "printed page" as the copyright notice for easier
188+
identification within third-party archives.
189+
190+
Copyright 2025 Remix labs
191+
192+
Licensed under the Apache License, Version 2.0 (the "License");
193+
you may not use this file except in compliance with the License.
194+
You may obtain a copy of the License at
195+
196+
http://www.apache.org/licenses/LICENSE-2.0
197+
198+
Unless required by applicable law or agreed to in writing, software
199+
distributed under the License is distributed on an "AS IS" BASIS,
200+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
201+
See the License for the specific language governing permissions and
202+
limitations under the License.

apps/remix-ide/src/app/plugins/templates-selection/templates.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -339,8 +339,8 @@ export const templates = (intl, plugin) => {
339339
{
340340
name: "Noir ZKP",
341341
items: [
342-
{ value: "multNr", tagList: ["ZKP", "Noir"], displayName: intl.formatMessage({ id: 'filePanel.multNr' }), description: 'A simple multiplier circuit' },
343-
{ value: "stealthDropNr", tagList: ["ZKP", "Noir"], displayName: intl.formatMessage({ id: 'filePanel.stealthDropNr' }), description: 'A stealth drop implementaion built in Noir' }
342+
{ value: "multNr", tagList: ["ZKP", "Noir"], displayName: intl.formatMessage({ id: 'filePanel.multNr' }), description: 'A simple multiplier circuit' }
343+
// { value: "stealthDropNr", tagList: ["ZKP", "Noir"], displayName: intl.formatMessage({ id: 'filePanel.stealthDropNr' }), description: 'A stealth drop implementaion built in Noir' }
344344
]
345345
},
346346
{

libs/ghaction-helper/package.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@remix-project/ghaction-helper",
3-
"version": "0.1.43",
3+
"version": "0.1.44",
44
"description": "Solidity Tests GitHub Action Helper",
55
"main": "src/index.js",
66
"scripts": {
@@ -19,17 +19,17 @@
1919
},
2020
"homepage": "https://github.com/ethereum/remix-project#readme",
2121
"devDependencies": {
22-
"@remix-project/remix-solidity": "^0.5.49",
22+
"@remix-project/remix-solidity": "^0.5.50",
2323
"@types/chai": "^4.3.4",
2424
"typescript": "^4.9.3"
2525
},
2626
"dependencies": {
2727
"@ethereum-waffle/chai": "^3.4.4",
28-
"@remix-project/remix-simulator": "^0.2.63",
28+
"@remix-project/remix-simulator": "^0.2.64",
2929
"chai": "^4.3.7",
3030
"ethers": "^5.7.2",
3131
"web3": "^4.1.1"
3232
},
3333
"types": "./src/index.d.ts",
34-
"gitHead": "a92b8aa830067f879c96b41e301bc3174b87e551"
34+
"gitHead": "8a6dc8a37b0fafa44366ab5891a55783a0bfb0c6"
3535
}

libs/remix-analyzer/package.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@remix-project/remix-analyzer",
3-
"version": "0.5.72",
3+
"version": "0.5.73",
44
"description": "Tool to perform static analysis on Solidity smart contracts",
55
"scripts": {
66
"test": "./../../node_modules/.bin/ts-node --project ../../tsconfig.base.json --require tsconfig-paths/register ./../../node_modules/.bin/tape ./test/tests.ts"
@@ -25,8 +25,8 @@
2525
"@ethereumjs/tx": "5.4.0",
2626
"@ethereumjs/util": "9.1.0",
2727
"@ethereumjs/vm": "8.1.1",
28-
"@remix-project/remix-astwalker": "^0.0.93",
29-
"@remix-project/remix-lib": "^0.5.70",
28+
"@remix-project/remix-astwalker": "^0.0.94",
29+
"@remix-project/remix-lib": "^0.5.71",
3030
"async": "^2.6.2",
3131
"ethers": "^5.4.2",
3232
"ethjs-util": "^0.1.6",
@@ -50,6 +50,6 @@
5050
"typescript": "^3.7.5"
5151
},
5252
"typings": "src/index.d.ts",
53-
"gitHead": "a92b8aa830067f879c96b41e301bc3174b87e551",
53+
"gitHead": "8a6dc8a37b0fafa44366ab5891a55783a0bfb0c6",
5454
"main": "./src/index.js"
5555
}

libs/remix-astwalker/package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@remix-project/remix-astwalker",
3-
"version": "0.0.93",
3+
"version": "0.0.94",
44
"description": "Tool to walk through Solidity AST",
55
"main": "src/index.js",
66
"scripts": {
@@ -37,7 +37,7 @@
3737
"@ethereumjs/tx": "5.4.0",
3838
"@ethereumjs/util": "9.1.0",
3939
"@ethereumjs/vm": "8.1.1",
40-
"@remix-project/remix-lib": "^0.5.70",
40+
"@remix-project/remix-lib": "^0.5.71",
4141
"@types/tape": "^4.2.33",
4242
"async": "^2.6.2",
4343
"ethers": "^5.4.2",
@@ -53,6 +53,6 @@
5353
"tap-spec": "^5.0.0"
5454
},
5555
"typings": "src/index.d.ts",
56-
"gitHead": "a92b8aa830067f879c96b41e301bc3174b87e551",
56+
"gitHead": "8a6dc8a37b0fafa44366ab5891a55783a0bfb0c6",
5757
"types": "./src/index.d.ts"
5858
}

libs/remix-debug/package.json

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@remix-project/remix-debug",
3-
"version": "0.5.63",
3+
"version": "0.5.64",
44
"description": "Tool to debug Ethereum transactions",
55
"contributors": [
66
{
@@ -26,10 +26,10 @@
2626
"@ethereumjs/tx": "5.4.0",
2727
"@ethereumjs/util": "9.1.0",
2828
"@ethereumjs/vm": "8.1.1",
29-
"@remix-project/remix-astwalker": "^0.0.93",
30-
"@remix-project/remix-lib": "^0.5.70",
31-
"@remix-project/remix-simulator": "^0.2.63",
32-
"@remix-project/remix-solidity": "^0.5.49",
29+
"@remix-project/remix-astwalker": "^0.0.94",
30+
"@remix-project/remix-lib": "^0.5.71",
31+
"@remix-project/remix-simulator": "^0.2.64",
32+
"@remix-project/remix-solidity": "^0.5.50",
3333
"ansi-gray": "^0.1.1",
3434
"async": "^2.6.2",
3535
"color-support": "^1.1.3",
@@ -69,6 +69,6 @@
6969
},
7070
"homepage": "https://github.com/ethereum/remix-project/tree/master/libs/remix-debug#readme",
7171
"typings": "src/index.d.ts",
72-
"gitHead": "a92b8aa830067f879c96b41e301bc3174b87e551",
72+
"gitHead": "8a6dc8a37b0fafa44366ab5891a55783a0bfb0c6",
7373
"types": "./src/index.d.ts"
7474
}

libs/remix-lib/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@remix-project/remix-lib",
3-
"version": "0.5.70",
3+
"version": "0.5.71",
44
"description": "Library to various Remix tools",
55
"contributors": [
66
{
@@ -55,6 +55,6 @@
5555
},
5656
"homepage": "https://github.com/ethereum/remix-project/tree/master/libs/remix-lib#readme",
5757
"typings": "src/index.d.ts",
58-
"gitHead": "a92b8aa830067f879c96b41e301bc3174b87e551",
58+
"gitHead": "8a6dc8a37b0fafa44366ab5891a55783a0bfb0c6",
5959
"types": "./src/index.d.ts"
6060
}

0 commit comments

Comments
 (0)