Keep CyberID address testnet the same as mainnet

cyberconnecthq · Oct 18, 2023 · 59eb992 · 59eb992
1 parent a7e69e2
commit 59eb992
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/package.json b/package.json
@@ -13,17 +13,17 @@
     "build": "forge build --force",
     "gen_abi": "ts-node misc/gen_abi.ts",
     "deploy_realmid:mumbai": "source .env.mumbai && forge script script/DeployRealmId.s.sol:DeployRealmId --verify --rpc-url $RPC_URL --legacy --private-key $PRIVATE_KEY --broadcast -vvv",
-    "deploy_cyberid:op_goerli": "source .env.op_goerli && forge script script/DeployCyberId.s.sol:DeployCyberId --verify --rpc-url $RPC_URL --private-key $PRIVATE_KEY --broadcast -vvv",
-    "deploy_cyberid:op": "source .env.op && forge script script/DeployCyberId.s.sol:DeployCyberId --verify --rpc-url $RPC_URL --private-key $PRIVATE_KEY  --broadcast -vvv",
+    "deploy_cyberid:op_goerli": "source .env.op_goerli && forge script script/DeployCyberId.s.sol:DeployCyberId --verify --rpc-url $RPC_URL --private-key $PRIVATE_KEY  --etherscan-api-key $API_KEY --broadcast -vvv",
+    "deploy_cyberid:op": "source .env.op && forge script script/DeployCyberId.s.sol:DeployCyberId --verify --rpc-url $RPC_URL --private-key $PRIVATE_KEY  --etherscan-api-key $API_KEY  --broadcast -vvv",
     "set_cyberid_init_state:op": "source .env.op.owner && forge script script/SetCyberIDInitState.s.sol:SetCyberIDInitState --rpc-url $RPC_URL --private-key $PRIVATE_KEY  --broadcast -vvv",
-    "set_cyberid_init_state:op_goerli": "source .env.op_goerli && forge script script/SetCyberIDInitState.s.sol:SetCyberIDInitState --rpc-url $RPC_URL --private-key $PRIVATE_KEY --broadcast -vvv",
+    "set_cyberid_init_state:op_goerli": "source .env.op_goerli.owner && forge script script/SetCyberIDInitState.s.sol:SetCyberIDInitState --rpc-url $RPC_URL --private-key $PRIVATE_KEY --broadcast -vvv",
     "temp_script:op_goerli": "source .env.op_goerli && forge script script/Tmp.s.sol:TempScript --rpc-url $RPC_URL --private-key $PRIVATE_KEY --broadcast -vvv",
     "temp_script:op": "source .env.op.owner && forge script script/Tmp.s.sol:TempScript --rpc-url $RPC_URL --private-key $PRIVATE_KEY -vvv",
-    "verify_cyberid:op_goerli": "source .env.op_goerli && ETHERSCAN_API_KEY=$ETHERSCAN_API_KEY forge verify-contract --chain-id 420 --compiler-version v0.8.14+commit.80d49f37  0x011db522044b03f68311486e63785e90980d0cc3 src/core/CyberId.sol:CyberId  --watch",
+    "verify_cyberid:op_goerli": "source .env.op_goerli && ETHERSCAN_API_KEY=$API_KEY forge verify-contract --chain-id 420 --compiler-version v0.8.14+commit.80d49f37  0x011db522044b03f68311486e63785e90980d0cc3 src/core/CyberId.sol:CyberId  --watch",
     "verify_cyberid:op": "source .env.op && ETHERSCAN_API_KEY=$API_KEY forge verify-contract --chain-id 10 --compiler-version v0.8.14+commit.80d49f37  0x71455a99fe9ed6e2501297b1331d135225a41b81 src/core/CyberId.sol:CyberId  --watch",
     "verify_permissioned_stablefeemw:op": "source .env.op && ETHERSCAN_API_KEY=$API_KEY forge verify-contract --chain-id 10 --compiler-version v0.8.14+commit.80d49f37 --constructor-args 00000000000000000000000013e3ee699d1909e989722e753853ae30b17e08c5000000000000000000000000cd97405fb58e94954e825e46db192b916a45d412000000000000000000000000714638def68cf32a641b0735e489733b3187f431 0x889c6bb8d1dfbc0210007db15404afb4c4ba913e src/middlewares/cyberid/PermissionedStableFeeMiddleware.sol:PermissionedStableFeeMiddleware  --watch",
-    "verify_permissionmw:mumbai": "source .env.mumbai && ETHERSCAN_API_KEY=$ETHERSCAN_API_KEY forge verify-contract --chain-id 80001 --compiler-version v0.8.14+commit.80d49f37 --constructor-args 0000000000000000000000001ef669e1a6d2aeef4741761488d473ece9810b05 0x31f627dc0030334e62f8ca53c3cf730bb8417081 src/middlewares/realmid/PermissionMw.sol:PermissionMw  --watch",
-    "verify_realmid:mumbai": "source .env.mumbai && ETHERSCAN_API_KEY=$ETHERSCAN_API_KEY forge verify-contract --chain-id 80001 --compiler-version v0.8.14+commit.80d49f37 0xf7cc42298b05931d93cd81d9513f8ed4ebe6bde1 src/core/RealmId.sol:RealmId  --watch"
+    "verify_permissionmw:mumbai": "source .env.mumbai && ETHERSCAN_API_KEY=$API_KEY forge verify-contract --chain-id 80001 --compiler-version v0.8.14+commit.80d49f37 --constructor-args 0000000000000000000000001ef669e1a6d2aeef4741761488d473ece9810b05 0x31f627dc0030334e62f8ca53c3cf730bb8417081 src/middlewares/realmid/PermissionMw.sol:PermissionMw  --watch",
+    "verify_realmid:mumbai": "source .env.mumbai && ETHERSCAN_API_KEY=$API_KEY forge verify-contract --chain-id 80001 --compiler-version v0.8.14+commit.80d49f37 0xf7cc42298b05931d93cd81d9513f8ed4ebe6bde1 src/core/RealmId.sol:RealmId  --watch"
   },
   "devDependencies": {
     "husky": "^8.0.1",

diff --git a/script/libraries/DeploySetting.sol b/script/libraries/DeploySetting.sol
@@ -42,10 +42,10 @@ contract DeploySetting {
                 0xaB24749c622AF8FC567CA2b4d3EC53019F83dB8F
             );
             deployParams.protocolOwner = address(
-                0x7B23B874cD857C5968434F95674165a36CfD5E4e
+                0x7884f7F04F994da14302a16Cf15E597e31eebECf
             );
             deployParams.recipient = address(
-                0x7B23B874cD857C5968434F95674165a36CfD5E4e
+                0x7884f7F04F994da14302a16Cf15E597e31eebECf
             );
             deployParams.tokenReceiver = address(
                 0xcd97405Fb58e94954E825E46dB192b916A45d412