Merge branch 'main' into jeremy/immunifi-34992

sei-protocol · Sep 23, 2024 · aa7a702 · aa7a702
2 parents da3f44c + 5081dc1
commit aa7a702
Show file tree

Hide file tree

Showing 6 changed files with 779 additions and 48 deletions.
diff --git a/baseapp/abci.go b/baseapp/abci.go
@@ -325,6 +325,7 @@ func (app *BaseApp) DeliverTx(ctx sdk.Context, req abci.RequestDeliverTx, tx sdk
 			evmErr := sdkerrors.Wrap(sdkerrors.ErrEVMVMError, result.EvmError)
 			res.Codespace, res.Code, res.Log = sdkerrors.ABCIInfo(evmErr, app.trace)
 			resultStr = "failed"
+			return
 		}
 	}
 	for _, hook := range app.deliverTxHooks {

diff --git a/proto/cosmos/bank/v1beta1/bank.proto b/proto/cosmos/bank/v1beta1/bank.proto
@@ -94,3 +94,10 @@ message Metadata {
   // Since: cosmos-sdk 0.43
   string symbol = 6;
 }
+
+message AllowList {
+  option (gogoproto.equal) = true;
+
+  // Can be empty for no admin, or a valid sei address
+  repeated string addresses = 1 [ (gogoproto.moretags) = "yaml:\"addresses\"" ];
+}