Merge pull request #2313 from Sifchain/scripts/tokenregistry-03-01

[Token Registry] Secret + Comdex
Sifchain · Jan 6, 2022 · 5d8a898 · 5d8a898
2 parents cd32b67 + 8239e78
commit 5d8a898
Show file tree

Hide file tree

Showing 19 changed files with 151 additions and 98 deletions.
diff --git a/scripts/ibc/tokenregistration/envs/betanet.sh b/scripts/ibc/tokenregistration/envs/betanet.sh
@@ -40,4 +40,10 @@ SIFCHAIN_ID=sifchain-1 \
   CRYPTO_ORG_COUNTERPARTY_CHANNEL_ID=channel-33 \
   BAND_CHAIN_ID= \
   BAND_CHANNEL_ID= \
-  BAND_COUNTERPARTY_CHANNEL_ID=
+  BAND_COUNTERPARTY_CHANNEL_ID= \
+  SECRET_CHAIN_ID=secret-4 \
+  SECRET_CHANNEL_ID=channel-33 \
+  SECRET_COUNTERPARTY_CHANNEL_ID=channel-4 \
+  COMDEX_CHAIN_ID=comdex-1 \
+  COMDEX_CHANNEL_ID=channel-30 \
+  COMDEX_COUNTERPARTY_CHANNEL_ID=channel-8
diff --git a/scripts/ibc/tokenregistration/generate-ibc-jsons.sh b/scripts/ibc/tokenregistration/generate-ibc-jsons.sh
@@ -314,3 +314,39 @@ sifnoded q tokenregistry generate -o json \
 echo "\n\ngenerated entry for $TERRA_CHAIN_ID"
 
 cat $SIFCHAIN_ID/terra-uusd.json | jq
+
+sifnoded q tokenregistry generate -o json \
+	--token_base_denom=scrt \
+	--token_ibc_counterparty_chain_id=$SECRET_CHAIN_ID \
+  --token_ibc_channel_id=$SECRET_CHANNEL_ID \
+  --token_ibc_counterparty_channel_id=$SECRET_COUNTERPARTY_CHANNEL_ID \
+	--token_ibc_counterparty_denom="" \
+	--token_unit_denom="" \
+	--token_decimals=18 \
+	--token_display_name="Secret" \
+	--token_external_symbol="" \
+	--token_permission_clp=true \
+	--token_permission_ibc_export=true \
+	--token_permission_ibc_import=true | jq > $SIFCHAIN_ID/scrt.json
+
+echo "\n\ngenerated entry for $SECRET_CHAIN_ID"
+
+cat $SIFCHAIN_ID/scrt.json | jq
+
+sifnoded q tokenregistry generate -o json \
+	--token_base_denom=cdmx \
+	--token_ibc_counterparty_chain_id=$COMDEX_CHAIN_ID \
+  --token_ibc_channel_id=$COMDEX_CHANNEL_ID \
+  --token_ibc_counterparty_channel_id=$COMDEX_COUNTERPARTY_CHANNEL_ID \
+	--token_ibc_counterparty_denom="" \
+	--token_unit_denom="" \
+	--token_decimals=18 \
+	--token_display_name="Comdex" \
+	--token_external_symbol="" \
+	--token_permission_clp=true \
+	--token_permission_ibc_export=true \
+	--token_permission_ibc_import=true | jq > $SIFCHAIN_ID/cdmx.json
+
+echo "\n\ngenerated entry for $SECRET_CHAIN_ID"
+
+cat $SIFCHAIN_ID/scrt.json | jq
diff --git a/scripts/ibc/tokenregistration/sifchain-1/cdmx.json b/scripts/ibc/tokenregistration/sifchain-1/cdmx.json
@@ -0,0 +1,26 @@
+{
+  "entries": [
+    {
+      "decimals": "18",
+      "denom": "ibc/6A5D6AB31758B27B3703FF0069C6F6EE4AA447BCDBB05C60DB5D59AB0D8A271E",
+      "base_denom": "cdmx",
+      "path": "transfer/channel-30",
+      "ibc_channel_id": "channel-30",
+      "ibc_counterparty_channel_id": "channel-8",
+      "display_name": "Comdex",
+      "display_symbol": "",
+      "network": "",
+      "address": "",
+      "external_symbol": "",
+      "transfer_limit": "",
+      "permissions": [
+        "CLP",
+        "IBCEXPORT",
+        "IBCIMPORT"
+      ],
+      "unit_denom": "",
+      "ibc_counterparty_denom": "",
+      "ibc_counterparty_chain_id": "comdex-1"
+    }
+  ]
+}
diff --git a/scripts/ibc/tokenregistration/sifchain-1/ixo.json b/scripts/ibc/tokenregistration/sifchain-1/ixo.json
@@ -1,7 +1,6 @@
 {
   "entries": [
     {
-      "is_whitelisted": true,
       "decimals": "6",
       "denom": "ibc/C5C8682EB9AA1313EF1B12C991ADCDA465B80C05733BFB2972E2005E01BCE459",
       "base_denom": "uixo",

diff --git a/scripts/ibc/tokenregistration/sifchain-1/scrt.json b/scripts/ibc/tokenregistration/sifchain-1/scrt.json
@@ -0,0 +1,26 @@
+ {
+  "entries": [
+    {
+      "decimals": "18",
+      "denom": "ibc/3313DFB885C0C0EBE85E307A529985AFF7CA82239D404329BDF294E357FBC73A",
+      "base_denom": "scrt",
+      "path": "transfer/channel-33",
+      "ibc_channel_id": "channel-33",
+      "ibc_counterparty_channel_id": "channel-4",
+      "display_name": "Secret",
+      "display_symbol": "",
+      "network": "",
+      "address": "",
+      "external_symbol": "",
+      "transfer_limit": "",
+      "permissions": [
+        "CLP",
+        "IBCEXPORT",
+        "IBCIMPORT"
+      ],
+      "unit_denom": "",
+      "ibc_counterparty_denom": "",
+      "ibc_counterparty_chain_id": "secret-4"
+    }
+  ]
+}
diff --git a/scripts/ibc/tokenregistration/sifchain-1/terra.json b/scripts/ibc/tokenregistration/sifchain-1/terra.json
@@ -1,26 +0,0 @@
-{
-  "entries": [
-    {
-      "decimals": "6",
-      "denom": "uluna",
-      "base_denom": "uluna",
-      "path": "",
-      "ibc_channel_id": "",
-      "ibc_counterparty_channel_id": "",
-      "display_name": "",
-      "display_symbol": "",
-      "network": "",
-      "address": "",
-      "external_symbol": "",
-      "transfer_limit": "",
-      "permissions": [
-        "CLP",
-        "IBCEXPORT",
-        "IBCIMPORT"
-      ],
-      "unit_denom": "",
-      "ibc_counterparty_denom": "",
-      "ibc_counterparty_chain_id": ""
-    }
-  ]
-}

diff --git a/scripts/ibc/tokenregistration/sifchain-devnet-1/band.json b/scripts/ibc/tokenregistration/sifchain-devnet-1/band.json
@@ -1,26 +0,0 @@
-{
-  "entries": [
-    {
-      "decimals": "6",
-      "denom": "uband",
-      "base_denom": "uband",
-      "path": "",
-      "ibc_channel_id": "",
-      "ibc_counterparty_channel_id": "",
-      "display_name": "",
-      "display_symbol": "",
-      "network": "",
-      "address": "",
-      "external_symbol": "",
-      "transfer_limit": "",
-      "permissions": [
-        "CLP",
-        "IBCEXPORT",
-        "IBCIMPORT"
-      ],
-      "unit_denom": "",
-      "ibc_counterparty_denom": "",
-      "ibc_counterparty_chain_id": ""
-    }
-  ]
-}

diff --git a/scripts/ibc/tokenregistration/sifchain-devnet-1/ixo.json b/scripts/ibc/tokenregistration/sifchain-devnet-1/ixo.json
@@ -1,26 +0,0 @@
-{
-  "entries": [
-    {
-      "decimals": "6",
-      "denom": "uixo",
-      "base_denom": "uixo",
-      "path": "",
-      "ibc_channel_id": "",
-      "ibc_counterparty_channel_id": "",
-      "display_name": "",
-      "display_symbol": "",
-      "network": "",
-      "address": "",
-      "external_symbol": "",
-      "transfer_limit": "",
-      "permissions": [
-        "CLP",
-        "IBCEXPORT",
-        "IBCIMPORT"
-      ],
-      "unit_denom": "",
-      "ibc_counterparty_denom": "",
-      "ibc_counterparty_chain_id": ""
-    }
-  ]
-}

diff --git a/scripts/ibc/tokenregistration/sifchain-devnet-1/juno.json b/scripts/ibc/tokenregistration/sifchain-devnet-1/juno.json
@@ -4,7 +4,7 @@
       "decimals": "6",
       "denom": "ibc/04F5F501207C3626A2C14BFEF654D51C2E0B8F7CA578AB8ED272A66FE4E48097",
       "base_denom": "ujuno",
-      "path": "",
+      "path": "transfer/channel-0",
       "ibc_channel_id": "channel-0",
       "ibc_counterparty_channel_id": "channel-16",
       "display_name": "",

diff --git a/scripts/ibc/tokenregistration/sifchain-devnet-1/terra-uusd.json b/scripts/ibc/tokenregistration/sifchain-devnet-1/terra-uusd.json
@@ -0,0 +1,26 @@
+{
+  "entries": [
+    {
+      "decimals": "6",
+      "denom": "ibc/217BC2C4AD4953D957243A8D0ED015E6689E9C88ADE3D04C9F7BE48916A00457",
+      "base_denom": "uusd",
+      "path": "transfer/channel-123",
+      "ibc_channel_id": "channel-123",
+      "ibc_counterparty_channel_id": "channel-3",
+      "display_name": "",
+      "display_symbol": "",
+      "network": "",
+      "address": "",
+      "external_symbol": "",
+      "transfer_limit": "",
+      "permissions": [
+        "CLP",
+        "IBCEXPORT",
+        "IBCIMPORT"
+      ],
+      "unit_denom": "",
+      "ibc_counterparty_denom": "",
+      "ibc_counterparty_chain_id": "bombay-10"
+    }
+  ]
+}
diff --git a/scripts/ibc/tokenregistration/sifchain-devnet-1/terra.json b/scripts/ibc/tokenregistration/sifchain-devnet-1/terra.json
@@ -4,9 +4,15 @@
       "decimals": "6",
       "denom": "ibc/8A6E703951D3907FD8F83DE69AC0E6C247C0E58F78C7B33C335E008C56115042",
       "base_denom": "uluna",
-      "ibc_transfer_port": "transfer",
+      "path": "transfer/channel-123",
       "ibc_channel_id": "channel-123",
       "ibc_counterparty_channel_id": "channel-3",
+      "display_name": "",
+      "display_symbol": "",
+      "network": "",
+      "address": "",
+      "external_symbol": "",
+      "transfer_limit": "",
       "permissions": [
         "CLP",
         "IBCEXPORT",

diff --git a/scripts/ibc/tokenregistration/sifchain-testnet-1/band.json b/scripts/ibc/tokenregistration/sifchain-testnet-1/band.json
@@ -4,7 +4,7 @@
       "decimals": "6",
       "denom": "ibc/0E27F87D6329E120923EF03591FA62F090005853B17D1E327D88FD03B17A5CFB",
       "base_denom": "uband",
-      "path": "",
+      "path": "transfer/channel-41",
       "ibc_channel_id": "channel-41",
       "ibc_counterparty_channel_id": "channel-28",
       "display_name": "",

diff --git a/scripts/ibc/tokenregistration/sifchain-testnet-1/bitsong.json b/scripts/ibc/tokenregistration/sifchain-testnet-1/bitsong.json
@@ -4,7 +4,7 @@
       "decimals": "6",
       "denom": "ibc/066F76D25D87E549F7EC9BD7BCB524933FD2576EE9D039113F60A80BA290AD99",
       "base_denom": "ubtsg",
-      "path": "",
+      "path": "transfer/channel-42",
       "ibc_channel_id": "channel-42",
       "ibc_counterparty_channel_id": "channel-4",
       "display_name": "",

diff --git a/scripts/ibc/tokenregistration/sifchain-testnet-1/emoney-eeur.json b/scripts/ibc/tokenregistration/sifchain-testnet-1/emoney-eeur.json
@@ -4,7 +4,7 @@
       "decimals": "6",
       "denom": "ibc/0193489264F41BB6C5099A28CD6A806AADB79A83A00142B7D1BC9BF5AE643E87",
       "base_denom": "eeur",
-      "path": "",
+      "path": "transfer/channel-44",
       "ibc_channel_id": "channel-44",
       "ibc_counterparty_channel_id": "channel-12",
       "display_name": "",

diff --git a/scripts/ibc/tokenregistration/sifchain-testnet-1/emoney.json b/scripts/ibc/tokenregistration/sifchain-testnet-1/emoney.json
@@ -4,7 +4,7 @@
       "decimals": "6",
       "denom": "ibc/818F2D0885F7BBD871E946AFC75ABB7C7C6ABE27009D9913331ACE48DAC326D3",
       "base_denom": "ungm",
-      "path": "",
+      "path": "transfer/channel-44",
       "ibc_channel_id": "channel-44",
       "ibc_counterparty_channel_id": "channel-12",
       "display_name": "",

diff --git a/scripts/ibc/tokenregistration/sifchain-testnet-1/likecoin.json b/scripts/ibc/tokenregistration/sifchain-testnet-1/likecoin.json
@@ -4,7 +4,7 @@
       "decimals": "9",
       "denom": "ibc/123466F93BD086614AB9BBC674B6B58453D2B293CE12C7D802FA0582BC69E024",
       "base_denom": "nanolike",
-      "path": "",
+      "path": "transfer/channel-43",
       "ibc_channel_id": "channel-43",
       "ibc_counterparty_channel_id": "channel-4",
       "display_name": "",

diff --git a/scripts/ibc/tokenregistration/sifchain-testnet-1/terra-uusd.json b/scripts/ibc/tokenregistration/sifchain-testnet-1/terra-uusd.json
@@ -4,7 +4,7 @@
       "decimals": "6",
       "denom": "ibc/A2E0EFABD035F5460225E92C0F604F7C01AE3A9DF0CFF18FB08519CCD23AAE9D",
       "base_denom": "uusd",
-      "path": "",
+      "path": "transfer/channel-45",
       "ibc_channel_id": "channel-45",
       "ibc_counterparty_channel_id": "channel-27",
       "display_name": "",

diff --git a/scripts/ibc/tokenregistration/sifchain-testnet-1/terra.json b/scripts/ibc/tokenregistration/sifchain-testnet-1/terra.json
@@ -4,7 +4,7 @@
       "decimals": "6",
       "denom": "ibc/452372B8214E22C625E98958C5EDFB939C48E6590E40B711E9D30206EF8EDC9B",
       "base_denom": "uluna",
-      "path": "",
+      "path": "transfer/channel-45",
       "ibc_channel_id": "channel-45",
       "ibc_counterparty_channel_id": "channel-27",
       "display_name": "",

diff --git a/x/tokenregistry/client/cli/query.go b/x/tokenregistry/client/cli/query.go
@@ -2,6 +2,7 @@ package cli
 
 import (
 	"context"
+	"errors"
 	"fmt"
 	"strings"
 
@@ -164,26 +165,31 @@ func GetCmdGenerateEntry() *cobra.Command {
 			var denom string
 			var path string
 			// base_denom is required.
-			// override the IBC generation with --denom if specified explicitly.
+			// override the IBC generation with --token_denom if specified explicitly.
 			// otherwise fallback to base_denom
 			if ibcChannelID != "" {
 				path = "transfer/" + ibcChannelID
+				// generate IBC hash from baseDenom and ibc channel id
+				denomTrace := transfertypes.DenomTrace{
+					Path:      path,
+					BaseDenom: baseDenom,
+				}
+				denom = denomTrace.IBCDenom()
+			} else if initialDenom == "" {
+				// either initialDenom or channel id must be specified,
+				// to prevent accidentally leaving off IBC details and
+				return errors.New("--token_denom must be specified if no IBC channel is provided")
 			}
-			// generate IBC hash from baseDenom and ibc channel id
-			denomTrace := transfertypes.DenomTrace{
-				Path:      path,
-				BaseDenom: baseDenom,
-			}
-			denom = denomTrace.IBCDenom()
+			// --token_denom always takes precendence over IBC generation if specified
 			if initialDenom != "" {
 				denom = initialDenom
-			} else if denom == "" {
-				denom = baseDenom
 			}
+
 			entry := types.RegistryEntry{
 				Decimals:                 decimals,
 				Denom:                    denom,
 				BaseDenom:                baseDenom,
+				Path:                     path,
 				IbcChannelId:             ibcChannelID,
 				IbcCounterpartyChannelId: ibcCounterpartyChannelID,
 				IbcCounterpartyChainId:   ibcCounterpartyChainID,