Merge branch 'main' into justin/ci

chain/thorchain/thornode.go

@@ -356,7 +356,7 @@ func (tn *ChainNode) SetTestConfig(ctx context.Context) error {
 
 	// Enable public REST API
 	api["enable"] = true
-	api["swagger"] = false
+	api["swagger"] = true
 	api["address"] = "tcp://0.0.0.0:1317"
 	api["enabled-unsafe-cors"] = true
 
@@ -720,13 +720,13 @@ EOF
 
 	stdout, _, err := tn.Exec(ctx, command, tn.Chain.Config().Env)
 	if err != nil {
-		return err
+		return fmt.Errorf("create key sdtout:\n%s\n, error: %w", string(stdout), err)
 	}
 
 	if tn.Validator && tn.ValidatorMnemonic == "" {
 		var createKeyOutput map[string]string
 		if err := json.Unmarshal(stdout, &createKeyOutput); err != nil {
-			return err
+			return fmt.Errorf("unmarshal create key sdtout:\n%s\n, error: %w", string(stdout), err)
 		}
 
 		tn.ValidatorMnemonic = createKeyOutput["mnemonic"]
@@ -1072,7 +1072,7 @@ func (tn *ChainNode) AddBondModule(ctx context.Context) error {
 		Coins: []CoinBalance{
 			{
 				Denom:  "rune",
-				Amount: fmt.Sprintf("%d0000000000000", tn.Chain.(*Thorchain).NumValidators),
+				Amount: fmt.Sprintf("%d00000000", tn.Chain.(*Thorchain).NumValidators),
 			},
 		},
 	}
@@ -1096,6 +1096,45 @@ func (tn *ChainNode) AddBondModule(ctx context.Context) error {
 		}
 	}
 
+	// Now update bank's supply with new balance if on v50
+	if tn.IsAboveSDK47(ctx) {
+		bankSupplyPath := "app_state.bank.supply"
+		splitPath = strings.Split(bankSupplyPath, ".")
+		path = make([]interface{}, len(splitPath))
+		for i, component := range splitPath {
+			if v, err := strconv.Atoi(component); err == nil {
+				path[i] = v
+			} else {
+				path[i] = component
+			}
+		}
+		supplyI, err := dyno.GetSlice(g, path...)
+		if err != nil {
+			return fmt.Errorf("failed to get key %s in genesis json", bankSupplyPath)
+		}
+
+		for i, coinI := range supplyI {
+			coin := coinI.(map[string]interface{})
+			if coin["denom"].(string) == "rune" {
+				originalAmount, ok := sdkmath.NewIntFromString(coin["amount"].(string))
+				if !ok {
+					return fmt.Errorf("failed to convert bank's supply of rune to sdk Int from string")
+				}
+				addAmount, ok := sdkmath.NewIntFromString(bondBalance.Coins[0].Amount)
+				if !ok {
+					return fmt.Errorf("failed to convert bond amount of rune to sdk Int from string")
+				}
+				coin["amount"] = originalAmount.Add(addAmount).String()
+				supplyI[i] = coin
+				break
+			}
+		}
+
+		if err := dyno.Set(g, supplyI, path...); err != nil {
+			return fmt.Errorf("failed to set bank's new supply")
+		}
+	}
+
 	genbz, err = json.Marshal(g)
 	if err != nil {
 		return fmt.Errorf("failed to marshal genesis bytes to json: %w", err)

examples/thorchain/chainspec_thorchain.go → examples/thorchain/chainspec_thorchain_test.go

@@ -30,7 +30,7 @@ func ThorchainDefaultChainSpec(testName string, numVals int, numFn int, ethRoute
 	name := common.THORChain.String() // Must use this name for test
 	chainImage := ibc.NewDockerImage("thorchain", "local", "1025:1025")
 	genesisKVMods := []thorchain.GenesisKV{
-		thorchain.NewGenesisKV("app_state.bank.params.default_send_enabled", false), // disable bank module transfers
+		thorchain.NewGenesisKV("app_state.bank.params.default_send_enabled", true), // disable bank module transfers
 		thorchain.NewGenesisKV("app_state.thorchain.reserve", "22000000000000000"),  // mint to reserve for mocknet (220M)
 		thorchain.NewGenesisKV("app_state.thorchain.chain_contracts", []ChainContract{
 			{

ibc/relayer.go

@@ -216,6 +216,8 @@ type CreateChannelOptions struct {
 	Order Order
 
 	Version string
+
+	Override bool // only implemented on Go Relayer
 }
 
 // DefaultChannelOpts returns the default settings for creating an ics20 fungible token transfer channel.

relayer/rly/cosmos_relayer.go

@@ -131,7 +131,7 @@ func (commander) AddKey(chainID, keyName, coinType, signingAlgorithm, homeDir st
 }
 
 func (commander) CreateChannel(pathName string, opts ibc.CreateChannelOptions, homeDir string) []string {
-	return []string{
+	cmd := []string{
 		"rly", "tx", "channel", pathName,
 		"--src-port", opts.SourcePortName,
 		"--dst-port", opts.DestPortName,
@@ -140,6 +140,10 @@ func (commander) CreateChannel(pathName string, opts ibc.CreateChannelOptions, h
 
 		"--home", homeDir,
 	}
+	if opts.Override {
+		cmd = append(cmd, "--override")
+	}
+	return cmd
 }
 
 func createClientOptsHelper(opts ibc.CreateClientOptions) []string {