feat: teritori-test-7 (#1218)

Signed-off-by: Norman Meier <norman@samourai.coop>

Author: n0izn0iz

CONTRIBUTING.md

@@ -212,7 +212,7 @@ Here are the steps to follow:
 
 The Teritori dApp is a multi-networks app. Meaning it can be used with multiple blockchains and web3 stacks. We use the term `Network` because the underlying distributed ledger technology could be something else than a blockchain.
 
-It's important to understand the implications of that and not hardcode `tori` everywhere. Even when we only talk avout Teritori, there is currently two official Teritori chains, the Teritori mainnet, with chain id `teritori-1` and the Teritori testnet with chain id `teritori-test-6` and it's important to support both in all code.
+It's important to understand the implications of that and not hardcode `tori` everywhere. Even when we only talk avout Teritori, there is currently two official Teritori chains, the Teritori mainnet, with chain id `teritori-1` and the Teritori testnet with chain id `teritori-test-7` and it's important to support both in all code.
 
 We define network-related constants in the [networks package](packages/networks) and generate code from it for go programs. You should get all network information from this packages and add any new network-related information there.
 

cosmwasm-contracts/cw721-membership/Makefile

@@ -1,7 +1,7 @@
 ADMIN=testnet-adm
 ADMIN_ADDR=$(shell teritorid keys show $(ADMIN) --keyring-backend test --output json | jq -r .address)
 NODE_FLAG=--node https://rpc.testnet.teritori.com:443
-TX_FLAGS=--from $(ADMIN) --chain-id teritori-test-6 $(NODE_FLAG) --gas auto --gas-adjustment 1.3 -y -b sync --output json --keyring-backend test -o json
+TX_FLAGS=--from $(ADMIN) --chain-id teritori-test-7 $(NODE_FLAG) --gas auto --gas-adjustment 1.3 -y -b sync --output json --keyring-backend test -o json
 QUERY_FLAGS=$(NODE_FLAG) -o json
 CODE_ID=66
 CONFIG=$(shell cat config.json | jq --rawfile desc desc.txt -r '.admin_addr="$(ADMIN_ADDR)" | .description=$$desc | tojson | @sh')

cosmwasm-contracts/nft-marketplace/Makefile

@@ -1,7 +1,7 @@
 ADMIN=testnet-adm
 ADMIN_ADDR=$(shell teritorid keys show $(ADMIN) --keyring-backend test --output json | jq -r .address)
 NODE_FLAG=--node https://rpc.testnet.teritori.com:443
-TX_FLAGS=--from $(ADMIN) --chain-id teritori-test-6 $(NODE_FLAG) --gas auto --gas-adjustment 1.3 -y -b sync --output json --keyring-backend test -o json
+TX_FLAGS=--from $(ADMIN) --chain-id teritori-test-7 $(NODE_FLAG) --gas auto --gas-adjustment 1.3 -y -b sync --output json --keyring-backend test -o json
 QUERY_FLAGS=$(NODE_FLAG) -o json
 CODE_ID=52
 CONFIG=$(shell cat config.json | jq --rawfile desc desc.txt -r '.admin_addr="$(ADMIN_ADDR)" | .description=$$desc | tojson | @sh')

networks.json

@@ -11043,7 +11043,7 @@
   {
     "id": "teritori-testnet",
     "kind": "Cosmos",
-    "chainId": "teritori-test-6",
+    "chainId": "teritori-test-7",
     "displayName": "Teritori Testnet",
     "registryName": "teritoritestnet",
     "icon": "teritori.svg",
@@ -11062,7 +11062,7 @@
     "featureObjects": [
       {
         "type": "CosmWasmPremiumFeed",
-        "membershipContractAddress": "tori1rs244rjrhap2v4setxlugkh8ungxlrsh8asvh0trsgvqvplvkd5q7752l6",
+        "membershipContractAddress": "",
         "mintDenom": "utori"
       }
     ],
@@ -11109,33 +11109,33 @@
       "no-legacy-stdTx",
       "ibc-go"
     ],
-    "nameServiceContractAddress": "tori14hj2tavq8fpesdwxxcu44rty3hh90vhujrvcmstl4zr3txmfvw9s3hewys",
+    "nameServiceContractAddress": "",
     "nameServiceDefaultImage": "ipfs://bafkreieqcwmjcb64r42ygs6a4dswz63djzgayjn3rhzjber3e42cknawlm",
     "nameServiceTLD": ".tori",
-    "vaultContractAddress": "tori17p9rzwnnfxcjp32un9ug7yhhzgtkhvl9jfksztgw5uh69wac2pgs9ezf0j",
-    "riotContractAddressGen0": "tori1hzz0s0ucrhdp6tue2lxk3c03nj6f60qy463we7lgx0wudd72ctmstg4wkc",
+    "vaultContractAddress": "",
+    "riotContractAddressGen0": "",
     "riotContractAddressGen1": "",
     "riotSquadStakingContractAddressV1": "",
     "riotSquadStakingContractAddressV2": "",
     "distributorContractAddress": "",
     "riotersFooterContractAddress": "",
     "secondaryDuringMintList": [
-      "tori1rs244rjrhap2v4setxlugkh8ungxlrsh8asvh0trsgvqvplvkd5q7752l6",
-      "tori14hj2tavq8fpesdwxxcu44rty3hh90vhujrvcmstl4zr3txmfvw9s3hewys",
-      "tori1hzz0s0ucrhdp6tue2lxk3c03nj6f60qy463we7lgx0wudd72ctmstg4wkc",
+      "",
+      "",
+      "",
       ""
     ],
     "excludeFromLaunchpadList": [
       ""
     ],
-    "socialFeedContractAddress": "tori1nc5tatafv6eyq7llkr2gv50ff9e22mnf70qgjlv737ktmt4eswrqazuvxk",
-    "daoCoreCodeId": 4,
-    "daoPreProposeSingleCodeId": 5,
-    "daoProposalSingleCodeId": 6,
-    "daoCw4GroupCodeId": 7,
-    "daoVotingCw4CodeId": 8,
-    "daoFactoryCodeId": 9,
-    "daoFactoryContractAddress": "tori1s85asu5dckeelmgzrwqakxc8tc4gllutjq4uq3a4lwak2hfp9c3q4spguf"
+    "socialFeedContractAddress": "",
+    "daoCoreCodeId": -1,
+    "daoPreProposeSingleCodeId": -1,
+    "daoProposalSingleCodeId": -1,
+    "daoCw4GroupCodeId": -1,
+    "daoVotingCw4CodeId": -1,
+    "daoFactoryCodeId": -1,
+    "daoFactoryContractAddress": ""
   },
   {
     "id": "cosmos-registry:terpnettestnet",

packages/networks/teritori-testnet/index.ts

@@ -2,24 +2,21 @@ import { teritoriTestnetCurrencies } from "./currencies";
 import { CosmWasmPremiumFeed, NetworkFeature } from "../features";
 import { CosmosNetworkInfo, NetworkKind } from "../types";
 
-const nameServiceContractAddress =
-  "tori14hj2tavq8fpesdwxxcu44rty3hh90vhujrvcmstl4zr3txmfvw9s3hewys";
+const nameServiceContractAddress = "";
 
 const premiumFeedFeature: CosmWasmPremiumFeed = {
   type: NetworkFeature.CosmWasmPremiumFeed,
-  membershipContractAddress:
-    "tori1rs244rjrhap2v4setxlugkh8ungxlrsh8asvh0trsgvqvplvkd5q7752l6",
+  membershipContractAddress: "",
   mintDenom: "utori",
 };
 
-const riotContractAddressGen0 =
-  "tori1hzz0s0ucrhdp6tue2lxk3c03nj6f60qy463we7lgx0wudd72ctmstg4wkc";
+const riotContractAddressGen0 = "";
 const riotContractAddressGen1 = "";
 
 export const teritoriTestnetNetwork: CosmosNetworkInfo = {
   id: "teritori-testnet",
   kind: NetworkKind.Cosmos,
-  chainId: "teritori-test-6",
+  chainId: "teritori-test-7",
   displayName: "Teritori Testnet",
   registryName: "teritoritestnet",
   icon: "teritori.svg",
@@ -65,8 +62,7 @@ export const teritoriTestnetNetwork: CosmosNetworkInfo = {
   nameServiceDefaultImage:
     "ipfs://bafkreieqcwmjcb64r42ygs6a4dswz63djzgayjn3rhzjber3e42cknawlm",
   nameServiceTLD: ".tori",
-  vaultContractAddress:
-    "tori17p9rzwnnfxcjp32un9ug7yhhzgtkhvl9jfksztgw5uh69wac2pgs9ezf0j",
+  vaultContractAddress: "",
   riotContractAddressGen0,
   riotContractAddressGen1,
   riotSquadStakingContractAddressV1: "",
@@ -80,14 +76,12 @@ export const teritoriTestnetNetwork: CosmosNetworkInfo = {
     riotContractAddressGen1,
   ],
   excludeFromLaunchpadList: [riotContractAddressGen1],
-  socialFeedContractAddress:
-    "tori1nc5tatafv6eyq7llkr2gv50ff9e22mnf70qgjlv737ktmt4eswrqazuvxk",
-  daoCoreCodeId: 4,
-  daoPreProposeSingleCodeId: 5,
-  daoProposalSingleCodeId: 6,
-  daoCw4GroupCodeId: 7,
-  daoVotingCw4CodeId: 8,
-  daoFactoryCodeId: 9,
-  daoFactoryContractAddress:
-    "tori1s85asu5dckeelmgzrwqakxc8tc4gllutjq4uq3a4lwak2hfp9c3q4spguf",
+  socialFeedContractAddress: "",
+  daoCoreCodeId: -1,
+  daoPreProposeSingleCodeId: -1,
+  daoProposalSingleCodeId: -1,
+  daoCw4GroupCodeId: -1,
+  daoVotingCw4CodeId: -1,
+  daoFactoryCodeId: -1,
+  daoFactoryContractAddress: "",
 };