Merge pull request #131 from realiotech/patch

Fix: patch lock error and send restriction
realiotech · Apr 1, 2024 · 688ea0b · 688ea0b
2 parents e332c76 + f7863cb
commit 688ea0b
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/go.mod b/go.mod
@@ -205,7 +205,7 @@ replace (
 	// use cosmos flavored protobufs
 	github.com/gogo/protobuf => github.com/regen-network/protobuf v1.3.3-alpha.regen.1
 
-	github.com/realio-tech/multi-staking-module => github.com/realiotech/multi-staking v1.0.0-rc6
+	github.com/realio-tech/multi-staking-module => github.com/realiotech/multi-staking v1.0.0-rc7
 
 	// github.com/realio-tech/multi-staking-module => github.com/GNaD13/multi-staking v0.0.0-20240103093120-70811831ca3b
 	// Informal Tendermint fork

diff --git a/go.sum b/go.sum
@@ -1032,8 +1032,8 @@ github.com/rcrowley/go-metrics v0.0.0-20201227073835-cf1acfcdf475 h1:N/ElC8H3+5X
 github.com/rcrowley/go-metrics v0.0.0-20201227073835-cf1acfcdf475/go.mod h1:bCqnVzQkZxMG4s8nGwiZ5l3QUCyqpo9Y+/ZMZ9VjZe4=
 github.com/realiotech/ethermint v0.21.0-realio-1 h1:x+RYL/yjTI+QTN0mppmwGR3N8h/DZAVnz8d1wTFtORM=
 github.com/realiotech/ethermint v0.21.0-realio-1/go.mod h1:0c+GK/UxT/wykI8InX9U1Pmnj1M4wPRMgJtibd/RnqI=
-github.com/realiotech/multi-staking v1.0.0-rc6 h1:Zuchr2RTJz+jvUoyJWknkELQFeZxAalIygDRLwLkqjI=
-github.com/realiotech/multi-staking v1.0.0-rc6/go.mod h1:HRpXodvIQKZRxY8uYxF2wGdKcMZGXAlMXaeRUEERveQ=
+github.com/realiotech/multi-staking v1.0.0-rc7 h1:KT01rE/itmqzG3IziriLf0KzorVpufBxpTBII+Xk7wI=
+github.com/realiotech/multi-staking v1.0.0-rc7/go.mod h1:HRpXodvIQKZRxY8uYxF2wGdKcMZGXAlMXaeRUEERveQ=
 github.com/regen-network/cosmos-proto v0.3.1 h1:rV7iM4SSFAagvy8RiyhiACbWEGotmqzywPxOvwMdxcg=
 github.com/regen-network/cosmos-proto v0.3.1/go.mod h1:jO0sVX6a1B36nmE8C9xBFXpNwWejXC7QqCOnH3O0+YM=
 github.com/regen-network/protobuf v1.3.3-alpha.regen.1 h1:OHEc+q5iIAXpqiqFKeLpu5NwTIkVXUs48vFMwzqpqY4=

diff --git a/x/asset/keeper/restrictions.go b/x/asset/keeper/restrictions.go
@@ -11,7 +11,7 @@ func (k Keeper) AssetSendRestriction(ctx sdk.Context, fromAddr, toAddr sdk.AccAd
 	err = nil
 
 	// module whitelisted addresses can send coins without restrictions
-	if allow := k.AllowAddr(fromAddr); allow {
+	if allow := k.AllowAddr(fromAddr) || k.AllowAddr(toAddr); allow {
 		return newToAddr, nil
 	}