add calypso testnet collection

Kredeum · Apr 26, 2024 · c149851 · c149851
1 parent 03be282
commit c149851
Show file tree

Hide file tree

Showing 26 changed files with 1,073 additions and 67 deletions.
diff --git a/common/package.json b/common/package.json
@@ -22,6 +22,7 @@
     "@kredeum/config": "workspace:^",
     "@kredeum/contracts": "workspace:^",
     "@kredeum/providers": "workspace:^",
+    "@kredeum/skale": "workspace:^",
     "ethers": "^5.7.2",
     "multiformats": "^13.1.0",
     "viem": "^2.9.26"
@@ -32,6 +33,7 @@
     "@types/node": "^20.12.7",
     "findup-sync": "^5.0.0",
     "tslib": "^2.6.2",
-    "typescript": "^5.4.5"
+    "typescript": "^5.4.5",
+    "viem": "^2.9.16"
   }
 }
diff --git a/common/src/common/provider-get.ts b/common/src/common/provider-get.ts
@@ -8,6 +8,8 @@ import type { WindowExternalProvider } from "./types";
 import { getChecksumAddress, sleep } from "../common/config";
 import { ethers } from "ethers";
 import { networks } from "./networks";
+import { receiveFunds } from "@kredeum/skale";
+import { Address } from "viem";
 
 let _providerSetting = false;
 
@@ -31,8 +33,14 @@ const providerGetWindow = async (chainId = 0): Promise<Web3Provider | undefined>
 
 const providerGetSigner = async (chainId = 0, accountOrIndex: string | number = 0): Promise<Signer | undefined> => {
   const provider = await providerGetWindow(chainId);
+  if (!provider) return;
 
-  return provider && provider.getSigner(accountOrIndex);
+  const signer = provider.getSigner(accountOrIndex);
+  const signerAddress = (await signer.getAddress()) as Address;
+
+  await receiveFunds(signerAddress, chainId);
+
+  return signer;
 };
 
 const providerGetAccount = async (): Promise<string> => {

diff --git a/common/src/common/types.ts b/common/src/common/types.ts
@@ -13,6 +13,7 @@ type WindowExternalProvider = Window & typeof globalThis & { ethereum: ExternalP
 type AddressesType = {
   OpenNFTs: string;
   OpenNFTsV4: string;
+  OpenNFTsV4Skale: string;
   OpenNFTsResolver: string;
   OpenNFTsFactoryV3: string;
   OpenNFTsFactoryV2?: string;

diff --git a/common/src/resolver/resolver-conv-supports.ts b/common/src/resolver/resolver-conv-supports.ts
@@ -24,7 +24,7 @@ const resolverConvSupports = (checks: Array<boolean>): Map<string, boolean> => {
   /// : 17 IOpenNFTsV1
   /// : 18 IOpenNFTsV2
   /// : 19 IOpenNFTsV3
-  /// : 20 IOpenNFTsV4
+  /// 0xb6ea5501 : 20 IOpenNFTsV4
   /// : 21 IOpenAutoMarket
   /// : 22 IOpenBound
 

diff --git a/config/src/testnets.handlebars.json b/config/src/testnets.handlebars.json
@@ -308,6 +308,24 @@
     "create": true,
     "linkedMainnet": 137
   },
+  {
+    "chainId": 974399131,
+    "chainName": "calypso-testnet",
+    "rpcUrls": [
+      "https://testnet.skalenodes.com/v1/giant-half-dual-testnet"
+    ],
+    "nativeCurrency": {
+      "name": "sFUEL",
+      "symbol": "SFUEL",
+      "decimals": 18
+    },
+    "blockExplorerUrls": [
+      "https://giant-half-dual-testnet.explorer.testnet.skalenodes.com"
+    ],
+    "eip1559": false,
+    "create": false,
+    "linkedMainnet": 1564830818
+  },
   {
     "chainId": 80001,
     "chainName": "mumbai",
@@ -471,24 +489,6 @@
     "create": true,
     "linkedMainnet": 1564830818
   },
-  {
-    "chainId": 974399131,
-    "chainName": "calypso-testnet",
-    "rpcUrls": [
-      "https://testnet.skalenodes.com/v1/giant-half-dual-testnet"
-    ],
-    "nativeCurrency": {
-      "name": "sFUEL",
-      "symbol": "SFUEL",
-      "decimals": 18
-    },
-    "blockExplorerUrls": [
-      "https://giant-half-dual-testnet.explorer.testnet.skalenodes.com"
-    ],
-    "eip1559": false,
-    "create": true,
-    "linkedMainnet": 1564830818
-  },
   {
     "chainId": 3441005,
     "chainName": "manta-pacific-testnet",

diff --git a/contracts/addresses.json b/contracts/addresses.json
@@ -62,6 +62,14 @@
     "OpenNFTsV4": "0x485ed00c43e919E02279Ca137343B2aC63EF0eF2",
     "chainName": "chaos-testnet"
   },
+  "974399131": {
+    "OpenNFTsFactoryV3": "0x4bE9f887dEc53e9670574b058a821455416C2415",
+    "OpenNFTsResolver": "0xfc575CF9e97A2F5De94E313961627316BB911b81",
+    "OpenNFTsResolverold": "0x3D63c30D4d99ca4FE669EEED21876D16C7aA0F21",
+    "OpenNFTsV4Skale": "0xD6df6445cC83533f7199348BE7F6D4857cD500Ab",
+    "OpenNFTsV4Skaleold": "0x9297AEB48733Ab66226D4Cff9C0135d9f895E0A4",
+    "chainName": "calypso-testnet"
+  },
   "137": {
     "OpenAutoMarket": "0x5Cf67C52eD5608B9841238bCc2bDe012263b7111",
     "OpenBound": "0xE82984f872B68B6B369D5700654F229ba6f57c42",
@@ -326,12 +334,6 @@
     "OpenNFTsV4": "0xd1ca741de2d2975822ADf4646Cf0A8AE3Df51c78",
     "chainName": "bsc-testnet"
   },
-  "974399131": {
-    "OpenNFTsFactoryV3": "0x0e4B980c44feF474e650BfdE5020aAA7aCAe6f06",
-    "OpenNFTsResolver": "0x9ffa4fa32d2ac629b8F39Cb226a5dC3508D1e78d",
-    "OpenNFTsV4": "0x37C3aAbb1C9c3c344BbD5801AefDaf40180Be070",
-    "chainName": "calypso-testnet"
-  },
   "999": {
     "OpenAutoMarket": "0x10bdda29d9a84dC0E8C263B29734d4502a74BCF2",
     "OpenNFTsFactoryV3": "0xECC12ab909CfaEb5989E35509218f399c8Dc4b4c",