Merge branch 'main' into fix-authz-env

strangelove-ventures · Jul 15, 2024 · 4e0af80 · 4e0af80
2 parents 783d2e0 + 5c5b565
commit 4e0af80
Show file tree

Hide file tree

Showing 56 changed files with 128,436 additions and 71,603 deletions.
diff --git a/chain/cosmos/chain_node.go b/chain/cosmos/chain_node.go
@@ -851,9 +851,17 @@ func (tn *ChainNode) SendIBCTransfer(
 	if options.Timeout != nil {
 		if options.Timeout.NanoSeconds > 0 {
 			command = append(command, "--packet-timeout-timestamp", fmt.Sprint(options.Timeout.NanoSeconds))
-		} else if options.Timeout.Height > 0 {
+		}
+
+		if options.Timeout.Height > 0 {
 			command = append(command, "--packet-timeout-height", fmt.Sprintf("0-%d", options.Timeout.Height))
 		}
+
+		if options.AbsoluteTimeouts {
+			// ibc-go doesn't support relative heights for packet timeouts
+			// so the absolute height flag must be manually set:
+			command = append(command, "--absolute-timeouts")
+		}
 	}
 	if options.Memo != "" {
 		command = append(command, "--memo", options.Memo)

diff --git a/chain/cosmos/wasm/wasm.go b/chain/cosmos/wasm/wasm.go
@@ -14,4 +14,4 @@ func WasmEncoding() *testutil.TestEncodingConfig {
 	wasmtypes.RegisterInterfaces(cfg.InterfaceRegistry)
 
 	return &cfg
-}
+}
-Original file line number
+Diff line change
@@ Expand Up / @@ -14,4 +14,4 @@ func WasmEncoding() *testutil.TestEncodingConfig { @@
     	wasmtypes.RegisterInterfaces(cfg.InterfaceRegistry)
     	return &cfg
-    }
+    }