fix artifact and tenderly related types

packages/smart-contracts/scripts-create2/tenderly.ts

@@ -55,20 +55,26 @@ export const tenderlyImportAll = async (hre: HardhatRuntimeEnvironmentExtended):
       const deployments = artifact.getAllAddressesFromAllNetworks();
       for (const deployment of deployments) {
         const { networkName, address, version } = deployment;
-        if (!supportedTenderlyChains.includes(networkName)) continue;
-        const chainId = EvmChains.getChainId(networkName);
-        const contract: TenderlyContract = {
-          address,
-          chainId,
-        };
-        const contractId = getTenderlyContractId(contract);
-        contracts[contractId] = {
-          name: capitalizeFirstLetter(artifactName.replace(/Artifact/i, '')),
-          ...contract,
-        };
-        versions[version] ??= new Set();
-        versions[version].add(contractId);
-        (EvmChains.isTestnet(networkName) ? testnetContracts : mainnetContracts).add(contractId);
+        try {
+          EvmChains.assertChainSupported(networkName);
+
+          if (!supportedTenderlyChains.includes(networkName)) continue;
+          const chainId = EvmChains.getChainId(networkName);
+          const contract: TenderlyContract = {
+            address,
+            chainId,
+          };
+          const contractId = getTenderlyContractId(contract);
+          contracts[contractId] = {
+            name: capitalizeFirstLetter(artifactName.replace(/Artifact/i, '')),
+            ...contract,
+          };
+          versions[version] ??= new Set();
+          versions[version].add(contractId);
+          (EvmChains.isTestnet(networkName) ? testnetContracts : mainnetContracts).add(contractId);
+        } catch {
+          continue;
+        }
       }
     }
     console.log(`> Retrieved ${Object.keys(contracts).length} contracts from protocol artifacts`);

packages/smart-contracts/src/lib/ContractArtifact.ts

@@ -13,17 +13,15 @@ export type ArtifactNetworkInfo = {
 };
 
 /** Deployment information and ABI per network */
-export type ArtifactDeploymentInfo<
-  TNetwork extends CurrencyTypes.EvmChainName = CurrencyTypes.EvmChainName,
-> = {
+export type ArtifactDeploymentInfo<TNetwork extends CurrencyTypes.VMChainName> = {
   abi: JsonFragment[];
   deployment: Partial<Record<TNetwork, ArtifactNetworkInfo>>;
 };
 
 /** Deployment information and ABI per version and network */
 export type ArtifactInfo<
   TVersion extends string = string,
-  TNetwork extends CurrencyTypes.EvmChainName = CurrencyTypes.EvmChainName,
+  TNetwork extends CurrencyTypes.VMChainName = CurrencyTypes.VMChainName,
 > = Record<TVersion, ArtifactDeploymentInfo<TNetwork>>;
 
 export type DeploymentInformation = {
@@ -80,7 +78,7 @@ export class ContractArtifact<TContract extends Contract> {
    * @param networkName the name of the network where the contract is deployed
    * @returns the address of the deployed contract
    */
-  getAddress(networkName: CurrencyTypes.EvmChainName, version = this.lastVersion): string {
+  getAddress(networkName: CurrencyTypes.VMChainName, version = this.lastVersion): string {
     return this.getDeploymentInformation(networkName, version).address;
   }
 
@@ -106,11 +104,11 @@ export class ContractArtifact<TContract extends Contract> {
   getAllAddressesFromAllNetworks(): {
     version: string;
     address: string;
-    networkName: CurrencyTypes.EvmChainName;
+    networkName: CurrencyTypes.VMChainName;
   }[] {
     const deployments = [];
     for (const version in this.info) {
-      let networkName: CurrencyTypes.EvmChainName;
+      let networkName: CurrencyTypes.VMChainName;
       for (networkName in this.info[version].deployment) {
         const address = this.info[version].deployment[networkName]?.address;
         if (!address) continue;
@@ -144,7 +142,7 @@ export class ContractArtifact<TContract extends Contract> {
    * @returns The address and the number of the creation block
    */
   getDeploymentInformation(
-    networkName: CurrencyTypes.EvmChainName,
+    networkName: CurrencyTypes.VMChainName,
     version = this.lastVersion,
   ): DeploymentInformation {
     const versionInfo = this.info[version];

packages/types/src/currency-types.ts

@@ -36,3 +36,8 @@ export type BtcChainName = 'mainnet' | 'testnet';
 export type NearChainName = 'aurora' | 'aurora-testnet' | 'near' | 'near-testnet';
 
 export type ChainName = EvmChainName | BtcChainName | NearChainName;
+
+/**
+ * Virtual machin chains, where payment proxy contracts can be deployed
+ */
+export type VMChainName = EvmChainName | NearChainName;