Merge branch 'feat/govv1' into charly/issue#3673-add-message-and-rpc-…

…handler-to-upgrade-clients-using-v1-governance-proposals

.github/workflows/callbacks.yml

@@ -18,7 +18,7 @@ jobs:
       - uses: actions/checkout@v3
       - uses: golangci/[email protected]
         with:
-          version: v1.53.3
+          version: v1.54.2
           args: --timeout 5m
           working-directory: modules/apps/callbacks
 

modules/apps/callbacks/ibc_middleware_test.go

@@ -774,7 +774,7 @@ func (s *CallbacksTestSuite) TestProcessCallback() {
 			func() {
 				executionGas := callbackData.ExecutionGasLimit
 				expGasConsumed = executionGas
-				callbackExecutor = func(cachedCtx sdk.Context) error {
+				callbackExecutor = func(cachedCtx sdk.Context) error { //nolint:unparam
 					cachedCtx.GasMeter().ConsumeGas(expGasConsumed+1, "callbackExecutor gas consumption")
 					return nil
 				}
@@ -811,7 +811,7 @@ func (s *CallbacksTestSuite) TestProcessCallback() {
 				executionGas := callbackData.ExecutionGasLimit
 				callbackData.CommitGasLimit = executionGas + 1
 				expGasConsumed = executionGas
-				callbackExecutor = func(cachedCtx sdk.Context) error {
+				callbackExecutor = func(cachedCtx sdk.Context) error { //nolint:unparam
 					cachedCtx.GasMeter().ConsumeGas(executionGas+1, "callbackExecutor oog panic")
 					return nil
 				}
@@ -843,7 +843,7 @@ func (s *CallbacksTestSuite) TestProcessCallback() {
 			ctx = s.chainB.GetContext()
 
 			// set a callback executor that will always succeed after consuming expGasConsumed
-			callbackExecutor = func(cachedCtx sdk.Context) error {
+			callbackExecutor = func(cachedCtx sdk.Context) error { //nolint:unparam
 				cachedCtx.GasMeter().ConsumeGas(expGasConsumed, "callbackExecutor gas consumption")
 				return nil
 			}

modules/apps/callbacks/types/expected_keepers.go

@@ -16,6 +16,11 @@ type ContractKeeper interface {
 	// gas limit, and handle any errors, or panics gracefully.
 	// If an error is returned, the transaction will be reverted by the callbacks middleware, and the
 	// packet will not be sent.
+	//
+	// Implementations are provided with the packetSenderAddress and MAY choose to use this to perform
+	// validation on the origin of a given packet. It is recommended to perform the same validation
+	// on all source chain callbacks (SendPacket, AcknowledgementPacket, TimeoutPacket). This
+	// defensively guards against exploits due to incorrectly wired SendPacket ordering in IBC stacks.
 	IBCSendPacketCallback(
 		ctx sdk.Context,
 		sourcePort string,
@@ -31,6 +36,11 @@ type ContractKeeper interface {
 	// the sender is unknown or undefined. The contract is expected to handle the callback within the
 	// user defined gas limit, and handle any errors, or panics gracefully.
 	// If an error is returned, state will be reverted by the callbacks middleware.
+	//
+	// Implementations are provided with the packetSenderAddress and MAY choose to use this to perform
+	// validation on the origin of a given packet. It is recommended to perform the same validation
+	// on all source chain callbacks (SendPacket, AcknowledgementPacket, TimeoutPacket). This
+	// defensively guards against exploits due to incorrectly wired SendPacket ordering in IBC stacks.
 	IBCOnAcknowledgementPacketCallback(
 		ctx sdk.Context,
 		packet channeltypes.Packet,
@@ -44,6 +54,11 @@ type ContractKeeper interface {
 	// empty if the sender is unknown or undefined. The contract is expected to handle the callback
 	// within the user defined gas limit, and handle any error, out of gas, or panics gracefully.
 	// If an error is returned, state will be reverted by the callbacks middleware.
+	//
+	// Implementations are provided with the packetSenderAddress and MAY choose to use this to perform
+	// validation on the origin of a given packet. It is recommended to perform the same validation
+	// on all source chain callbacks (SendPacket, AcknowledgementPacket, TimeoutPacket). This
+	// defensively guards against exploits due to incorrectly wired SendPacket ordering in IBC stacks.
 	IBCOnTimeoutPacketCallback(
 		ctx sdk.Context,
 		packet channeltypes.Packet,