fix

Author: aditya520

contract_manager/scripts/deploy_evm_lazer_contracts.ts

@@ -19,16 +19,16 @@
  * EXAMPLES:
  *
  * Deploy only:
- *   node deploy_evm_lazer_contracts.ts --chain ethereum --private-key <key>
+ *   npx ts-node deploy_evm_lazer_contracts.ts --chain ethereum --private-key <key>
  *
  * Deploy with verification:
- *   node deploy_evm_lazer_contracts.ts --chain ethereum --private-key <key> --verify --etherscan-api-key <key>
+ *   npx ts-node deploy_evm_lazer_contracts.ts --chain ethereum --private-key <key> --verify --etherscan-api-key <key>
  *
  * Update trusted signer only (requires existing contract):
- *   node deploy_evm_lazer_contracts.ts --chain ethereum --private-key <key> --deploy false --update-signer 0x123... --expires-at 1735689600
+ *   npx ts-node deploy_evm_lazer_contracts.ts --chain ethereum --private-key <key> --deploy false --update-signer 0x123... --expires-at 1735689600
  *
  * Deploy and update trusted signer in one command:
- *   node deploy_evm_lazer_contracts.ts --chain ethereum --private-key <key> --update-signer 0x123... --expires-at 1735689600
+ *   npx ts-node deploy_evm_lazer_contracts.ts --chain ethereum --private-key <key> --update-signer 0x123... --expires-at 1735689600
  *
  * NOTES:
  * - The --deploy flag defaults to true if no other flags are specified
@@ -175,7 +175,6 @@ async function deployPythLazerContract(
  */
 function updateContractsFile(chain: EvmChain, address: string): void {
   console.log(`Updating contracts file for ${chain.getId()}`);
-  // FIXME: This is not working as expected. The contract is not being saved to the store.
   const lazerContract = new EvmLazerContract(chain, address);
   DefaultStore.lazer_contracts[lazerContract.getId()] = lazerContract;
   DefaultStore.saveAllContracts();
@@ -213,11 +212,6 @@ async function updateTrustedSigner(
   expiresAt: number,
   privateKey: PrivateKey,
 ): Promise<void> {
-  console.log(`Updating trusted signer on ${chain.getId()}...`);
-  console.log(`Contract: ${contractAddress}`);
-  console.log(`Trusted Signer: ${trustedSigner}`);
-  console.log(`Expires At: ${new Date(expiresAt * 1000).toISOString()}`);
-
   const contract = getOrCreateLazerContract(chain, contractAddress);
   await contract.updateTrustedSigner(trustedSigner, expiresAt, privateKey);
 }
@@ -288,7 +282,7 @@ export async function main() {
 
     // Step 2: Update trusted signer if requested
     if (argv["update-signer"] && argv["expires-at"]) {
-      console.log(`Updating trusted signer on ${chain.getId()}...`);
+      console.log(`\nUpdating trusted signer on ${chain.getId()}...`);
       console.log(`Signer Address: ${argv["update-signer"]}`);
       console.log(
         `Expires At: ${new Date(argv["expires-at"] * 1000).toISOString()}`,
@@ -320,13 +314,13 @@ export async function main() {
         toPrivateKey(argv["private-key"]),
       );
 
-      console.log(`✅ Trusted signer updated successfully`);
+      console.log(`\n✅ Trusted signer updated successfully`);
     }
 
     // Summary
     console.log(`\n Operation Summary:`);
     if (argv.deploy && argv["update-signer"]) {
-      console.log(`✅ Contract deployed at: ${deployedAddress}`);
+      console.log(`\n✅ Contract deployed at: ${deployedAddress}`);
       console.log(`Trusted signer updated: ${argv["update-signer"]}`);
       console.log(
         `Expires at: ${new Date(argv["expires-at"]! * 1000).toISOString()}`,

contract_manager/src/core/contracts/evm.ts

@@ -946,10 +946,11 @@ export class EvmLazerContract extends Storable {
     return EvmLazerContract.type;
   }
 
-  toJson(): { type: string; address: string } {
+  toJson() {
     return {
-      type: EvmLazerContract.type,
+      chain: this.chain.getId(),
       address: this.address,
+      type: EvmLazerContract.type,
     };
   }
 

contract_manager/store/chains/EvmChains.json

@@ -1283,7 +1283,7 @@
   {
     "id": "ethereal_devnet",
     "mainnet": false,
-    "rpcUrl": "https://rpc-ethereal-devnet-0.t.conduit.xyz/",
+    "rpcUrl": "http://127.0.0.1:8545",
     "networkId": 13374201,
     "type": "EvmChain"
   },

contract_manager/store/contracts/EvmLazerContracts.json

@@ -9,14 +9,9 @@
     "address": "0xACeA761c27A909d4D3895128EBe6370FDE2dF481",
     "type": "EvmLazerContract"
   },
-  {
-    "chain": "ethereal_devnet",
-    "address": "0xACeA761c27A909d4D3895128EBe6370FDE2dF481",
-    "type": "EvmLazerContract"
-  },
   {
     "chain": "ethereal_testnet_v2",
-    "address": "0xACeA761c27A909d4D3895128EBe6370FDE2dF481",
+    "address": "0x4D4772F06c595F69FB57039599a180536FDE8245",
     "type": "EvmLazerContract"
   },
   {
@@ -58,5 +53,10 @@
     "chain": "polynomial",
     "address": "0xACeA761c27A909d4D3895128EBe6370FDE2dF481",
     "type": "EvmLazerContract"
+  },
+  {
+    "chain": "ethereal_devnet",
+    "address": "0x4D4772F06c595F69FB57039599a180536FDE8245",
+    "type": "EvmLazerContract"
   }
-]
+]

lazer/contracts/evm/script/PythLazerDeploy.s.sol

@@ -176,14 +176,14 @@ contract PythLazerDeployScript is Script {
     }
 
     function run() public {
-        address impl = deployImplementation("lazer:impl");
-        deployProxy("lazer:proxy", impl);
+        address impl = deployImplementation("tazer:impl");
+        deployProxy("tazer:proxy", impl);
     }
 
     function migrate() public {
         // Deploys new version and updates proxy to use new address
-        address proxyAddress = getProxyAddress("lazer:proxy");
-        address newImpl = deployImplementation("lazer:impl");
+        address proxyAddress = getProxyAddress("tazer:proxy");
+        address newImpl = deployImplementation("tazer:impl");
         bytes memory migrateCall = abi.encodeWithSignature("migrate()");
         vm.startBroadcast();
         UUPSUpgradeable proxy = UUPSUpgradeable(proxyAddress);