re-deploy

cyberconnecthq · Sep 13, 2024 · 9641e32 · 9641e32
1 parent 1e13a02
commit 9641e32
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 10 deletions.
diff --git a/docs/abi/PermissionedStableFeeMiddleware.json b/docs/abi/PermissionedStableFeeMiddleware.json
@@ -1 +1 @@
-[{"type":"constructor","inputs":[{"name":"_oracleAddress","type":"address","internalType":"address"},{"name":"_cyberId","type":"address","internalType":"address"},{"name":"_owner","type":"address","internalType":"address"}],"stateMutability":"nonpayable"},{"type":"function","name":"DOMAIN_SEPARATOR","inputs":[],"outputs":[{"name":"","type":"bytes32","internalType":"bytes32"}],"stateMutability":"view"},{"type":"function","name":"NAME_REGISTRY","inputs":[],"outputs":[{"name":"","type":"address","internalType":"address"}],"stateMutability":"view"},{"type":"function","name":"_REGISTER_TYPEHASH","inputs":[],"outputs":[{"name":"","type":"bytes32","internalType":"bytes32"}],"stateMutability":"view"},{"type":"function","name":"getPriceWei","inputs":[{"name":"cid","type":"string","internalType":"string"}],"outputs":[{"name":"","type":"uint256","internalType":"uint256"}],"stateMutability":"view"},{"type":"function","name":"namePatternValid","inputs":[{"name":"name","type":"string","internalType":"string"}],"outputs":[{"name":"","type":"bool","internalType":"bool"}],"stateMutability":"pure"},{"type":"function","name":"nonces","inputs":[{"name":"","type":"address","internalType":"address"},{"name":"","type":"uint8","internalType":"enum PermissionedStableFeeMiddleware.FeeType"}],"outputs":[{"name":"","type":"uint256","internalType":"uint256"}],"stateMutability":"view"},{"type":"function","name":"owner","inputs":[],"outputs":[{"name":"","type":"address","internalType":"address"}],"stateMutability":"view"},{"type":"function","name":"preRegister","inputs":[{"name":"params","type":"tuple","internalType":"struct DataTypes.RegisterCyberIdParams","components":[{"name":"msgSender","type":"address","internalType":"address"},{"name":"cids","type":"string[]","internalType":"string[]"},{"name":"to","type":"address","internalType":"address"}]},{"name":"data","type":"bytes","internalType":"bytes"}],"outputs":[{"name":"","type":"uint256","internalType":"uint256"}],"stateMutability":"payable"},{"type":"function","name":"price10AndMoreLetter","inputs":[],"outputs":[{"name":"","type":"uint256","internalType":"uint256"}],"stateMutability":"view"},{"type":"function","name":"price3Letter","inputs":[],"outputs":[{"name":"","type":"uint256","internalType":"uint256"}],"stateMutability":"view"},{"type":"function","name":"price4Letter","inputs":[],"outputs":[{"name":"","type":"uint256","internalType":"uint256"}],"stateMutability":"view"},{"type":"function","name":"price5To9Letter","inputs":[],"outputs":[{"name":"","type":"uint256","internalType":"uint256"}],"stateMutability":"view"},{"type":"function","name":"recipient","inputs":[],"outputs":[{"name":"","type":"address","internalType":"address"}],"stateMutability":"view"},{"type":"function","name":"renounceOwnership","inputs":[],"outputs":[],"stateMutability":"nonpayable"},{"type":"function","name":"rescueToken","inputs":[{"name":"token","type":"address","internalType":"address"}],"outputs":[],"stateMutability":"nonpayable"},{"type":"function","name":"setMwData","inputs":[{"name":"data","type":"bytes","internalType":"bytes"}],"outputs":[],"stateMutability":"nonpayable"},{"type":"function","name":"signer","inputs":[],"outputs":[{"name":"","type":"address","internalType":"address"}],"stateMutability":"view"},{"type":"function","name":"transferOwnership","inputs":[{"name":"newOwner","type":"address","internalType":"address"}],"outputs":[],"stateMutability":"nonpayable"},{"type":"function","name":"usdOracle","inputs":[],"outputs":[{"name":"","type":"address","internalType":"contract AggregatorV3Interface"}],"stateMutability":"view"},{"type":"event","name":"OwnershipTransferred","inputs":[{"name":"previousOwner","type":"address","indexed":true,"internalType":"address"},{"name":"newOwner","type":"address","indexed":true,"internalType":"address"}],"anonymous":false},{"type":"event","name":"SignerChanged","inputs":[{"name":"signer","type":"address","indexed":true,"internalType":"address"}],"anonymous":false},{"type":"event","name":"StableFeeChanged","inputs":[{"name":"recipient","type":"address","indexed":true,"internalType":"address"},{"name":"price3Letter","type":"uint256","indexed":false,"internalType":"uint256"},{"name":"price4Letter","type":"uint256","indexed":false,"internalType":"uint256"},{"name":"price5To9Letter","type":"uint256","indexed":false,"internalType":"uint256"},{"name":"price10AndMoreLetter","type":"uint256","indexed":false,"internalType":"uint256"}],"anonymous":false}]
+[{"type":"constructor","inputs":[{"name":"_oracleAddress","type":"address","internalType":"address"},{"name":"_cyberId","type":"address","internalType":"address"},{"name":"_owner","type":"address","internalType":"address"}],"stateMutability":"nonpayable"},{"type":"function","name":"DOMAIN_SEPARATOR","inputs":[],"outputs":[{"name":"","type":"bytes32","internalType":"bytes32"}],"stateMutability":"view"},{"type":"function","name":"NAME_REGISTRY","inputs":[],"outputs":[{"name":"","type":"address","internalType":"address"}],"stateMutability":"view"},{"type":"function","name":"_REGISTER_TYPEHASH","inputs":[],"outputs":[{"name":"","type":"bytes32","internalType":"bytes32"}],"stateMutability":"view"},{"type":"function","name":"getPriceWei","inputs":[{"name":"cid","type":"string","internalType":"string"}],"outputs":[{"name":"","type":"uint256","internalType":"uint256"}],"stateMutability":"view"},{"type":"function","name":"namePatternValid","inputs":[{"name":"name","type":"string","internalType":"string"}],"outputs":[{"name":"","type":"bool","internalType":"bool"}],"stateMutability":"pure"},{"type":"function","name":"nonces","inputs":[{"name":"","type":"address","internalType":"address"},{"name":"","type":"uint8","internalType":"enum PermissionedStableFeeMiddleware.FeeType"}],"outputs":[{"name":"","type":"uint256","internalType":"uint256"}],"stateMutability":"view"},{"type":"function","name":"owner","inputs":[],"outputs":[{"name":"","type":"address","internalType":"address"}],"stateMutability":"view"},{"type":"function","name":"preRegister","inputs":[{"name":"params","type":"tuple","internalType":"struct DataTypes.RegisterCyberIdParams","components":[{"name":"msgSender","type":"address","internalType":"address"},{"name":"cids","type":"string[]","internalType":"string[]"},{"name":"to","type":"address","internalType":"address"}]},{"name":"data","type":"bytes","internalType":"bytes"}],"outputs":[{"name":"","type":"uint256","internalType":"uint256"}],"stateMutability":"payable"},{"type":"function","name":"price10AndMoreLetter","inputs":[],"outputs":[{"name":"","type":"uint256","internalType":"uint256"}],"stateMutability":"view"},{"type":"function","name":"price3Letter","inputs":[],"outputs":[{"name":"","type":"uint256","internalType":"uint256"}],"stateMutability":"view"},{"type":"function","name":"price4Letter","inputs":[],"outputs":[{"name":"","type":"uint256","internalType":"uint256"}],"stateMutability":"view"},{"type":"function","name":"price5To9Letter","inputs":[],"outputs":[{"name":"","type":"uint256","internalType":"uint256"}],"stateMutability":"view"},{"type":"function","name":"recipient","inputs":[],"outputs":[{"name":"","type":"address","internalType":"address"}],"stateMutability":"view"},{"type":"function","name":"renounceOwnership","inputs":[],"outputs":[],"stateMutability":"nonpayable"},{"type":"function","name":"rescueToken","inputs":[{"name":"token","type":"address","internalType":"address"}],"outputs":[],"stateMutability":"nonpayable"},{"type":"function","name":"setMwData","inputs":[{"name":"data","type":"bytes","internalType":"bytes"}],"outputs":[],"stateMutability":"nonpayable"},{"type":"function","name":"signer","inputs":[],"outputs":[{"name":"","type":"address","internalType":"address"}],"stateMutability":"view"},{"type":"function","name":"transferOwnership","inputs":[{"name":"newOwner","type":"address","internalType":"address"}],"outputs":[],"stateMutability":"nonpayable"},{"type":"function","name":"usdOracle","inputs":[],"outputs":[{"name":"","type":"address","internalType":"contract AggregatorV3Interface"}],"stateMutability":"view"},{"type":"event","name":"OwnershipTransferred","inputs":[{"name":"previousOwner","type":"address","indexed":true,"internalType":"address"},{"name":"newOwner","type":"address","indexed":true,"internalType":"address"}],"anonymous":false},{"type":"event","name":"SigUsed","inputs":[{"name":"account","type":"address","indexed":true,"internalType":"address"},{"name":"feeType","type":"uint8","indexed":false,"internalType":"enum PermissionedStableFeeMiddleware.FeeType"},{"name":"nonce","type":"uint256","indexed":false,"internalType":"uint256"}],"anonymous":false},{"type":"event","name":"SignerChanged","inputs":[{"name":"signer","type":"address","indexed":true,"internalType":"address"}],"anonymous":false},{"type":"event","name":"StableFeeChanged","inputs":[{"name":"recipient","type":"address","indexed":true,"internalType":"address"},{"name":"price3Letter","type":"uint256","indexed":false,"internalType":"uint256"},{"name":"price4Letter","type":"uint256","indexed":false,"internalType":"uint256"},{"name":"price5To9Letter","type":"uint256","indexed":false,"internalType":"uint256"},{"name":"price10AndMoreLetter","type":"uint256","indexed":false,"internalType":"uint256"}],"anonymous":false}]
diff --git a/docs/deploy/cyber_testnet-111557560/contract.md b/docs/deploy/cyber_testnet-111557560/contract.md
@@ -1,8 +1,8 @@
 | Contract                        | Address                                    |
 | ------------------------------- | ------------------------------------------ |
-| CyberIdRegistry                 | 0x5ea688312b97d5f1ed36db65240a2e04f1eb5899 |
-| CyberIdPublicResolver           | 0x2a40683b8664febdcde113cb890f4ccd9b07f55e |
-| CyberIdReverseRegistrar         | 0x0d56da4a8cf09bec31e22c66209605ff7dfb8ea2 |
-| CyberId(Impl)                   | 0x3c61f0782f9bf459b9363e67266a2a70cf6efe30 |
-| CyberId(Proxy)                  | 0x8176bf17fd44bf0d324a95a83afa16c5e7843b50 |
-| PermissionedStableFeeMiddleware | 0x4203e3c3fa54673bb99ba77c69a6ba73dd047be0 |
+| CyberIdRegistry                 | 0x36faeb5689f6d413aec1cb6bb7858fc4f0692d60 |
+| CyberIdPublicResolver           | 0x0bca8585f8ebf213dd5828ec9b938d093a44394c |
+| CyberIdReverseRegistrar         | 0xb77fa42748ce5a63e1cadf4429b460de9bb10355 |
+| CyberId(Impl)                   | 0x8e967fff8ff68f0a83c170f547c5fa1459a09671 |
+| CyberId(Proxy)                  | 0xb608a0c88d6e8a6d93d1be57eb08854ba324ef76 |
+| PermissionedStableFeeMiddleware | 0x4aeb01f705362a1de894a4ca38d7986d61aca6f9 |
diff --git a/misc/gen_abi.ts b/misc/gen_abi.ts
@@ -7,7 +7,6 @@ const writeAbi = async () => {
     "RealmId.sol/RealmId.json",
     "PermissionMw.sol/PermissionMw.json",
     "StableFeeMiddleware.sol/StableFeeMiddleware.json",
-    "TrustOnlyMiddleware.sol/TrustOnlyMiddleware.json",
     "PermissionedStableFeeMiddleware.sol/PermissionedStableFeeMiddleware.json",
     "CyberIdRegistry.sol/CyberIdRegistry.json",
     "CyberIdPublicResolver.sol/CyberIdPublicResolver.json",

diff --git a/script/libraries/LibDeploy.sol b/script/libraries/LibDeploy.sol
@@ -20,7 +20,7 @@ import { CyberIdReverseRegistrar } from "../../src/core/CyberIdReverseRegistrar.
 
 library LibDeploy {
     // create2 deploy all contract with this protocol salt
-    bytes32 constant SALT = keccak256(bytes("CyberId"));
+    bytes32 constant SALT = keccak256(bytes("CyberID"));
 
     string internal constant OUTPUT_FILE = "docs/deploy/";
 

diff --git a/src/middlewares/cyberid/PermissionedStableFeeMiddleware.sol b/src/middlewares/cyberid/PermissionedStableFeeMiddleware.sol
@@ -76,6 +76,8 @@ contract PermissionedStableFeeMiddleware is
         uint256 price10AndMoreLetter
     );
 
+    event SigUsed(address indexed account, FeeType feeType, uint256 nonce);
+
     /*//////////////////////////////////////////////////////////////
                             CONSTRUCTOR
     //////////////////////////////////////////////////////////////*/
@@ -128,14 +130,15 @@ contract PermissionedStableFeeMiddleware is
             (FeeType, uint256, uint8, bytes32, bytes32, uint256)
         );
 
+        uint256 currentNonce = nonces[params.to][feeType]++;
         _requiresExpectedSigner(
             _hashTypedDataV4(
                 keccak256(
                     abi.encode(
                         _REGISTER_TYPEHASH,
                         _encodeCids(params.cids),
                         params.to,
-                        nonces[params.to][feeType]++,
+                        currentNonce,
                         sig.deadline,
                         discount
                     )
@@ -147,6 +150,7 @@ contract PermissionedStableFeeMiddleware is
             sig.s,
             sig.deadline
         );
+        emit SigUsed(params.to, feeType, currentNonce);
         uint256 cost = 0;
         if (discount > 0) {
             for (uint256 i = 0; i < params.cids.length; i++) {
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		[{"type":"constructor","inputs":[{"name":"_oracleAddress","type":"address","internalType":"address"},{"name":"_cyberId","type":"address","internalType":"address"},{"name":"_owner","type":"address","internalType":"address"}],"stateMutability":"nonpayable"},{"type":"function","name":"DOMAIN_SEPARATOR","inputs":[],"outputs":[{"name":"","type":"bytes32","internalType":"bytes32"}],"stateMutability":"view"},{"type":"function","name":"NAME_REGISTRY","inputs":[],"outputs":[{"name":"","type":"address","internalType":"address"}],"stateMutability":"view"},{"type":"function","name":"_REGISTER_TYPEHASH","inputs":[],"outputs":[{"name":"","type":"bytes32","internalType":"bytes32"}],"stateMutability":"view"},{"type":"function","name":"getPriceWei","inputs":[{"name":"cid","type":"string","internalType":"string"}],"outputs":[{"name":"","type":"uint256","internalType":"uint256"}],"stateMutability":"view"},{"type":"function","name":"namePatternValid","inputs":[{"name":"name","type":"string","internalType":"string"}],"outputs":[{"name":"","type":"bool","internalType":"bool"}],"stateMutability":"pure"},{"type":"function","name":"nonces","inputs":[{"name":"","type":"address","internalType":"address"},{"name":"","type":"uint8","internalType":"enum PermissionedStableFeeMiddleware.FeeType"}],"outputs":[{"name":"","type":"uint256","internalType":"uint256"}],"stateMutability":"view"},{"type":"function","name":"owner","inputs":[],"outputs":[{"name":"","type":"address","internalType":"address"}],"stateMutability":"view"},{"type":"function","name":"preRegister","inputs":[{"name":"params","type":"tuple","internalType":"struct DataTypes.RegisterCyberIdParams","components":[{"name":"msgSender","type":"address","internalType":"address"},{"name":"cids","type":"string[]","internalType":"string[]"},{"name":"to","type":"address","internalType":"address"}]},{"name":"data","type":"bytes","internalType":"bytes"}],"outputs":[{"name":"","type":"uint256","internalType":"uint256"}],"stateMutability":"payable"},{"type":"function","name":"price10AndMoreLetter","inputs":[],"outputs":[{"name":"","type":"uint256","internalType":"uint256"}],"stateMutability":"view"},{"type":"function","name":"price3Letter","inputs":[],"outputs":[{"name":"","type":"uint256","internalType":"uint256"}],"stateMutability":"view"},{"type":"function","name":"price4Letter","inputs":[],"outputs":[{"name":"","type":"uint256","internalType":"uint256"}],"stateMutability":"view"},{"type":"function","name":"price5To9Letter","inputs":[],"outputs":[{"name":"","type":"uint256","internalType":"uint256"}],"stateMutability":"view"},{"type":"function","name":"recipient","inputs":[],"outputs":[{"name":"","type":"address","internalType":"address"}],"stateMutability":"view"},{"type":"function","name":"renounceOwnership","inputs":[],"outputs":[],"stateMutability":"nonpayable"},{"type":"function","name":"rescueToken","inputs":[{"name":"token","type":"address","internalType":"address"}],"outputs":[],"stateMutability":"nonpayable"},{"type":"function","name":"setMwData","inputs":[{"name":"data","type":"bytes","internalType":"bytes"}],"outputs":[],"stateMutability":"nonpayable"},{"type":"function","name":"signer","inputs":[],"outputs":[{"name":"","type":"address","internalType":"address"}],"stateMutability":"view"},{"type":"function","name":"transferOwnership","inputs":[{"name":"newOwner","type":"address","internalType":"address"}],"outputs":[],"stateMutability":"nonpayable"},{"type":"function","name":"usdOracle","inputs":[],"outputs":[{"name":"","type":"address","internalType":"contract AggregatorV3Interface"}],"stateMutability":"view"},{"type":"event","name":"OwnershipTransferred","inputs":[{"name":"previousOwner","type":"address","indexed":true,"internalType":"address"},{"name":"newOwner","type":"address","indexed":true,"internalType":"address"}],"anonymous":false},{"type":"event","name":"SignerChanged","inputs":[{"name":"signer","type":"address","indexed":true,"internalType":"address"}],"anonymous":false},{"type":"event","name":"StableFeeChanged","inputs":[{"name":"recipient","type":"address","indexed":true,"internalType":"address"},{"name":"price3Letter","type":"uint256","indexed":false,"internalType":"uint256"},{"name":"price4Letter","type":"uint256","indexed":false,"internalType":"uint256"},{"name":"price5To9Letter","type":"uint256","indexed":false,"internalType":"uint256"},{"name":"price10AndMoreLetter","type":"uint256","indexed":false,"internalType":"uint256"}],"anonymous":false}]
		[{"type":"constructor","inputs":[{"name":"_oracleAddress","type":"address","internalType":"address"},{"name":"_cyberId","type":"address","internalType":"address"},{"name":"_owner","type":"address","internalType":"address"}],"stateMutability":"nonpayable"},{"type":"function","name":"DOMAIN_SEPARATOR","inputs":[],"outputs":[{"name":"","type":"bytes32","internalType":"bytes32"}],"stateMutability":"view"},{"type":"function","name":"NAME_REGISTRY","inputs":[],"outputs":[{"name":"","type":"address","internalType":"address"}],"stateMutability":"view"},{"type":"function","name":"_REGISTER_TYPEHASH","inputs":[],"outputs":[{"name":"","type":"bytes32","internalType":"bytes32"}],"stateMutability":"view"},{"type":"function","name":"getPriceWei","inputs":[{"name":"cid","type":"string","internalType":"string"}],"outputs":[{"name":"","type":"uint256","internalType":"uint256"}],"stateMutability":"view"},{"type":"function","name":"namePatternValid","inputs":[{"name":"name","type":"string","internalType":"string"}],"outputs":[{"name":"","type":"bool","internalType":"bool"}],"stateMutability":"pure"},{"type":"function","name":"nonces","inputs":[{"name":"","type":"address","internalType":"address"},{"name":"","type":"uint8","internalType":"enum PermissionedStableFeeMiddleware.FeeType"}],"outputs":[{"name":"","type":"uint256","internalType":"uint256"}],"stateMutability":"view"},{"type":"function","name":"owner","inputs":[],"outputs":[{"name":"","type":"address","internalType":"address"}],"stateMutability":"view"},{"type":"function","name":"preRegister","inputs":[{"name":"params","type":"tuple","internalType":"struct DataTypes.RegisterCyberIdParams","components":[{"name":"msgSender","type":"address","internalType":"address"},{"name":"cids","type":"string[]","internalType":"string[]"},{"name":"to","type":"address","internalType":"address"}]},{"name":"data","type":"bytes","internalType":"bytes"}],"outputs":[{"name":"","type":"uint256","internalType":"uint256"}],"stateMutability":"payable"},{"type":"function","name":"price10AndMoreLetter","inputs":[],"outputs":[{"name":"","type":"uint256","internalType":"uint256"}],"stateMutability":"view"},{"type":"function","name":"price3Letter","inputs":[],"outputs":[{"name":"","type":"uint256","internalType":"uint256"}],"stateMutability":"view"},{"type":"function","name":"price4Letter","inputs":[],"outputs":[{"name":"","type":"uint256","internalType":"uint256"}],"stateMutability":"view"},{"type":"function","name":"price5To9Letter","inputs":[],"outputs":[{"name":"","type":"uint256","internalType":"uint256"}],"stateMutability":"view"},{"type":"function","name":"recipient","inputs":[],"outputs":[{"name":"","type":"address","internalType":"address"}],"stateMutability":"view"},{"type":"function","name":"renounceOwnership","inputs":[],"outputs":[],"stateMutability":"nonpayable"},{"type":"function","name":"rescueToken","inputs":[{"name":"token","type":"address","internalType":"address"}],"outputs":[],"stateMutability":"nonpayable"},{"type":"function","name":"setMwData","inputs":[{"name":"data","type":"bytes","internalType":"bytes"}],"outputs":[],"stateMutability":"nonpayable"},{"type":"function","name":"signer","inputs":[],"outputs":[{"name":"","type":"address","internalType":"address"}],"stateMutability":"view"},{"type":"function","name":"transferOwnership","inputs":[{"name":"newOwner","type":"address","internalType":"address"}],"outputs":[],"stateMutability":"nonpayable"},{"type":"function","name":"usdOracle","inputs":[],"outputs":[{"name":"","type":"address","internalType":"contract AggregatorV3Interface"}],"stateMutability":"view"},{"type":"event","name":"OwnershipTransferred","inputs":[{"name":"previousOwner","type":"address","indexed":true,"internalType":"address"},{"name":"newOwner","type":"address","indexed":true,"internalType":"address"}],"anonymous":false},{"type":"event","name":"SigUsed","inputs":[{"name":"account","type":"address","indexed":true,"internalType":"address"},{"name":"feeType","type":"uint8","indexed":false,"internalType":"enum PermissionedStableFeeMiddleware.FeeType"},{"name":"nonce","type":"uint256","indexed":false,"internalType":"uint256"}],"anonymous":false},{"type":"event","name":"SignerChanged","inputs":[{"name":"signer","type":"address","indexed":true,"internalType":"address"}],"anonymous":false},{"type":"event","name":"StableFeeChanged","inputs":[{"name":"recipient","type":"address","indexed":true,"internalType":"address"},{"name":"price3Letter","type":"uint256","indexed":false,"internalType":"uint256"},{"name":"price4Letter","type":"uint256","indexed":false,"internalType":"uint256"},{"name":"price5To9Letter","type":"uint256","indexed":false,"internalType":"uint256"},{"name":"price10AndMoreLetter","type":"uint256","indexed":false,"internalType":"uint256"}],"anonymous":false}]