fix: update defaults and fix entity proposal handler for gracefull fail

ixofoundation · Mar 14, 2023 · 3f79522 · 3f79522
1 parent 037f561
commit 3f79522
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 4 deletions.
diff --git a/scripts/constants.sh b/scripts/constants.sh
@@ -2,7 +2,7 @@
 
 PASSWORD="12345678"
 GAS_PRICES="0.025uixo"
-CHAIN_ID="pandora-4"
+CHAIN_ID="pandora-8"
 NODE="https://devnet.ixo.earth:443/rpc/"
 
 USERS=(alice bob charlie miguel francesco shaun fee fee2 fee3 fee4 fee5 reserveOut)

diff --git a/x/claims/types/params.go b/x/claims/types/params.go
@@ -34,7 +34,7 @@ func NewParams(collectionSequence uint64, ixoAccount string,
 
 // DefaultParams returns a default set of parameters
 func DefaultParams() Params {
-	defaultIxoAccount := "ixo1y0d7w5xfj9a0p7ygpx0uwvyrnmmqj3fd4sva7t"
+	defaultIxoAccount := "ixo1kqmtxkggcqa9u34lnr6shy0euvclgatw4f9zz5"
 	tenPercentFee := sdk.NewDec(10)
 
 	return NewParams(1, defaultIxoAccount, tenPercentFee, tenPercentFee)

diff --git a/x/entity/proposal_handler.go b/x/entity/proposal_handler.go
@@ -51,7 +51,9 @@ func handleTokenParameterChangeProposal(ctx sdk.Context, k keeper.Keeper, p *typ
 
 	contractAddr, _, err := k.WasmKeeper.Instantiate(ctx, p.NftContractCodeId, senderAddr, adminAddr, encodedInitiateNftContractMsg, "initiate_entity_nft_contract", sdk.NewCoins(sdk.NewCoin("uixo", sdk.ZeroInt())))
 	if err != nil {
-		return err
+		// return nil as still want proposal to pass even though contractCode doest'n exist yet (for entity module bootstrap purposes)
+		// if error it means proposal is just like empty proposal, look into returning error in future
+		return nil
 	}
 
 	xx.NftContractAddress = contractAddr.String()

diff --git a/x/entity/types/entity.go b/x/entity/types/entity.go
@@ -83,7 +83,7 @@ func NewParams(nftContractAddress string, nftContractMinter string, createSequen
 func DefaultParams() Params {
 	return Params{
 		NftContractAddress: "ixo14hj2tavq8fpesdwxxcu44rty3hh90vhujrvcmstl4zr3txmfvw9sqa3vn7",
-		NftContractMinter:  "ixo14hj2tavq8fpesdwxxcu44rty3hh90vhujrvcmstl4zr3txmfvw9sqa3vn7",
+		NftContractMinter:  "ixo1g7xtrvc8ejkenee8a3gryvx6d4n9uu6gpsx63z",
 		CreateSequence:     0,
 	}
 }