Skip to content

Commit 9d8eb20

Browse files
ericglauericglau
committed
Support Confidential Contracts 0.3.1
1 parent a68efab commit 9d8eb20

File tree

12 files changed

+44
-30
lines changed

12 files changed

+44
-30
lines changed

‎packages/core/confidential/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
"@fhevm/mock-utils": "^0.1.0",
3030
"@fhevm/solidity": "^0.9.1",
3131
"@nomicfoundation/hardhat-ethers": "^3.1.0",
32-
"@openzeppelin/confidential-contracts": "^0.3.0",
32+
"@openzeppelin/confidential-contracts": "^0.3.1",
3333
"@openzeppelin/contracts": "^5.4.0",
3434
"@types/node": "^20.0.0",
3535
"@types/semver": "^7.5.7",

‎packages/core/confidential/src/environments/hardhat/package-lock.json‎

Lines changed: 4 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎packages/core/confidential/src/environments/hardhat/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
"license": "ISC",
1111
"devDependencies": {
1212
"@openzeppelin/contracts": "^5.4.0",
13-
"@openzeppelin/confidential-contracts": "^0.3.0",
13+
"@openzeppelin/confidential-contracts": "^0.3.1",
1414
"@fhevm/hardhat-plugin": "^0.3.0-1",
1515
"@fhevm/solidity": "^0.9.1",
1616
"@zama-fhe/relayer-sdk": "0.3.0-5",

‎packages/core/confidential/src/erc7984.test.ts.md‎

Lines changed: 22 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ Generated by [AVA](https://avajs.dev).
99
> Snapshot 1
1010
1111
`// SPDX-License-Identifier: MIT␊
12-
// Compatible with OpenZeppelin Confidential Contracts ^0.3.0␊
12+
// Compatible with OpenZeppelin Confidential Contracts ^0.3.1␊
1313
pragma solidity ^0.8.27;␊
1414
␊
1515
import {ZamaEthereumConfig} from "@fhevm/solidity/config/ZamaConfig.sol";␊
@@ -26,7 +26,7 @@ Generated by [AVA](https://avajs.dev).
2626
> Snapshot 1
2727
2828
`// SPDX-License-Identifier: MIT␊
29-
// Compatible with OpenZeppelin Confidential Contracts ^0.3.0␊
29+
// Compatible with OpenZeppelin Confidential Contracts ^0.3.1␊
3030
pragma solidity ^0.8.27;␊
3131
␊
3232
import {ZamaEthereumConfig} from "@fhevm/solidity/config/ZamaConfig.sol";␊
@@ -43,7 +43,7 @@ Generated by [AVA](https://avajs.dev).
4343
> Snapshot 1
4444
4545
`// SPDX-License-Identifier: MIT␊
46-
// Compatible with OpenZeppelin Contracts ^5.5.0 and Confidential Contracts ^0.3.0␊
46+
// Compatible with OpenZeppelin Contracts ^5.5.0 and Confidential Contracts ^0.3.1␊
4747
pragma solidity ^0.8.27;␊
4848
␊
4949
import {ZamaEthereumConfig} from "@fhevm/solidity/config/ZamaConfig.sol";␊
@@ -65,7 +65,7 @@ Generated by [AVA](https://avajs.dev).
6565
> Snapshot 1
6666
6767
`// SPDX-License-Identifier: MIT␊
68-
// Compatible with OpenZeppelin Confidential Contracts ^0.3.0␊
68+
// Compatible with OpenZeppelin Confidential Contracts ^0.3.1␊
6969
pragma solidity ^0.8.27;␊
7070
␊
7171
import {ZamaEthereumConfig} from "@fhevm/solidity/config/ZamaConfig.sol";␊
@@ -82,7 +82,7 @@ Generated by [AVA](https://avajs.dev).
8282
> Snapshot 1
8383
8484
`// SPDX-License-Identifier: MIT␊
85-
// Compatible with OpenZeppelin Contracts ^5.5.0 and Confidential Contracts ^0.3.0␊
85+
// Compatible with OpenZeppelin Contracts ^5.5.0 and Confidential Contracts ^0.3.1␊
8686
pragma solidity ^0.8.27;␊
8787
␊
8888
import {ZamaEthereumConfig} from "@fhevm/solidity/config/ZamaConfig.sol";␊
@@ -104,7 +104,7 @@ Generated by [AVA](https://avajs.dev).
104104
> Snapshot 1
105105
106106
`// SPDX-License-Identifier: MIT␊
107-
// Compatible with OpenZeppelin Contracts ^5.5.0 and Confidential Contracts ^0.3.0␊
107+
// Compatible with OpenZeppelin Contracts ^5.5.0 and Confidential Contracts ^0.3.1␊
108108
pragma solidity ^0.8.27;␊
109109
␊
110110
import {ZamaEthereumConfig} from "@fhevm/solidity/config/ZamaConfig.sol";␊
@@ -126,7 +126,7 @@ Generated by [AVA](https://avajs.dev).
126126
> Snapshot 1
127127
128128
`// SPDX-License-Identifier: MIT␊
129-
// Compatible with OpenZeppelin Contracts ^5.5.0 and Confidential Contracts ^0.3.0␊
129+
// Compatible with OpenZeppelin Contracts ^5.5.0 and Confidential Contracts ^0.3.1␊
130130
pragma solidity ^0.8.27;␊
131131
␊
132132
import {ZamaEthereumConfig} from "@fhevm/solidity/config/ZamaConfig.sol";␊
@@ -148,7 +148,7 @@ Generated by [AVA](https://avajs.dev).
148148
> Snapshot 1
149149
150150
`// SPDX-License-Identifier: MIT␊
151-
// Compatible with OpenZeppelin Contracts ^5.5.0 and Confidential Contracts ^0.3.0␊
151+
// Compatible with OpenZeppelin Contracts ^5.5.0 and Confidential Contracts ^0.3.1␊
152152
pragma solidity ^0.8.27;␊
153153
␊
154154
import {ZamaEthereumConfig} from "@fhevm/solidity/config/ZamaConfig.sol";␊
@@ -164,6 +164,14 @@ Generated by [AVA](https://avajs.dev).
164164
{}␊
165165
␊
166166
// The following functions are overrides required by Solidity.␊
167+
␊
168+
function _update(address from, address to, euint64 amount)␊
169+
internal␊
170+
override(ERC7984, ERC7984ERC20Wrapper)␊
171+
returns (euint64 transferred)␊
172+
{␊
173+
return super._update(from, to, amount);␊
174+
}␊
167175
␊
168176
function decimals()␊
169177
public␊
@@ -181,7 +189,7 @@ Generated by [AVA](https://avajs.dev).
181189
> Snapshot 1
182190
183191
`// SPDX-License-Identifier: MIT␊
184-
// Compatible with OpenZeppelin Contracts ^5.5.0 and Confidential Contracts ^0.3.0␊
192+
// Compatible with OpenZeppelin Contracts ^5.5.0 and Confidential Contracts ^0.3.1␊
185193
pragma solidity ^0.8.27;␊
186194
␊
187195
import {ZamaEthereumConfig} from "@fhevm/solidity/config/ZamaConfig.sol";␊
@@ -244,7 +252,7 @@ Generated by [AVA](https://avajs.dev).
244252
> Snapshot 1
245253
246254
`// SPDX-License-Identifier: MIT␊
247-
// Compatible with OpenZeppelin Contracts ^5.5.0 and Confidential Contracts ^0.3.0␊
255+
// Compatible with OpenZeppelin Contracts ^5.5.0 and Confidential Contracts ^0.3.1␊
248256
pragma solidity ^0.8.27;␊
249257
␊
250258
import {ZamaEthereumConfig} from "@fhevm/solidity/config/ZamaConfig.sol";␊
@@ -316,7 +324,7 @@ Generated by [AVA](https://avajs.dev).
316324
> Snapshot 1
317325
318326
`// SPDX-License-Identifier: MIT␊
319-
// Compatible with OpenZeppelin Contracts ^5.5.0 and Confidential Contracts ^0.3.0␊
327+
// Compatible with OpenZeppelin Contracts ^5.5.0 and Confidential Contracts ^0.3.1␊
320328
pragma solidity ^0.8.27;␊
321329
␊
322330
import {ZamaEthereumConfig} from "@fhevm/solidity/config/ZamaConfig.sol";␊
@@ -362,7 +370,7 @@ Generated by [AVA](https://avajs.dev).
362370
␊
363371
function _update(address from, address to, euint64 amount)␊
364372
internal␊
365-
override(ERC7984, ERC7984Votes)␊
373+
override(ERC7984, ERC7984ERC20Wrapper, ERC7984Votes)␊
366374
returns (euint64 transferred)␊
367375
{␊
368376
return super._update(from, to, amount);␊
@@ -393,7 +401,7 @@ Generated by [AVA](https://avajs.dev).
393401
> Snapshot 1
394402
395403
`// SPDX-License-Identifier: MIT␊
396-
// Compatible with OpenZeppelin Contracts ^5.5.0 and Confidential Contracts ^0.3.0␊
404+
// Compatible with OpenZeppelin Contracts ^5.5.0 and Confidential Contracts ^0.3.1␊
397405
pragma solidity ^0.8.27;␊
398406
␊
399407
import {ZamaEthereumConfig} from "@fhevm/solidity/config/ZamaConfig.sol";␊
@@ -448,7 +456,7 @@ Generated by [AVA](https://avajs.dev).
448456
␊
449457
function _update(address from, address to, euint64 amount)␊
450458
internal␊
451-
override(ERC7984, ERC7984Votes)␊
459+
override(ERC7984, ERC7984ERC20Wrapper, ERC7984Votes)␊
452460
returns (euint64 transferred)␊
453461
{␊
454462
return super._update(from, to, amount);␊

‎packages/core/confidential/src/erc7984.test.ts.snap‎

7 Bytes
Binary file not shown.

‎packages/core/confidential/src/erc7984.ts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -192,6 +192,7 @@ function addWrappable(c: ContractBuilder) {
192192
};
193193
c.addParent(ERC7984ERC20Wrapper, [{ lit: underlyingArg }]);
194194
c.addOverride(ERC7984ERC20Wrapper, functions.decimals);
195+
c.addOverride(ERC7984ERC20Wrapper, functions._update);
195196
}
196197

197198
function addVotes(c: ContractBuilder, name: string, clockMode: ClockMode) {

‎packages/core/confidential/src/print-versioned.test.ts.md‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,14 @@ Generated by [AVA](https://avajs.dev).
99
> Snapshot 1
1010
1111
`// SPDX-License-Identifier: MIT␊
12-
// Compatible with OpenZeppelin Contracts ^5.5.0 and Confidential Contracts ^0.3.0␊
12+
// Compatible with OpenZeppelin Contracts ^5.5.0 and Confidential Contracts ^0.3.1␊
1313
pragma solidity ^0.8.27;␊
1414
␊
1515
import {LocalImport} from "../utils/FooLocal.sol";␊
1616
import {CustomContract} from "./FooCustom.sol";␊
1717
import {FhevmContract} from "@fhevm/solidity@0.9.1/Foo2.sol";␊
1818
import {FhevmType} from "@fhevm/solidity@0.9.1/Types.sol";␊
19-
import {ConfidentialContract} from "@openzeppelin/confidential-contracts@0.3.0/Foo1.sol";␊
19+
import {ConfidentialContract} from "@openzeppelin/confidential-contracts@0.3.1/Foo1.sol";␊
2020
import {UpgradeableContract} from "@openzeppelin/contracts-upgradeable@5.5.0/Foo4.sol";␊
2121
import {FooUpgradeable} from "@openzeppelin/contracts-upgradeable@5.5.0/FooUpgradeable.sol";␊
2222
import {StandardContract} from "@openzeppelin/contracts@5.5.0/Foo3.sol";␊
@@ -33,10 +33,10 @@ Generated by [AVA](https://avajs.dev).
3333
> Snapshot 1
3434
3535
`// SPDX-License-Identifier: MIT␊
36-
// Compatible with OpenZeppelin Confidential Contracts ^0.3.0␊
36+
// Compatible with OpenZeppelin Confidential Contracts ^0.3.1␊
3737
pragma solidity ^0.8.27;␊
3838
␊
39-
import {ConfidentialContract} from "@openzeppelin/confidential-contracts@0.3.0/Foo1.sol";␊
39+
import {ConfidentialContract} from "@openzeppelin/confidential-contracts@0.3.1/Foo1.sol";␊
4040
␊
4141
contract BasicContract is ConfidentialContract {␊
4242
}␊

‎packages/core/confidential/src/print-versioned.test.ts.snap‎

0 Bytes
Binary file not shown.

‎packages/core/confidential/src/utils/version.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,4 @@ export const compatibleFHEVMSolidityContractsSemver = '^0.9.1';
66
/**
77
* Semantic version string representing the minimum compatible version of Confidential Contracts to display in output.
88
*/
9-
export const compatibleConfidentialContractsSemver = '^0.3.0';
9+
export const compatibleConfidentialContractsSemver = '^0.3.1';

‎packages/core/confidential/src/zip-hardhat.test.ts.md‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ Generated by [AVA](https://avajs.dev).
1010
1111
[
1212
`// SPDX-License-Identifier: MIT␊
13-
// Compatible with OpenZeppelin Confidential Contracts ^0.3.0␊
13+
// Compatible with OpenZeppelin Confidential Contracts ^0.3.1␊
1414
pragma solidity ^0.8.27;␊
1515
␊
1616
import {ZamaEthereumConfig} from "@fhevm/solidity/config/ZamaConfig.sol";␊
@@ -52,7 +52,7 @@ Generated by [AVA](https://avajs.dev).
5252
"license": "MIT",␊
5353
"devDependencies": {␊
5454
"@openzeppelin/contracts": "^5.4.0",␊
55-
"@openzeppelin/confidential-contracts": "^0.3.0",␊
55+
"@openzeppelin/confidential-contracts": "^0.3.1",␊
5656
"@fhevm/hardhat-plugin": "^0.3.0-1",␊
5757
"@fhevm/solidity": "^0.9.1",␊
5858
"@zama-fhe/relayer-sdk": "0.3.0-5",␊
@@ -90,7 +90,7 @@ Generated by [AVA](https://avajs.dev).
9090
9191
[
9292
`// SPDX-License-Identifier: AGPL-3.0-only␊
93-
// Compatible with OpenZeppelin Contracts ^5.5.0 and Confidential Contracts ^0.3.0␊
93+
// Compatible with OpenZeppelin Contracts ^5.5.0 and Confidential Contracts ^0.3.1␊
9494
pragma solidity ^0.8.27;␊
9595
␊
9696
import {ZamaEthereumConfig} from "@fhevm/solidity/config/ZamaConfig.sol";␊
@@ -145,7 +145,7 @@ Generated by [AVA](https://avajs.dev).
145145
␊
146146
function _update(address from, address to, euint64 amount)␊
147147
internal␊
148-
override(ERC7984, ERC7984Votes)␊
148+
override(ERC7984, ERC7984ERC20Wrapper, ERC7984Votes)␊
149149
returns (euint64 transferred)␊
150150
{␊
151151
return super._update(from, to, amount);␊
@@ -201,7 +201,7 @@ Generated by [AVA](https://avajs.dev).
201201
"license": "AGPL-3.0-only",␊
202202
"devDependencies": {␊
203203
"@openzeppelin/contracts": "^5.4.0",␊
204-
"@openzeppelin/confidential-contracts": "^0.3.0",␊
204+
"@openzeppelin/confidential-contracts": "^0.3.1",␊
205205
"@fhevm/hardhat-plugin": "^0.3.0-1",␊
206206
"@fhevm/solidity": "^0.9.1",␊
207207
"@zama-fhe/relayer-sdk": "0.3.0-5",␊

0 commit comments

Comments
 (0)