Merge branch 'main' into fix/rmrk-details

axelarnetwork · Feb 7, 2024 · 710f55d · 710f55d
2 parents d28dbc4 + 3636e04
commit 710f55d
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 3 deletions.
diff --git a/cli/wizard/commands/list-squid-token/index.ts b/cli/wizard/commands/list-squid-token/index.ts
@@ -16,6 +16,17 @@ const BASE_REPO_URL =
 export async function listSquidToken() {
   console.log(chalk.blue("\nGenerating token listing config...\n"));
 
+  const didFork = await confirm({
+    message:
+      "Are you running this wizard from a forked repository in your own Github organization?",
+    default: false,
+  });
+
+  if (!didFork) {
+    console.log(chalk.red("\nPlease fork this repository before continuing\n"));
+    process.exit(1);
+  }
+
   const didRegisterViaPortal = await confirm({
     message: "Did you register your token via ITS portal?",
     default: false,
@@ -164,7 +175,7 @@ export type InterchainTokenDetailsApiResponse = {
   axelarChainId: string;
   tokenId: string;
   deploymentMessageId: string;
-  deployer: string;
+  deployerAddress: string;
   remoteTokens: RemoteInterchainTokenApiResponse[];
 };
 
@@ -173,7 +184,7 @@ function parseAsInterchainTokenConfig(
 ): InterchainTokenConfig {
   return {
     tokenId: hash.parse(data.tokenId),
-    deployer: data.deployer,
+    deployer: data.deployerAddress,
     originalMinter: data.originalMinterAddress,
     prettySymbol: data.tokenSymbol,
     decimals: data.tokenDecimals,

diff --git a/registry/schemas/interchain-tokenlist.schema.json b/registry/schemas/interchain-tokenlist.schema.json
@@ -51,7 +51,12 @@
         "tokenId": { "type": "string", "pattern": "^0x[a-fA-F0-9]{64}$" },
         "deployer": { "$ref": "#/definitions/chains/properties/tokenAddress" },
         "originalMinter": {
-          "$ref": "#/definitions/chains/properties/tokenAddress"
+          "anyOf": [
+            {
+              "$ref": "#/definitions/chains/properties/tokenAddress"
+            },
+            { "type": "null" }
+          ]
         },
         "prettySymbol": { "type": "string" },
         "decimals": { "type": "integer" },