@openzeppelin/confidential-contracts 0.5.0-rc.0 → 0.5.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/build/contracts/BatcherConfidential.json +11 -0
- package/build/contracts/CheckpointsConfidential.json +2 -2
- package/build/contracts/ERC7984BalanceCapHookModule.json +2 -37
- package/build/contracts/ERC7984HolderCapHookModule.json +2 -37
- package/build/contracts/ERC7984HookModule.json +0 -35
- package/build/contracts/ERC7984Hooked.json +0 -5
- package/build/contracts/ERC7984Utils.json +2 -2
- package/build/contracts/FHESafeMath.json +2 -2
- package/build/contracts/IERC7984HookModule.json +0 -13
- package/finance/BatcherConfidential.sol +15 -3
- package/governance/utils/VotesConfidential.sol +1 -1
- package/interfaces/IERC7984HookModule.sol +1 -8
- package/interfaces/IERC7984Receiver.sol +1 -1
- package/interfaces/IERC7984Rwa.sol +1 -1
- package/package.json +1 -1
- package/token/ERC7984/ERC7984.sol +5 -2
- package/token/ERC7984/extensions/ERC7984ERC20Wrapper.sol +1 -1
- package/token/ERC7984/extensions/ERC7984Freezable.sol +2 -2
- package/token/ERC7984/extensions/ERC7984Hooked.sol +7 -8
- package/token/ERC7984/extensions/ERC7984Restricted.sol +1 -1
- package/token/ERC7984/extensions/ERC7984Rwa.sol +20 -2
- package/token/ERC7984/utils/ERC7984BalanceCapHookModule.sol +12 -17
- package/token/ERC7984/utils/ERC7984HolderCapHookModule.sol +27 -31
- package/token/ERC7984/utils/ERC7984HookModule.sol +3 -42
- package/utils/FHESafeMath.sol +1 -1
- package/utils/HandleAccessManager.sol +1 -1
- package/utils/structs/CheckpointsConfidential.sol +1 -1
- package/build/contracts/ERC7984IdentityCheck.json +0 -691
- package/build/contracts/IIdentityRegistry.json +0 -30
- package/token/ERC7984/extensions/ERC7984IdentityCheck.sol +0 -58
|
@@ -40,6 +40,17 @@
|
|
|
40
40
|
"name": "DuplicateUnderlyingTokens",
|
|
41
41
|
"type": "error"
|
|
42
42
|
},
|
|
43
|
+
{
|
|
44
|
+
"inputs": [
|
|
45
|
+
{
|
|
46
|
+
"internalType": "uint256",
|
|
47
|
+
"name": "batchId",
|
|
48
|
+
"type": "uint256"
|
|
49
|
+
}
|
|
50
|
+
],
|
|
51
|
+
"name": "IntermediateStepToTokenBalanceChanged",
|
|
52
|
+
"type": "error"
|
|
53
|
+
},
|
|
43
54
|
{
|
|
44
55
|
"inputs": [
|
|
45
56
|
{
|
|
@@ -3,8 +3,8 @@
|
|
|
3
3
|
"contractName": "CheckpointsConfidential",
|
|
4
4
|
"sourceName": "contracts/utils/structs/CheckpointsConfidential.sol",
|
|
5
5
|
"abi": [],
|
|
6
|
-
"bytecode": "
|
|
7
|
-
"deployedBytecode": "
|
|
6
|
+
"bytecode": "0x60556032600b8282823980515f1a607314602657634e487b7160e01b5f525f60045260245ffd5b305f52607381538281f3fe730000000000000000000000000000000000000000301460806040525f5ffdfea2646970667358221220e97c5242175241f65633f1d73afbd543392b159608e8e4515d17fd68dc092c1464736f6c634300081b0033",
|
|
7
|
+
"deployedBytecode": "0x730000000000000000000000000000000000000000301460806040525f5ffdfea2646970667358221220e97c5242175241f65633f1d73afbd543392b159608e8e4515d17fd68dc092c1464736f6c634300081b0033",
|
|
8
8
|
"linkReferences": {},
|
|
9
9
|
"deployedLinkReferences": {}
|
|
10
10
|
}
|
|
@@ -3,28 +3,6 @@
|
|
|
3
3
|
"contractName": "ERC7984BalanceCapHookModule",
|
|
4
4
|
"sourceName": "contracts/token/ERC7984/utils/ERC7984BalanceCapHookModule.sol",
|
|
5
5
|
"abi": [
|
|
6
|
-
{
|
|
7
|
-
"inputs": [
|
|
8
|
-
{
|
|
9
|
-
"internalType": "address",
|
|
10
|
-
"name": "token",
|
|
11
|
-
"type": "address"
|
|
12
|
-
}
|
|
13
|
-
],
|
|
14
|
-
"name": "ERC7984HookModuleAlreadyInstalled",
|
|
15
|
-
"type": "error"
|
|
16
|
-
},
|
|
17
|
-
{
|
|
18
|
-
"inputs": [
|
|
19
|
-
{
|
|
20
|
-
"internalType": "address",
|
|
21
|
-
"name": "token",
|
|
22
|
-
"type": "address"
|
|
23
|
-
}
|
|
24
|
-
],
|
|
25
|
-
"name": "ERC7984HookModuleNotInstalled",
|
|
26
|
-
"type": "error"
|
|
27
|
-
},
|
|
28
6
|
{
|
|
29
7
|
"inputs": [
|
|
30
8
|
{
|
|
@@ -162,19 +140,6 @@
|
|
|
162
140
|
"stateMutability": "nonpayable",
|
|
163
141
|
"type": "function"
|
|
164
142
|
},
|
|
165
|
-
{
|
|
166
|
-
"inputs": [
|
|
167
|
-
{
|
|
168
|
-
"internalType": "bytes",
|
|
169
|
-
"name": "deinitData",
|
|
170
|
-
"type": "bytes"
|
|
171
|
-
}
|
|
172
|
-
],
|
|
173
|
-
"name": "onUninstall",
|
|
174
|
-
"outputs": [],
|
|
175
|
-
"stateMutability": "nonpayable",
|
|
176
|
-
"type": "function"
|
|
177
|
-
},
|
|
178
143
|
{
|
|
179
144
|
"inputs": [
|
|
180
145
|
{
|
|
@@ -270,8 +235,8 @@
|
|
|
270
235
|
"type": "function"
|
|
271
236
|
}
|
|
272
237
|
],
|
|
273
|
-
"bytecode": "
|
|
274
|
-
"deployedBytecode": "
|
|
238
|
+
"bytecode": "0x6080604052348015600e575f5ffd5b506110f78061001c5f395ff3fe608060405234801561000f575f5ffd5b5060043610610060575f3560e01c806301ffc9a714610064578063088fedf11461008c57806332d26c06146100ad578063386971cb146100c25780636d61fe70146100ea578063bdea13b8146100fd575b5f5ffd5b610077610072366004610d6e565b610110565b60405190151581526020015b60405180910390f35b61009f61009a366004610db0565b610146565b604051908152602001610083565b6100c06100bb366004610db0565b6101af565b005b61009f6100d0366004610dea565b6001600160a01b03165f9081526020819052604090205490565b6100c06100f8366004610e41565b6101f4565b6100c061010b366004610e80565b610203565b5f6001600160e01b0319821663573c7f8760e01b148061014057506301ffc9a760e01b6001600160e01b03198316145b92915050565b5f61015182336102e3565b823390916101895760405163c664688160e01b815260048101929092526001600160a01b031660248201526044015b60405180910390fd5b50505f610198338686866102ee565b90506101a4813361042e565b5090505b9392505050565b6101b981336102e3565b813390916101ec5760405163c664688160e01b815260048101929092526001600160a01b03166024820152604401610180565b50505b505050565b6101ff338383610451565b5050565b6040516307feec1960e21b81523360048201526001600160a01b03851690631ffbb06490602401602060405180830381865afa158015610245573d5f5f3e3d5ffd5b505050506040513d601f19601f820116820180604052508101906102699190610ed6565b3390610294576040516357a8db8960e01b81526001600160a01b039091166004820152602401610180565b506102dd846102d88585858080601f0160208091040260200160405190810160405280939291908181526020018383808284375f9201919091525061046d92505050565b6104d3565b50505050565b5f6101a88383610549565b5f6102fb858585856105cd565b90506001600160a01b038316158015906103275750836001600160a01b0316836001600160a01b031614155b8015610354575061035461034f866001600160a01b03165f9081526020819052604090205490565b151590565b156104265760405163344ff10160e01b81526001600160a01b0384811660048301525f919087169063344ff10190602401602060405180830381865afa1580156103a0573d5f5f3e3d5ffd5b505050506040513d601f19601f820116820180604052508101906103c49190610ef5565b90506103d086826105e1565b5f6103db8285610634565b9150505f610406826104018a6001600160a01b03165f9081526020819052604090205490565b61067e565b905061041688888888855f6106ac565b6104208482610733565b93505050505b949350505050565b5f826104405761043d5f610761565b92505b61044a838361077c565b5090919050565b5f8061045f83850185610f20565b915091506101ec856102d884845b5f81515f1461048957610482838360056107f0565b9050610140565b825f8190036104a35761049b5f6108ea565b915050610140565b6104ad8133610549565b61048257604051630276b5d960e01b815260048101829052336024820152604401610180565b6001600160a01b0382165f9081526020819052604090208190556104f681610900565b506105018133610920565b50816001600160a01b03167f39d51928e0313fc7c7204bbf141a3d3bf0498b8f174db4d2532209a6c851aed98260405161053d91815260200190565b60405180910390a25050565b5f805f5160206110a25f395f51905f5280546040516382027b6d60e01b8152600481018790526001600160a01b0386811660248301529293509116906382027b6d90604401602060405180830381865afa1580156105a9573d5f5f3e3d5ffd5b505050506040513d601f19601f820116820180604052508101906104269190610ed6565b5f6105d86001610761565b95945050505050565b806105ea575050565b6105f481836102e3565b818390916106275760405163c664688160e01b815260048101929092526001600160a01b03166024820152604401610180565b50506101ff82825f61093c565b5f808361064f576106456001610761565b8391509150610677565b5f61065a858561097d565b905061066681866109ab565b92506106738382876109d9565b9150505b9250929050565b5f826106905761068d5f6108ea565b92505b816106a15761069e5f6108ea565b91505b6101a883835f610a18565b81156106d7576001600160a01b038516156106d7576106ca82610ac5565b506106d58286610ad4565b505b60408051848152602081018490529081018290526001600160a01b0380861691878216918916907f628d58d11026d89293f28d1e6f43548b065fdd234364d09783fbae05526cdaee9060600160405180910390a4505050505050565b5f82610745576107425f610761565b92505b81610756576107535f610761565b91505b6101a883835f610ae3565b5f61014082610770575f610773565b60015b60ff165f610b46565b5f5160206110a25f395f51905f528054604051630f8e573b60e21b8152600481018590526001600160a01b03848116602483015290911690633e395cec906044015b5f604051808303815f87803b1580156107d5575f5ffd5b505af11580156107e7573d5f5f3e3d5ffd5b50505050505050565b5f5160206110825f395f51905f525460405163045fc19560e11b81525f915f5160206110a25f395f51905f52916001600160a01b03909116906308bf832a90610843908890339089908990600401610ffd565b6020604051808303815f875af115801561085f573d5f5f3e3d5ffd5b505050506040513d601f19601f820116820180604052508101906108839190610ef5565b8154604051630f8e573b60e21b8152600481018390523360248201529193506001600160a01b031690633e395cec906044015f604051808303815f87803b1580156108cc575f5ffd5b505af11580156108de573d5f5f3e3d5ffd5b50505050509392505050565b5f6101408267ffffffffffffffff166005610b46565b5f816109125761090f5f6108ea565b91505b61091c8230610bd5565b5090565b5f826109325761092f5f6108ea565b92505b61044a8383610bd5565b81156101ef576040516306d4a79960e01b81526004810183905230602482015281151560448201526001600160a01b038416906306d4a799906064016107be565b5f8261098f5761098c5f6108ea565b92505b816109a05761099d5f6108ea565b91505b6101a883835f610c1b565b5f826109bd576109ba5f6108ea565b92505b816109ce576109cb5f6108ea565b91505b6101a883835f610c7e565b5f836109eb576109e85f610761565b93505b826109fc576109f95f6108ea565b92505b81610a0d57610a0a5f6108ea565b91505b610426848484610ce1565b5f5f8215610a2b5750600160f81b610a2e565b505f5b5f5160206110825f395f51905f5254604051631d44e90160e21b81525f5160206110a25f395f51905f52916001600160a01b031690637513a40490610a7b9089908990879060040161104d565b6020604051808303815f875af1158015610a97573d5f5f3e3d5ffd5b505050506040513d601f19601f82011682018060405250810190610abb9190610ef5565b9695505050505050565b5f816109125761090f5f610761565b5f826109325761092f5f610761565b5f5f8215610af65750600160f81b610af9565b505f5b5f5160206110825f395f51905f525460405163d99882d560e01b81525f5160206110a25f395f51905f52916001600160a01b03169063d99882d590610a7b9089908990879060040161104d565b5f5160206110825f395f51905f5254604051639cd07acb60e01b81525f915f5160206110a25f395f51905f52916001600160a01b0390911690639cd07acb90610b95908790879060040161106d565b6020604051808303815f875af1158015610bb1573d5f5f3e3d5ffd5b505050506040513d601f19601f820116820180604052508101906104269190610ef5565b5f5160206110a25f395f51905f528054604051635ca4b5b160e11b8152600481018590526001600160a01b0384811660248301529091169063b9496b62906044016107be565b5f5f8215610c2e5750600160f81b610c31565b505f5b5f5160206110825f395f51905f525460405163022f65e760e31b81525f5160206110a25f395f51905f52916001600160a01b03169063117b2f3890610a7b9089908990879060040161104d565b5f5f8215610c915750600160f81b610c94565b505f5b5f5160206110825f395f51905f5254604051631391547f60e01b81525f5160206110a25f395f51905f52916001600160a01b031690631391547f90610a7b9089908990879060040161104d565b5f805f5160206110a25f395f51905f526001810154604051637702dcff60e01b81526004810188905260248101879052604481018690529192506001600160a01b031690637702dcff906064016020604051808303815f875af1158015610d4a573d5f5f3e3d5ffd5b505050506040513d601f19601f820116820180604052508101906105d89190610ef5565b5f60208284031215610d7e575f5ffd5b81356001600160e01b0319811681146101a8575f5ffd5b80356001600160a01b0381168114610dab575f5ffd5b919050565b5f5f5f60608486031215610dc2575f5ffd5b610dcb84610d95565b9250610dd960208501610d95565b929592945050506040919091013590565b5f60208284031215610dfa575f5ffd5b6101a882610d95565b5f5f83601f840112610e13575f5ffd5b50813567ffffffffffffffff811115610e2a575f5ffd5b602083019150836020828501011115610677575f5ffd5b5f5f60208385031215610e52575f5ffd5b823567ffffffffffffffff811115610e68575f5ffd5b610e7485828601610e03565b90969095509350505050565b5f5f5f5f60608587031215610e93575f5ffd5b610e9c85610d95565b935060208501359250604085013567ffffffffffffffff811115610ebe575f5ffd5b610eca87828801610e03565b95989497509550505050565b5f60208284031215610ee6575f5ffd5b815180151581146101a8575f5ffd5b5f60208284031215610f05575f5ffd5b5051919050565b634e487b7160e01b5f52604160045260245ffd5b5f5f60408385031215610f31575f5ffd5b82359150602083013567ffffffffffffffff811115610f4e575f5ffd5b8301601f81018513610f5e575f5ffd5b803567ffffffffffffffff811115610f7857610f78610f0c565b604051601f8201601f19908116603f0116810167ffffffffffffffff81118282101715610fa757610fa7610f0c565b604052818152828201602001871015610fbe575f5ffd5b816020840160208301375f602083830101528093505050509250929050565b60548110610ff957634e487b7160e01b5f52602160045260245ffd5b9052565b84815260018060a01b0384166020820152608060408201525f8351806080840152806020860160a085015e5f60a0828501015260a0601f19601f8301168401019150506105d86060830184610fdd565b92835260208301919091526001600160f81b031916604082015260600190565b828152604081016101a86020830184610fdd56fe9e7b61f58c47dc699ac88507c4f5bb9f121c03808c5676a8078fe583e46497019e7b61f58c47dc699ac88507c4f5bb9f121c03808c5676a8078fe583e4649700a26469706673582212207b5b3387e858149f42cd9332a85687fb4d6c614c246e11f63a0ea7f4f0f1c97564736f6c634300081b0033",
|
|
239
|
+
"deployedBytecode": "0x608060405234801561000f575f5ffd5b5060043610610060575f3560e01c806301ffc9a714610064578063088fedf11461008c57806332d26c06146100ad578063386971cb146100c25780636d61fe70146100ea578063bdea13b8146100fd575b5f5ffd5b610077610072366004610d6e565b610110565b60405190151581526020015b60405180910390f35b61009f61009a366004610db0565b610146565b604051908152602001610083565b6100c06100bb366004610db0565b6101af565b005b61009f6100d0366004610dea565b6001600160a01b03165f9081526020819052604090205490565b6100c06100f8366004610e41565b6101f4565b6100c061010b366004610e80565b610203565b5f6001600160e01b0319821663573c7f8760e01b148061014057506301ffc9a760e01b6001600160e01b03198316145b92915050565b5f61015182336102e3565b823390916101895760405163c664688160e01b815260048101929092526001600160a01b031660248201526044015b60405180910390fd5b50505f610198338686866102ee565b90506101a4813361042e565b5090505b9392505050565b6101b981336102e3565b813390916101ec5760405163c664688160e01b815260048101929092526001600160a01b03166024820152604401610180565b50505b505050565b6101ff338383610451565b5050565b6040516307feec1960e21b81523360048201526001600160a01b03851690631ffbb06490602401602060405180830381865afa158015610245573d5f5f3e3d5ffd5b505050506040513d601f19601f820116820180604052508101906102699190610ed6565b3390610294576040516357a8db8960e01b81526001600160a01b039091166004820152602401610180565b506102dd846102d88585858080601f0160208091040260200160405190810160405280939291908181526020018383808284375f9201919091525061046d92505050565b6104d3565b50505050565b5f6101a88383610549565b5f6102fb858585856105cd565b90506001600160a01b038316158015906103275750836001600160a01b0316836001600160a01b031614155b8015610354575061035461034f866001600160a01b03165f9081526020819052604090205490565b151590565b156104265760405163344ff10160e01b81526001600160a01b0384811660048301525f919087169063344ff10190602401602060405180830381865afa1580156103a0573d5f5f3e3d5ffd5b505050506040513d601f19601f820116820180604052508101906103c49190610ef5565b90506103d086826105e1565b5f6103db8285610634565b9150505f610406826104018a6001600160a01b03165f9081526020819052604090205490565b61067e565b905061041688888888855f6106ac565b6104208482610733565b93505050505b949350505050565b5f826104405761043d5f610761565b92505b61044a838361077c565b5090919050565b5f8061045f83850185610f20565b915091506101ec856102d884845b5f81515f1461048957610482838360056107f0565b9050610140565b825f8190036104a35761049b5f6108ea565b915050610140565b6104ad8133610549565b61048257604051630276b5d960e01b815260048101829052336024820152604401610180565b6001600160a01b0382165f9081526020819052604090208190556104f681610900565b506105018133610920565b50816001600160a01b03167f39d51928e0313fc7c7204bbf141a3d3bf0498b8f174db4d2532209a6c851aed98260405161053d91815260200190565b60405180910390a25050565b5f805f5160206110a25f395f51905f5280546040516382027b6d60e01b8152600481018790526001600160a01b0386811660248301529293509116906382027b6d90604401602060405180830381865afa1580156105a9573d5f5f3e3d5ffd5b505050506040513d601f19601f820116820180604052508101906104269190610ed6565b5f6105d86001610761565b95945050505050565b806105ea575050565b6105f481836102e3565b818390916106275760405163c664688160e01b815260048101929092526001600160a01b03166024820152604401610180565b50506101ff82825f61093c565b5f808361064f576106456001610761565b8391509150610677565b5f61065a858561097d565b905061066681866109ab565b92506106738382876109d9565b9150505b9250929050565b5f826106905761068d5f6108ea565b92505b816106a15761069e5f6108ea565b91505b6101a883835f610a18565b81156106d7576001600160a01b038516156106d7576106ca82610ac5565b506106d58286610ad4565b505b60408051848152602081018490529081018290526001600160a01b0380861691878216918916907f628d58d11026d89293f28d1e6f43548b065fdd234364d09783fbae05526cdaee9060600160405180910390a4505050505050565b5f82610745576107425f610761565b92505b81610756576107535f610761565b91505b6101a883835f610ae3565b5f61014082610770575f610773565b60015b60ff165f610b46565b5f5160206110a25f395f51905f528054604051630f8e573b60e21b8152600481018590526001600160a01b03848116602483015290911690633e395cec906044015b5f604051808303815f87803b1580156107d5575f5ffd5b505af11580156107e7573d5f5f3e3d5ffd5b50505050505050565b5f5160206110825f395f51905f525460405163045fc19560e11b81525f915f5160206110a25f395f51905f52916001600160a01b03909116906308bf832a90610843908890339089908990600401610ffd565b6020604051808303815f875af115801561085f573d5f5f3e3d5ffd5b505050506040513d601f19601f820116820180604052508101906108839190610ef5565b8154604051630f8e573b60e21b8152600481018390523360248201529193506001600160a01b031690633e395cec906044015f604051808303815f87803b1580156108cc575f5ffd5b505af11580156108de573d5f5f3e3d5ffd5b50505050509392505050565b5f6101408267ffffffffffffffff166005610b46565b5f816109125761090f5f6108ea565b91505b61091c8230610bd5565b5090565b5f826109325761092f5f6108ea565b92505b61044a8383610bd5565b81156101ef576040516306d4a79960e01b81526004810183905230602482015281151560448201526001600160a01b038416906306d4a799906064016107be565b5f8261098f5761098c5f6108ea565b92505b816109a05761099d5f6108ea565b91505b6101a883835f610c1b565b5f826109bd576109ba5f6108ea565b92505b816109ce576109cb5f6108ea565b91505b6101a883835f610c7e565b5f836109eb576109e85f610761565b93505b826109fc576109f95f6108ea565b92505b81610a0d57610a0a5f6108ea565b91505b610426848484610ce1565b5f5f8215610a2b5750600160f81b610a2e565b505f5b5f5160206110825f395f51905f5254604051631d44e90160e21b81525f5160206110a25f395f51905f52916001600160a01b031690637513a40490610a7b9089908990879060040161104d565b6020604051808303815f875af1158015610a97573d5f5f3e3d5ffd5b505050506040513d601f19601f82011682018060405250810190610abb9190610ef5565b9695505050505050565b5f816109125761090f5f610761565b5f826109325761092f5f610761565b5f5f8215610af65750600160f81b610af9565b505f5b5f5160206110825f395f51905f525460405163d99882d560e01b81525f5160206110a25f395f51905f52916001600160a01b03169063d99882d590610a7b9089908990879060040161104d565b5f5160206110825f395f51905f5254604051639cd07acb60e01b81525f915f5160206110a25f395f51905f52916001600160a01b0390911690639cd07acb90610b95908790879060040161106d565b6020604051808303815f875af1158015610bb1573d5f5f3e3d5ffd5b505050506040513d601f19601f820116820180604052508101906104269190610ef5565b5f5160206110a25f395f51905f528054604051635ca4b5b160e11b8152600481018590526001600160a01b0384811660248301529091169063b9496b62906044016107be565b5f5f8215610c2e5750600160f81b610c31565b505f5b5f5160206110825f395f51905f525460405163022f65e760e31b81525f5160206110a25f395f51905f52916001600160a01b03169063117b2f3890610a7b9089908990879060040161104d565b5f5f8215610c915750600160f81b610c94565b505f5b5f5160206110825f395f51905f5254604051631391547f60e01b81525f5160206110a25f395f51905f52916001600160a01b031690631391547f90610a7b9089908990879060040161104d565b5f805f5160206110a25f395f51905f526001810154604051637702dcff60e01b81526004810188905260248101879052604481018690529192506001600160a01b031690637702dcff906064016020604051808303815f875af1158015610d4a573d5f5f3e3d5ffd5b505050506040513d601f19601f820116820180604052508101906105d89190610ef5565b5f60208284031215610d7e575f5ffd5b81356001600160e01b0319811681146101a8575f5ffd5b80356001600160a01b0381168114610dab575f5ffd5b919050565b5f5f5f60608486031215610dc2575f5ffd5b610dcb84610d95565b9250610dd960208501610d95565b929592945050506040919091013590565b5f60208284031215610dfa575f5ffd5b6101a882610d95565b5f5f83601f840112610e13575f5ffd5b50813567ffffffffffffffff811115610e2a575f5ffd5b602083019150836020828501011115610677575f5ffd5b5f5f60208385031215610e52575f5ffd5b823567ffffffffffffffff811115610e68575f5ffd5b610e7485828601610e03565b90969095509350505050565b5f5f5f5f60608587031215610e93575f5ffd5b610e9c85610d95565b935060208501359250604085013567ffffffffffffffff811115610ebe575f5ffd5b610eca87828801610e03565b95989497509550505050565b5f60208284031215610ee6575f5ffd5b815180151581146101a8575f5ffd5b5f60208284031215610f05575f5ffd5b5051919050565b634e487b7160e01b5f52604160045260245ffd5b5f5f60408385031215610f31575f5ffd5b82359150602083013567ffffffffffffffff811115610f4e575f5ffd5b8301601f81018513610f5e575f5ffd5b803567ffffffffffffffff811115610f7857610f78610f0c565b604051601f8201601f19908116603f0116810167ffffffffffffffff81118282101715610fa757610fa7610f0c565b604052818152828201602001871015610fbe575f5ffd5b816020840160208301375f602083830101528093505050509250929050565b60548110610ff957634e487b7160e01b5f52602160045260245ffd5b9052565b84815260018060a01b0384166020820152608060408201525f8351806080840152806020860160a085015e5f60a0828501015260a0601f19601f8301168401019150506105d86060830184610fdd565b92835260208301919091526001600160f81b031916604082015260600190565b828152604081016101a86020830184610fdd56fe9e7b61f58c47dc699ac88507c4f5bb9f121c03808c5676a8078fe583e46497019e7b61f58c47dc699ac88507c4f5bb9f121c03808c5676a8078fe583e4649700a26469706673582212207b5b3387e858149f42cd9332a85687fb4d6c614c246e11f63a0ea7f4f0f1c97564736f6c634300081b0033",
|
|
275
240
|
"linkReferences": {},
|
|
276
241
|
"deployedLinkReferences": {}
|
|
277
242
|
}
|
|
@@ -19,28 +19,6 @@
|
|
|
19
19
|
"name": "ERC7984HolderCapHookModuleTotalSupplyInitialized",
|
|
20
20
|
"type": "error"
|
|
21
21
|
},
|
|
22
|
-
{
|
|
23
|
-
"inputs": [
|
|
24
|
-
{
|
|
25
|
-
"internalType": "address",
|
|
26
|
-
"name": "token",
|
|
27
|
-
"type": "address"
|
|
28
|
-
}
|
|
29
|
-
],
|
|
30
|
-
"name": "ERC7984HookModuleAlreadyInstalled",
|
|
31
|
-
"type": "error"
|
|
32
|
-
},
|
|
33
|
-
{
|
|
34
|
-
"inputs": [
|
|
35
|
-
{
|
|
36
|
-
"internalType": "address",
|
|
37
|
-
"name": "token",
|
|
38
|
-
"type": "address"
|
|
39
|
-
}
|
|
40
|
-
],
|
|
41
|
-
"name": "ERC7984HookModuleNotInstalled",
|
|
42
|
-
"type": "error"
|
|
43
|
-
},
|
|
44
22
|
{
|
|
45
23
|
"inputs": [
|
|
46
24
|
{
|
|
@@ -181,19 +159,6 @@
|
|
|
181
159
|
"stateMutability": "nonpayable",
|
|
182
160
|
"type": "function"
|
|
183
161
|
},
|
|
184
|
-
{
|
|
185
|
-
"inputs": [
|
|
186
|
-
{
|
|
187
|
-
"internalType": "bytes",
|
|
188
|
-
"name": "deinitData",
|
|
189
|
-
"type": "bytes"
|
|
190
|
-
}
|
|
191
|
-
],
|
|
192
|
-
"name": "onUninstall",
|
|
193
|
-
"outputs": [],
|
|
194
|
-
"stateMutability": "nonpayable",
|
|
195
|
-
"type": "function"
|
|
196
|
-
},
|
|
197
162
|
{
|
|
198
163
|
"inputs": [
|
|
199
164
|
{
|
|
@@ -284,8 +249,8 @@
|
|
|
284
249
|
"type": "function"
|
|
285
250
|
}
|
|
286
251
|
],
|
|
287
|
-
"bytecode": "
|
|
288
|
-
"deployedBytecode": "
|
|
252
|
+
"bytecode": "0x6080604052348015600e575f5ffd5b5061118d8061001c5f395ff3fe608060405234801561000f575f5ffd5b506004361061007a575f3560e01c806332d26c061161005857806332d26c06146101125780636d61fe70146101275780637813e7f51461013a578063cf02427814610162575f5ffd5b806301ffc9a71461007e578063088fedf1146100a6578063239d2c7d146100c7575b5f5ffd5b61009161008c366004610f2a565b610175565b60405190151581526020015b60405180910390f35b6100b96100b4366004610f6c565b6101ab565b60405190815260200161009d565b6100f96100d5366004610fa5565b6001600160a01b03165f9081526020819052604090205467ffffffffffffffff1690565b60405167ffffffffffffffff909116815260200161009d565b610125610120366004610f6c565b610214565b005b610125610135366004610fbe565b610264565b6100b9610148366004610fa5565b6001600160a01b03165f9081526001602052604090205490565b610125610170366004611043565b610273565b5f6001600160e01b0319821663573c7f8760e01b14806101a557506301ffc9a760e01b6001600160e01b03198316145b92915050565b5f6101b6823361030f565b823390916101ee5760405163c664688160e01b815260048101929092526001600160a01b031660248201526044015b60405180910390fd5b50505f6101fd3386868661031a565b90506102098133610502565b5090505b9392505050565b61021e813361030f565b813390916102515760405163c664688160e01b815260048101929092526001600160a01b031660248201526044016101e5565b505061025f33848484610525565b505050565b61026f3383836106f9565b5050565b6040516307feec1960e21b81523360048201526001600160a01b03831690631ffbb06490602401602060405180830381865afa1580156102b5573d5f5f3e3d5ffd5b505050506040513d601f19601f820116820180604052508101906102d99190611074565b3390610304576040516357a8db8960e01b81526001600160a01b0390911660048201526024016101e5565b5061026f82826107ac565b5f61020d838361084e565b5f610327858585856108d2565b90506001600160a01b038316158015906103535750836001600160a01b0316836001600160a01b031614155b156104fa5760405163344ff10160e01b81526001600160a01b0385811660048301525f919087169063344ff10190602401602060405180830381865afa15801561039f573d5f5f3e3d5ffd5b505050506040513d601f19601f820116820180604052508101906103c39190611093565b60405163344ff10160e01b81526001600160a01b0386811660048301529192505f9188169063344ff10190602401602060405180830381865afa15801561040c573d5f5f3e3d5ffd5b505050506040513d601f19601f820116820180604052508101906104309190611093565b905061043c87836108e6565b61044687826108e6565b5f6104505f610939565b90505f6104b261048e6104778b6001600160a01b03165f9081526001602052604090205490565b610489610484888b61094f565b61097d565b61099a565b6104ad61048461049e878761094f565b6104a88b886109c8565b6109f6565b610a24565b90505f6104e6826104e18c6001600160a01b03165f9081526020819052604090205467ffffffffffffffff1690565b610a52565b90506104f286826109f6565b955050505050505b949350505050565b5f82610514576105115f610a7a565b92505b61051e8383610a95565b5090919050565b816001600160a01b0316836001600160a01b031603156106f35760405163344ff10160e01b81526001600160a01b0384811660048301525f919086169063344ff10190602401602060405180830381865afa158015610586573d5f5f3e3d5ffd5b505050506040513d601f19601f820116820180604052508101906105aa9190611093565b60405163344ff10160e01b81526001600160a01b0385811660048301529192505f9187169063344ff10190602401602060405180830381865afa1580156105f3573d5f5f3e3d5ffd5b505050506040513d601f19601f820116820180604052508101906106179190611093565b905061062386836108e6565b61062d86826108e6565b5f6106375f610939565b90505f61064485836109c8565b90505f610665896001600160a01b03165f9081526001602052604090205490565b90506001600160a01b03871615610698575f610685836104a8878a61094f565b9050610694826104ad8361097d565b9150505b6001600160a01b038816156106c9575f6106b6836104a8888761094f565b90506106c5826104898361097d565b9150505b6001600160a01b0389165f9081526001602052604090208190556106ec81610b09565b5050505050505b50505050565b610761836001600160a01b031663540952276040518163ffffffff1660e01b8152600401602060405180830381865afa158015610738573d5f5f3e3d5ffd5b505050506040513d601f19601f8201168201806040525081019061075c9190611093565b151590565b1561077f576040516374f6661760e11b815260040160405180910390fd5b6001600160a01b0383165f908152600160205260408120555f6107a4828401846110aa565b90506106f384825b8067ffffffffffffffff81166107e25760405163e8487f8f60e01b815267ffffffffffffffff90911660048201526024016101e5565b506001600160a01b0382165f8181526020818152604091829020805467ffffffffffffffff191667ffffffffffffffff861690811790915591519182527ff32c1e99c1dd4b312a3cbb595eeef5ef988ac8eb87de166c5328241329e0c4d7910160405180910390a25050565b5f805f5160206111385f395f51905f5280546040516382027b6d60e01b8152600481018790526001600160a01b0386811660248301529293509116906382027b6d90604401602060405180830381865afa1580156108ae573d5f5f3e3d5ffd5b505050506040513d601f19601f820116820180604052508101906104fa9190611074565b5f6108dd6001610a7a565b95945050505050565b806108ef575050565b6108f9818361030f565b8183909161092c5760405163c664688160e01b815260048101929092526001600160a01b031660248201526044016101e5565b505061026f82825f610b29565b5f6101a58267ffffffffffffffff166005610b6a565b5f826109615761095e5f610939565b92505b816109725761096f5f610939565b91505b61020d83835f610bf9565b5f8161098f5761098c5f610a7a565b91505b6101a5826005610ca6565b5f826109ac576109a95f610939565b92505b816109bd576109ba5f610939565b91505b61020d83835f610cf5565b5f826109da576109d75f610939565b92505b816109eb576109e85f610939565b91505b61020d83835f610d58565b5f82610a0857610a055f610a7a565b92505b81610a1957610a165f610a7a565b91505b61020d83835f610dbb565b5f82610a3657610a335f610939565b92505b81610a4757610a445f610939565b91505b61020d83835f610e1e565b5f82610a6457610a615f610939565b92505b61020d8367ffffffffffffffff84166001610e81565b5f6101a582610a89575f610a8c565b60015b60ff165f610b6a565b5f5160206111385f395f51905f528054604051630f8e573b60e21b8152600481018590526001600160a01b03848116602483015290911690633e395cec906044015b5f604051808303815f87803b158015610aee575f5ffd5b505af1158015610b00573d5f5f3e3d5ffd5b50505050505050565b5f81610b1b57610b185f610939565b91505b610b258230610ee4565b5090565b811561025f576040516306d4a79960e01b81526004810183905230602482015281151560448201526001600160a01b038416906306d4a79990606401610ad7565b5f5160206111185f395f51905f5254604051639cd07acb60e01b81525f915f5160206111385f395f51905f52916001600160a01b0390911690639cd07acb90610bb990879087906004016110e3565b6020604051808303815f875af1158015610bd5573d5f5f3e3d5ffd5b505050506040513d601f19601f820116820180604052508101906104fa9190611093565b5f5f8215610c0c5750600160f81b610c0f565b505f5b5f5160206111185f395f51905f525460405163f77f3f1d60e01b81525f5160206111385f395f51905f52916001600160a01b03169063f77f3f1d90610c5c908990899087906004016110f7565b6020604051808303815f875af1158015610c78573d5f5f3e3d5ffd5b505050506040513d601f19601f82011682018060405250810190610c9c9190611093565b9695505050505050565b5f5160206111185f395f51905f52546040516307227b9160e21b81525f915f5160206111385f395f51905f52916001600160a01b0390911690631c89ee4490610bb990879087906004016110e3565b5f5f8215610d085750600160f81b610d0b565b505f5b5f5160206111185f395f51905f52546040516303056db360e31b81525f5160206111385f395f51905f52916001600160a01b03169063182b6d9890610c5c908990899087906004016110f7565b5f5f8215610d6b5750600160f81b610d6e565b505f5b5f5160206111185f395f51905f52546040516336024b2f60e21b81525f5160206111385f395f51905f52916001600160a01b03169063d8092cbc90610c5c908990899087906004016110f7565b5f5f8215610dce5750600160f81b610dd1565b505f5b5f5160206111185f395f51905f525460405163d99882d560e01b81525f5160206111385f395f51905f52916001600160a01b03169063d99882d590610c5c908990899087906004016110f7565b5f5f8215610e315750600160f81b610e34565b505f5b5f5160206111185f395f51905f525460405163022f65e760e31b81525f5160206111385f395f51905f52916001600160a01b03169063117b2f3890610c5c908990899087906004016110f7565b5f5f8215610e945750600160f81b610e97565b505f5b5f5160206111185f395f51905f5254604051631d44e90160e21b81525f5160206111385f395f51905f52916001600160a01b031690637513a40490610c5c908990899087906004016110f7565b5f5160206111385f395f51905f528054604051635ca4b5b160e11b8152600481018590526001600160a01b0384811660248301529091169063b9496b6290604401610ad7565b5f60208284031215610f3a575f5ffd5b81356001600160e01b03198116811461020d575f5ffd5b80356001600160a01b0381168114610f67575f5ffd5b919050565b5f5f5f60608486031215610f7e575f5ffd5b610f8784610f51565b9250610f9560208501610f51565b9150604084013590509250925092565b5f60208284031215610fb5575f5ffd5b61020d82610f51565b5f5f60208385031215610fcf575f5ffd5b823567ffffffffffffffff811115610fe5575f5ffd5b8301601f81018513610ff5575f5ffd5b803567ffffffffffffffff81111561100b575f5ffd5b85602082840101111561101c575f5ffd5b6020919091019590945092505050565b803567ffffffffffffffff81168114610f67575f5ffd5b5f5f60408385031215611054575f5ffd5b61105d83610f51565b915061106b6020840161102c565b90509250929050565b5f60208284031215611084575f5ffd5b8151801515811461020d575f5ffd5b5f602082840312156110a3575f5ffd5b5051919050565b5f602082840312156110ba575f5ffd5b61020d8261102c565b605481106110df57634e487b7160e01b5f52602160045260245ffd5b9052565b8281526040810161020d60208301846110c3565b92835260208301919091526001600160f81b03191660408201526060019056fe9e7b61f58c47dc699ac88507c4f5bb9f121c03808c5676a8078fe583e46497019e7b61f58c47dc699ac88507c4f5bb9f121c03808c5676a8078fe583e4649700a26469706673582212202267baf645ea5f0eeed61c2fc5d9862fd01ce175dea36dbcab8d10c5cce5ea3464736f6c634300081b0033",
|
|
253
|
+
"deployedBytecode": "0x608060405234801561000f575f5ffd5b506004361061007a575f3560e01c806332d26c061161005857806332d26c06146101125780636d61fe70146101275780637813e7f51461013a578063cf02427814610162575f5ffd5b806301ffc9a71461007e578063088fedf1146100a6578063239d2c7d146100c7575b5f5ffd5b61009161008c366004610f2a565b610175565b60405190151581526020015b60405180910390f35b6100b96100b4366004610f6c565b6101ab565b60405190815260200161009d565b6100f96100d5366004610fa5565b6001600160a01b03165f9081526020819052604090205467ffffffffffffffff1690565b60405167ffffffffffffffff909116815260200161009d565b610125610120366004610f6c565b610214565b005b610125610135366004610fbe565b610264565b6100b9610148366004610fa5565b6001600160a01b03165f9081526001602052604090205490565b610125610170366004611043565b610273565b5f6001600160e01b0319821663573c7f8760e01b14806101a557506301ffc9a760e01b6001600160e01b03198316145b92915050565b5f6101b6823361030f565b823390916101ee5760405163c664688160e01b815260048101929092526001600160a01b031660248201526044015b60405180910390fd5b50505f6101fd3386868661031a565b90506102098133610502565b5090505b9392505050565b61021e813361030f565b813390916102515760405163c664688160e01b815260048101929092526001600160a01b031660248201526044016101e5565b505061025f33848484610525565b505050565b61026f3383836106f9565b5050565b6040516307feec1960e21b81523360048201526001600160a01b03831690631ffbb06490602401602060405180830381865afa1580156102b5573d5f5f3e3d5ffd5b505050506040513d601f19601f820116820180604052508101906102d99190611074565b3390610304576040516357a8db8960e01b81526001600160a01b0390911660048201526024016101e5565b5061026f82826107ac565b5f61020d838361084e565b5f610327858585856108d2565b90506001600160a01b038316158015906103535750836001600160a01b0316836001600160a01b031614155b156104fa5760405163344ff10160e01b81526001600160a01b0385811660048301525f919087169063344ff10190602401602060405180830381865afa15801561039f573d5f5f3e3d5ffd5b505050506040513d601f19601f820116820180604052508101906103c39190611093565b60405163344ff10160e01b81526001600160a01b0386811660048301529192505f9188169063344ff10190602401602060405180830381865afa15801561040c573d5f5f3e3d5ffd5b505050506040513d601f19601f820116820180604052508101906104309190611093565b905061043c87836108e6565b61044687826108e6565b5f6104505f610939565b90505f6104b261048e6104778b6001600160a01b03165f9081526001602052604090205490565b610489610484888b61094f565b61097d565b61099a565b6104ad61048461049e878761094f565b6104a88b886109c8565b6109f6565b610a24565b90505f6104e6826104e18c6001600160a01b03165f9081526020819052604090205467ffffffffffffffff1690565b610a52565b90506104f286826109f6565b955050505050505b949350505050565b5f82610514576105115f610a7a565b92505b61051e8383610a95565b5090919050565b816001600160a01b0316836001600160a01b031603156106f35760405163344ff10160e01b81526001600160a01b0384811660048301525f919086169063344ff10190602401602060405180830381865afa158015610586573d5f5f3e3d5ffd5b505050506040513d601f19601f820116820180604052508101906105aa9190611093565b60405163344ff10160e01b81526001600160a01b0385811660048301529192505f9187169063344ff10190602401602060405180830381865afa1580156105f3573d5f5f3e3d5ffd5b505050506040513d601f19601f820116820180604052508101906106179190611093565b905061062386836108e6565b61062d86826108e6565b5f6106375f610939565b90505f61064485836109c8565b90505f610665896001600160a01b03165f9081526001602052604090205490565b90506001600160a01b03871615610698575f610685836104a8878a61094f565b9050610694826104ad8361097d565b9150505b6001600160a01b038816156106c9575f6106b6836104a8888761094f565b90506106c5826104898361097d565b9150505b6001600160a01b0389165f9081526001602052604090208190556106ec81610b09565b5050505050505b50505050565b610761836001600160a01b031663540952276040518163ffffffff1660e01b8152600401602060405180830381865afa158015610738573d5f5f3e3d5ffd5b505050506040513d601f19601f8201168201806040525081019061075c9190611093565b151590565b1561077f576040516374f6661760e11b815260040160405180910390fd5b6001600160a01b0383165f908152600160205260408120555f6107a4828401846110aa565b90506106f384825b8067ffffffffffffffff81166107e25760405163e8487f8f60e01b815267ffffffffffffffff90911660048201526024016101e5565b506001600160a01b0382165f8181526020818152604091829020805467ffffffffffffffff191667ffffffffffffffff861690811790915591519182527ff32c1e99c1dd4b312a3cbb595eeef5ef988ac8eb87de166c5328241329e0c4d7910160405180910390a25050565b5f805f5160206111385f395f51905f5280546040516382027b6d60e01b8152600481018790526001600160a01b0386811660248301529293509116906382027b6d90604401602060405180830381865afa1580156108ae573d5f5f3e3d5ffd5b505050506040513d601f19601f820116820180604052508101906104fa9190611074565b5f6108dd6001610a7a565b95945050505050565b806108ef575050565b6108f9818361030f565b8183909161092c5760405163c664688160e01b815260048101929092526001600160a01b031660248201526044016101e5565b505061026f82825f610b29565b5f6101a58267ffffffffffffffff166005610b6a565b5f826109615761095e5f610939565b92505b816109725761096f5f610939565b91505b61020d83835f610bf9565b5f8161098f5761098c5f610a7a565b91505b6101a5826005610ca6565b5f826109ac576109a95f610939565b92505b816109bd576109ba5f610939565b91505b61020d83835f610cf5565b5f826109da576109d75f610939565b92505b816109eb576109e85f610939565b91505b61020d83835f610d58565b5f82610a0857610a055f610a7a565b92505b81610a1957610a165f610a7a565b91505b61020d83835f610dbb565b5f82610a3657610a335f610939565b92505b81610a4757610a445f610939565b91505b61020d83835f610e1e565b5f82610a6457610a615f610939565b92505b61020d8367ffffffffffffffff84166001610e81565b5f6101a582610a89575f610a8c565b60015b60ff165f610b6a565b5f5160206111385f395f51905f528054604051630f8e573b60e21b8152600481018590526001600160a01b03848116602483015290911690633e395cec906044015b5f604051808303815f87803b158015610aee575f5ffd5b505af1158015610b00573d5f5f3e3d5ffd5b50505050505050565b5f81610b1b57610b185f610939565b91505b610b258230610ee4565b5090565b811561025f576040516306d4a79960e01b81526004810183905230602482015281151560448201526001600160a01b038416906306d4a79990606401610ad7565b5f5160206111185f395f51905f5254604051639cd07acb60e01b81525f915f5160206111385f395f51905f52916001600160a01b0390911690639cd07acb90610bb990879087906004016110e3565b6020604051808303815f875af1158015610bd5573d5f5f3e3d5ffd5b505050506040513d601f19601f820116820180604052508101906104fa9190611093565b5f5f8215610c0c5750600160f81b610c0f565b505f5b5f5160206111185f395f51905f525460405163f77f3f1d60e01b81525f5160206111385f395f51905f52916001600160a01b03169063f77f3f1d90610c5c908990899087906004016110f7565b6020604051808303815f875af1158015610c78573d5f5f3e3d5ffd5b505050506040513d601f19601f82011682018060405250810190610c9c9190611093565b9695505050505050565b5f5160206111185f395f51905f52546040516307227b9160e21b81525f915f5160206111385f395f51905f52916001600160a01b0390911690631c89ee4490610bb990879087906004016110e3565b5f5f8215610d085750600160f81b610d0b565b505f5b5f5160206111185f395f51905f52546040516303056db360e31b81525f5160206111385f395f51905f52916001600160a01b03169063182b6d9890610c5c908990899087906004016110f7565b5f5f8215610d6b5750600160f81b610d6e565b505f5b5f5160206111185f395f51905f52546040516336024b2f60e21b81525f5160206111385f395f51905f52916001600160a01b03169063d8092cbc90610c5c908990899087906004016110f7565b5f5f8215610dce5750600160f81b610dd1565b505f5b5f5160206111185f395f51905f525460405163d99882d560e01b81525f5160206111385f395f51905f52916001600160a01b03169063d99882d590610c5c908990899087906004016110f7565b5f5f8215610e315750600160f81b610e34565b505f5b5f5160206111185f395f51905f525460405163022f65e760e31b81525f5160206111385f395f51905f52916001600160a01b03169063117b2f3890610c5c908990899087906004016110f7565b5f5f8215610e945750600160f81b610e97565b505f5b5f5160206111185f395f51905f5254604051631d44e90160e21b81525f5160206111385f395f51905f52916001600160a01b031690637513a40490610c5c908990899087906004016110f7565b5f5160206111385f395f51905f528054604051635ca4b5b160e11b8152600481018590526001600160a01b0384811660248301529091169063b9496b6290604401610ad7565b5f60208284031215610f3a575f5ffd5b81356001600160e01b03198116811461020d575f5ffd5b80356001600160a01b0381168114610f67575f5ffd5b919050565b5f5f5f60608486031215610f7e575f5ffd5b610f8784610f51565b9250610f9560208501610f51565b9150604084013590509250925092565b5f60208284031215610fb5575f5ffd5b61020d82610f51565b5f5f60208385031215610fcf575f5ffd5b823567ffffffffffffffff811115610fe5575f5ffd5b8301601f81018513610ff5575f5ffd5b803567ffffffffffffffff81111561100b575f5ffd5b85602082840101111561101c575f5ffd5b6020919091019590945092505050565b803567ffffffffffffffff81168114610f67575f5ffd5b5f5f60408385031215611054575f5ffd5b61105d83610f51565b915061106b6020840161102c565b90509250929050565b5f60208284031215611084575f5ffd5b8151801515811461020d575f5ffd5b5f602082840312156110a3575f5ffd5b5051919050565b5f602082840312156110ba575f5ffd5b61020d8261102c565b605481106110df57634e487b7160e01b5f52602160045260245ffd5b9052565b8281526040810161020d60208301846110c3565b92835260208301919091526001600160f81b03191660408201526060019056fe9e7b61f58c47dc699ac88507c4f5bb9f121c03808c5676a8078fe583e46497019e7b61f58c47dc699ac88507c4f5bb9f121c03808c5676a8078fe583e4649700a26469706673582212202267baf645ea5f0eeed61c2fc5d9862fd01ce175dea36dbcab8d10c5cce5ea3464736f6c634300081b0033",
|
|
289
254
|
"linkReferences": {},
|
|
290
255
|
"deployedLinkReferences": {}
|
|
291
256
|
}
|
|
@@ -3,28 +3,6 @@
|
|
|
3
3
|
"contractName": "ERC7984HookModule",
|
|
4
4
|
"sourceName": "contracts/token/ERC7984/utils/ERC7984HookModule.sol",
|
|
5
5
|
"abi": [
|
|
6
|
-
{
|
|
7
|
-
"inputs": [
|
|
8
|
-
{
|
|
9
|
-
"internalType": "address",
|
|
10
|
-
"name": "token",
|
|
11
|
-
"type": "address"
|
|
12
|
-
}
|
|
13
|
-
],
|
|
14
|
-
"name": "ERC7984HookModuleAlreadyInstalled",
|
|
15
|
-
"type": "error"
|
|
16
|
-
},
|
|
17
|
-
{
|
|
18
|
-
"inputs": [
|
|
19
|
-
{
|
|
20
|
-
"internalType": "address",
|
|
21
|
-
"name": "token",
|
|
22
|
-
"type": "address"
|
|
23
|
-
}
|
|
24
|
-
],
|
|
25
|
-
"name": "ERC7984HookModuleNotInstalled",
|
|
26
|
-
"type": "error"
|
|
27
|
-
},
|
|
28
6
|
{
|
|
29
7
|
"inputs": [
|
|
30
8
|
{
|
|
@@ -108,19 +86,6 @@
|
|
|
108
86
|
"stateMutability": "nonpayable",
|
|
109
87
|
"type": "function"
|
|
110
88
|
},
|
|
111
|
-
{
|
|
112
|
-
"inputs": [
|
|
113
|
-
{
|
|
114
|
-
"internalType": "bytes",
|
|
115
|
-
"name": "deinitData",
|
|
116
|
-
"type": "bytes"
|
|
117
|
-
}
|
|
118
|
-
],
|
|
119
|
-
"name": "onUninstall",
|
|
120
|
-
"outputs": [],
|
|
121
|
-
"stateMutability": "nonpayable",
|
|
122
|
-
"type": "function"
|
|
123
|
-
},
|
|
124
89
|
{
|
|
125
90
|
"inputs": [
|
|
126
91
|
{
|
|
@@ -3,8 +3,8 @@
|
|
|
3
3
|
"contractName": "ERC7984Utils",
|
|
4
4
|
"sourceName": "contracts/token/ERC7984/utils/ERC7984Utils.sol",
|
|
5
5
|
"abi": [],
|
|
6
|
-
"bytecode": "
|
|
7
|
-
"deployedBytecode": "
|
|
6
|
+
"bytecode": "0x60556032600b8282823980515f1a607314602657634e487b7160e01b5f525f60045260245ffd5b305f52607381538281f3fe730000000000000000000000000000000000000000301460806040525f5ffdfea2646970667358221220b77e4bf6c1490f14a801f0e94f0663746ffe6a39164c8b4c86fa7bb2a3c6630764736f6c634300081b0033",
|
|
7
|
+
"deployedBytecode": "0x730000000000000000000000000000000000000000301460806040525f5ffdfea2646970667358221220b77e4bf6c1490f14a801f0e94f0663746ffe6a39164c8b4c86fa7bb2a3c6630764736f6c634300081b0033",
|
|
8
8
|
"linkReferences": {},
|
|
9
9
|
"deployedLinkReferences": {}
|
|
10
10
|
}
|
|
@@ -3,8 +3,8 @@
|
|
|
3
3
|
"contractName": "FHESafeMath",
|
|
4
4
|
"sourceName": "contracts/utils/FHESafeMath.sol",
|
|
5
5
|
"abi": [],
|
|
6
|
-
"bytecode": "
|
|
7
|
-
"deployedBytecode": "
|
|
6
|
+
"bytecode": "0x60556032600b8282823980515f1a607314602657634e487b7160e01b5f525f60045260245ffd5b305f52607381538281f3fe730000000000000000000000000000000000000000301460806040525f5ffdfea264697066735822122023ddb851e2361a1b0182f3c848d059baed76669d20439f737068d6697d947e2364736f6c634300081b0033",
|
|
7
|
+
"deployedBytecode": "0x730000000000000000000000000000000000000000301460806040525f5ffdfea264697066735822122023ddb851e2361a1b0182f3c848d059baed76669d20439f737068d6697d947e2364736f6c634300081b0033",
|
|
8
8
|
"linkReferences": {},
|
|
9
9
|
"deployedLinkReferences": {}
|
|
10
10
|
}
|
|
@@ -59,19 +59,6 @@
|
|
|
59
59
|
"stateMutability": "nonpayable",
|
|
60
60
|
"type": "function"
|
|
61
61
|
},
|
|
62
|
-
{
|
|
63
|
-
"inputs": [
|
|
64
|
-
{
|
|
65
|
-
"internalType": "bytes",
|
|
66
|
-
"name": "deinitData",
|
|
67
|
-
"type": "bytes"
|
|
68
|
-
}
|
|
69
|
-
],
|
|
70
|
-
"name": "onUninstall",
|
|
71
|
-
"outputs": [],
|
|
72
|
-
"stateMutability": "nonpayable",
|
|
73
|
-
"type": "function"
|
|
74
|
-
},
|
|
75
62
|
{
|
|
76
63
|
"inputs": [
|
|
77
64
|
{
|
|
@@ -1,9 +1,9 @@
|
|
|
1
1
|
// SPDX-License-Identifier: MIT
|
|
2
|
-
// OpenZeppelin Confidential Contracts (last updated v0.5.0
|
|
2
|
+
// OpenZeppelin Confidential Contracts (last updated v0.5.0) (finance/BatcherConfidential.sol)
|
|
3
3
|
|
|
4
4
|
pragma solidity ^0.8.27;
|
|
5
5
|
|
|
6
|
-
import {FHE, externalEuint64, euint64, ebool
|
|
6
|
+
import {FHE, externalEuint64, euint64, ebool} from "@fhevm/solidity/lib/FHE.sol";
|
|
7
7
|
import {IERC20} from "@openzeppelin/contracts/interfaces/IERC20.sol";
|
|
8
8
|
import {SafeERC20} from "@openzeppelin/contracts/token/ERC20/utils/SafeERC20.sol";
|
|
9
9
|
import {ERC165Checker} from "@openzeppelin/contracts/utils/introspection/ERC165Checker.sol";
|
|
@@ -113,6 +113,9 @@ abstract contract BatcherConfidential is ReentrancyGuardTransient, IERC7984Recei
|
|
|
113
113
|
/// @dev The underlying wrapper tokens are the same.
|
|
114
114
|
error DuplicateUnderlyingTokens();
|
|
115
115
|
|
|
116
|
+
/// @dev Intermediate steps must not result in underlying {toToken} being transferred to or from the batcher.
|
|
117
|
+
error IntermediateStepToTokenBalanceChanged(uint256 batchId);
|
|
118
|
+
|
|
116
119
|
constructor(IERC7984ERC20Wrapper fromToken_, IERC7984ERC20Wrapper toToken_) {
|
|
117
120
|
require(
|
|
118
121
|
ERC165Checker.supportsInterface(address(fromToken_), type(IERC7984ERC20Wrapper).interfaceId),
|
|
@@ -220,10 +223,13 @@ abstract contract BatcherConfidential is ReentrancyGuardTransient, IERC7984Recei
|
|
|
220
223
|
FHE.checkSignatures(handles, abi.encode(unwrapAmountCleartext), decryptionProof);
|
|
221
224
|
}
|
|
222
225
|
|
|
226
|
+
uint256 beforeUnderlyingToTokenBalance;
|
|
227
|
+
|
|
223
228
|
ExecuteOutcome outcome;
|
|
224
229
|
if (unwrapAmountCleartext == 0) {
|
|
225
230
|
outcome = ExecuteOutcome.Cancel;
|
|
226
231
|
} else {
|
|
232
|
+
beforeUnderlyingToTokenBalance = IERC20(toToken().underlying()).balanceOf(address(this));
|
|
227
233
|
outcome = _executeRoute(batchId, unwrapAmountCleartext);
|
|
228
234
|
}
|
|
229
235
|
|
|
@@ -255,6 +261,11 @@ abstract contract BatcherConfidential is ReentrancyGuardTransient, IERC7984Recei
|
|
|
255
261
|
_batches[batchId].canceled = true;
|
|
256
262
|
|
|
257
263
|
emit BatchCanceled(batchId);
|
|
264
|
+
} else if (outcome == ExecuteOutcome.Partial) {
|
|
265
|
+
require(
|
|
266
|
+
IERC20(toToken().underlying()).balanceOf(address(this)) == beforeUnderlyingToTokenBalance,
|
|
267
|
+
IntermediateStepToTokenBalanceChanged(batchId)
|
|
268
|
+
);
|
|
258
269
|
}
|
|
259
270
|
}
|
|
260
271
|
|
|
@@ -383,6 +394,7 @@ abstract contract BatcherConfidential is ReentrancyGuardTransient, IERC7984Recei
|
|
|
383
394
|
|
|
384
395
|
FHE.allowThis(newTotalDeposits);
|
|
385
396
|
FHE.allowThis(newDeposits);
|
|
397
|
+
FHE.allowThis(joinedAmount);
|
|
386
398
|
FHE.allow(newDeposits, to);
|
|
387
399
|
FHE.allow(joinedAmount, to);
|
|
388
400
|
|
|
@@ -404,7 +416,7 @@ abstract contract BatcherConfidential is ReentrancyGuardTransient, IERC7984Recei
|
|
|
404
416
|
*
|
|
405
417
|
* NOTE: {dispatchBatchCallback} (and in turn {_executeRoute}) can be repeatedly called until the route execution is complete.
|
|
406
418
|
* If a multi-step route is necessary, intermediate steps should return `ExecuteOutcome.Partial`. Intermediate steps *must* not
|
|
407
|
-
* result in underlying {toToken} being transferred
|
|
419
|
+
* result in underlying {toToken} being transferred to or from the batcher.
|
|
408
420
|
*
|
|
409
421
|
* [WARNING]
|
|
410
422
|
* ====
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
// SPDX-License-Identifier: MIT
|
|
2
|
-
// OpenZeppelin Confidential Contracts (last updated v0.5.0
|
|
2
|
+
// OpenZeppelin Confidential Contracts (last updated v0.5.0) (governance/utils/VotesConfidential.sol)
|
|
3
3
|
|
|
4
4
|
pragma solidity ^0.8.26;
|
|
5
5
|
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
// SPDX-License-Identifier: MIT
|
|
2
|
-
// OpenZeppelin Confidential Contracts (last updated v0.5.0
|
|
2
|
+
// OpenZeppelin Confidential Contracts (last updated v0.5.0) (interfaces/IERC7984HookModule.sol)
|
|
3
3
|
|
|
4
4
|
pragma solidity ^0.8.24;
|
|
5
5
|
|
|
@@ -29,11 +29,4 @@ interface IERC7984HookModule is IERC165 {
|
|
|
29
29
|
|
|
30
30
|
/// @dev Performs operations after installation.
|
|
31
31
|
function onInstall(bytes calldata initData) external;
|
|
32
|
-
|
|
33
|
-
/**
|
|
34
|
-
* @dev Performs operations after uninstallation.
|
|
35
|
-
*
|
|
36
|
-
* NOTE: The module uninstallation will succeed even if this function reverts.
|
|
37
|
-
*/
|
|
38
|
-
function onUninstall(bytes calldata deinitData) external;
|
|
39
32
|
}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
// SPDX-License-Identifier: MIT
|
|
2
|
-
// OpenZeppelin Confidential Contracts (last updated v0.5.0
|
|
2
|
+
// OpenZeppelin Confidential Contracts (last updated v0.5.0) (interfaces/IERC7984Receiver.sol)
|
|
3
3
|
pragma solidity ^0.8.24;
|
|
4
4
|
|
|
5
5
|
import {ebool, euint64} from "@fhevm/solidity/lib/FHE.sol";
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
// SPDX-License-Identifier: MIT
|
|
2
|
-
// OpenZeppelin Confidential Contracts (last updated v0.5.0
|
|
2
|
+
// OpenZeppelin Confidential Contracts (last updated v0.5.0) (interfaces/IERC7984Rwa.sol)
|
|
3
3
|
pragma solidity ^0.8.24;
|
|
4
4
|
|
|
5
5
|
import {externalEuint64, euint64} from "@fhevm/solidity/lib/FHE.sol";
|
package/package.json
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
// SPDX-License-Identifier: MIT
|
|
2
|
-
// OpenZeppelin Confidential Contracts (last updated v0.5.0
|
|
2
|
+
// OpenZeppelin Confidential Contracts (last updated v0.5.0) (token/ERC7984/ERC7984.sol)
|
|
3
3
|
pragma solidity ^0.8.27;
|
|
4
4
|
|
|
5
5
|
import {FHE, externalEuint64, ebool, euint64} from "@fhevm/solidity/lib/FHE.sol";
|
|
@@ -100,7 +100,10 @@ abstract contract ERC7984 is IERC7984, ERC165 {
|
|
|
100
100
|
return holder == spender || block.timestamp <= _operators[holder][spender];
|
|
101
101
|
}
|
|
102
102
|
|
|
103
|
-
|
|
103
|
+
/**
|
|
104
|
+
* @dev See {IERC7984-setOperator}. Operators are given ACL allowance (ability to decrypt) for the transferred amount
|
|
105
|
+
* of transfers they initiate.
|
|
106
|
+
*/
|
|
104
107
|
function setOperator(address operator, uint48 until) public virtual {
|
|
105
108
|
_setOperator(msg.sender, operator, until);
|
|
106
109
|
}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
// SPDX-License-Identifier: MIT
|
|
2
|
-
// OpenZeppelin Confidential Contracts (last updated v0.5.0
|
|
2
|
+
// OpenZeppelin Confidential Contracts (last updated v0.5.0) (token/ERC7984/extensions/ERC7984ERC20Wrapper.sol)
|
|
3
3
|
|
|
4
4
|
pragma solidity ^0.8.27;
|
|
5
5
|
|
|
@@ -1,9 +1,9 @@
|
|
|
1
1
|
// SPDX-License-Identifier: MIT
|
|
2
|
-
// OpenZeppelin Confidential Contracts (last updated v0.5.0
|
|
2
|
+
// OpenZeppelin Confidential Contracts (last updated v0.5.0) (token/ERC7984/extensions/ERC7984Freezable.sol)
|
|
3
3
|
|
|
4
4
|
pragma solidity ^0.8.27;
|
|
5
5
|
|
|
6
|
-
import {FHE,
|
|
6
|
+
import {FHE, euint64} from "@fhevm/solidity/lib/FHE.sol";
|
|
7
7
|
import {FHESafeMath} from "../../../utils/FHESafeMath.sol";
|
|
8
8
|
import {ERC7984} from "../ERC7984.sol";
|
|
9
9
|
|
|
@@ -1,11 +1,10 @@
|
|
|
1
1
|
// SPDX-License-Identifier: MIT
|
|
2
|
-
// OpenZeppelin Confidential Contracts (last updated v0.5.0
|
|
2
|
+
// OpenZeppelin Confidential Contracts (last updated v0.5.0) (token/ERC7984/extensions/ERC7984Hooked.sol)
|
|
3
3
|
|
|
4
4
|
pragma solidity ^0.8.27;
|
|
5
5
|
|
|
6
6
|
import {FHE, ebool, euint64} from "@fhevm/solidity/lib/FHE.sol";
|
|
7
7
|
import {ERC165Checker} from "@openzeppelin/contracts/utils/introspection/ERC165Checker.sol";
|
|
8
|
-
import {LowLevelCall} from "@openzeppelin/contracts/utils/LowLevelCall.sol";
|
|
9
8
|
import {EnumerableSet} from "@openzeppelin/contracts/utils/structs/EnumerableSet.sol";
|
|
10
9
|
import {IERC7984HookModule} from "./../../../interfaces/IERC7984HookModule.sol";
|
|
11
10
|
import {HandleAccessManager} from "./../../../utils/HandleAccessManager.sol";
|
|
@@ -20,7 +19,9 @@ import {ERC7984} from "./../ERC7984.sol";
|
|
|
20
19
|
* amount and may do accounting as necessary. Modules may revert on either call, which will propagate
|
|
21
20
|
* and revert the entire transaction.
|
|
22
21
|
*
|
|
23
|
-
*
|
|
22
|
+
* WARNING: Hook modules are trusted contracts--they have access to any private state the token has access to. This arbitrary
|
|
23
|
+
* ACL access allows hook modules to grant themselves (or any other address) allowance to view any handle the token has access to.
|
|
24
|
+
* ACL allowances granted by the hook module persist even after the module is uninstalled.
|
|
24
25
|
*/
|
|
25
26
|
abstract contract ERC7984Hooked is ERC7984, HandleAccessManager {
|
|
26
27
|
using EnumerableSet for *;
|
|
@@ -62,8 +63,8 @@ abstract contract ERC7984Hooked is ERC7984, HandleAccessManager {
|
|
|
62
63
|
}
|
|
63
64
|
|
|
64
65
|
/// @dev Uninstalls a hook module.
|
|
65
|
-
function uninstallModule(address module
|
|
66
|
-
_uninstallModule(module
|
|
66
|
+
function uninstallModule(address module) public virtual onlyAuthorizedModuleChange {
|
|
67
|
+
_uninstallModule(module);
|
|
67
68
|
}
|
|
68
69
|
|
|
69
70
|
/**
|
|
@@ -98,11 +99,9 @@ abstract contract ERC7984Hooked is ERC7984, HandleAccessManager {
|
|
|
98
99
|
}
|
|
99
100
|
|
|
100
101
|
/// @dev Internal function which uninstalls a module.
|
|
101
|
-
function _uninstallModule(address module
|
|
102
|
+
function _uninstallModule(address module) internal virtual {
|
|
102
103
|
require(_modules.remove(module), ERC7984HookedNonexistentModule(module));
|
|
103
104
|
|
|
104
|
-
LowLevelCall.callNoReturn(module, abi.encodeCall(IERC7984HookModule.onUninstall, (deinitData)));
|
|
105
|
-
|
|
106
105
|
emit ERC7984HookedModuleUninstalled(module);
|
|
107
106
|
}
|
|
108
107
|
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
// SPDX-License-Identifier: MIT
|
|
2
|
-
// OpenZeppelin Confidential Contracts (last updated v0.5.0
|
|
2
|
+
// OpenZeppelin Confidential Contracts (last updated v0.5.0) (token/ERC7984/extensions/ERC7984Restricted.sol)
|
|
3
3
|
|
|
4
4
|
pragma solidity ^0.8.27;
|
|
5
5
|
|