Merge branch 'refs/heads/master' into chains/mainnet-beta

rarimo · Sep 3, 2024 · 00c7ca8 · 00c7ca8
2 parents b6a9415 + 9f50670
commit 00c7ca8
Show file tree

Hide file tree

Showing 9 changed files with 216 additions and 90 deletions.
diff --git a/docs/static/openapi.yml b/docs/static/openapi.yml
@@ -54961,7 +54961,7 @@ paths:
                 description: params holds all the parameters of this module.
                 type: object
                 properties:
-                  contract_address:
+                  source_contract_address:
                     type: string
                   root:
                     type: string
@@ -54974,6 +54974,11 @@ paths:
                   root_timestamp:
                     type: string
                     format: int64
+                  block_height:
+                    type: string
+                    format: uint64
+                  destination_contract_address:
+                    type: string
             description: >-
               QueryParamsResponse is response type for the Query/Params RPC
               method.
@@ -92159,7 +92164,7 @@ definitions:
   rarimo.rarimocore.rootupdater.Params:
     type: object
     properties:
-      contract_address:
+      source_contract_address:
         type: string
       root:
         type: string
@@ -92172,6 +92177,11 @@ definitions:
       root_timestamp:
         type: string
         format: int64
+      block_height:
+        type: string
+        format: uint64
+      destination_contract_address:
+        type: string
     description: Params defines the parameters for the module.
   rarimo.rarimocore.rootupdater.QueryParamsResponse:
     type: object
@@ -92180,7 +92190,7 @@ definitions:
         description: params holds all the parameters of this module.
         type: object
         properties:
-          contract_address:
+          source_contract_address:
             type: string
           root:
             type: string
@@ -92193,6 +92203,11 @@ definitions:
           root_timestamp:
             type: string
             format: int64
+          block_height:
+            type: string
+            format: uint64
+          destination_contract_address:
+            type: string
     description: QueryParamsResponse is response type for the Query/Params RPC method.
   rarimo.rarimocore.tokenmanager.Collection:
     type: object

diff --git a/proto/rarimocore/op_passport_root_update.proto b/proto/rarimocore/op_passport_root_update.proto
@@ -5,9 +5,10 @@ option go_package = "github.com/rarimo/rarimo-core/x/rarimocore/types";
 
 message PassportRootUpdate {
   string root = 1;
-  string contract_address = 2;
-  int64 timestamp = 3;
-  uint64 block_height = 4;
+  string source_contract_address = 2;
+  string destination_contract_address = 3;
+  int64 timestamp = 4;
+  uint64 block_height = 5;
 }
 
 
diff --git a/proto/rootupdater/params.proto b/proto/rootupdater/params.proto
@@ -7,11 +7,12 @@ option go_package = "github.com/rarimo/rarimo-core/x/rootupdater/types";
 
 // Params defines the parameters for the module.
 message Params {
-  string contract_address = 1;
+  string source_contract_address = 1;
   string root = 2;
   string last_signed_root = 3;
   string last_signed_root_index = 4;
   string event_name = 5;
   int64 root_timestamp = 6;
   uint64 block_height = 7;
-}
+  string destination_contract_address = 8;
+}
diff --git a/x/rarimocore/crypto/operation/op_passport_root_update.go b/x/rarimocore/crypto/operation/op_passport_root_update.go
@@ -8,17 +8,18 @@ import (
 )
 
 type PassportRootUpdateContent struct {
-	ContractAddress []byte
-	Root            []byte
-	RootTimestamp   []byte
+	SourceContractAddress      []byte
+	DestinationContractAddress []byte
+	Root                       []byte
+	RootTimestamp              []byte
 }
 
 const hashPassportRootUpdatePrefix = "Rarimo passport root"
 
 var _ merkle.Content = PassportRootUpdateContent{}
 
 func (c PassportRootUpdateContent) CalculateHash() []byte {
-	return eth.Keccak256([]byte(hashPassportRootUpdatePrefix), c.ContractAddress, c.Root, c.RootTimestamp)
+	return eth.Keccak256([]byte(hashPassportRootUpdatePrefix), c.SourceContractAddress, c.DestinationContractAddress, c.Root, c.RootTimestamp)
 }
 
 func (c PassportRootUpdateContent) Equals(other merkle.Content) bool {

diff --git a/x/rarimocore/crypto/pkg/op_passport_root_update.go b/x/rarimocore/crypto/pkg/op_passport_root_update.go
@@ -20,8 +20,9 @@ func GetPassportRootUpdate(operation types.Operation) (*types.PassportRootUpdate
 
 func GetPassportRootUpdateContent(op *types.PassportRootUpdate) (*operation.PassportRootUpdateContent, error) {
 	return &operation.PassportRootUpdateContent{
-		ContractAddress: hexutil.MustDecode(op.ContractAddress),
-		Root:            operation.To32Bytes(hexutil.MustDecode(op.Root)),
-		RootTimestamp:   operation.To32Bytes(new(big.Int).SetInt64(op.Timestamp).Bytes()),
+		SourceContractAddress:      hexutil.MustDecode(op.SourceContractAddress),
+		DestinationContractAddress: hexutil.MustDecode(op.DestinationContractAddress),
+		Root:                       operation.To32Bytes(hexutil.MustDecode(op.Root)),
+		RootTimestamp:              operation.To32Bytes(new(big.Int).SetInt64(op.Timestamp).Bytes()),
 	}, nil
 }
diff --git a/x/rarimocore/types/op_passport_root_update.pb.go b/x/rarimocore/types/op_passport_root_update.pb.go
diff --git a/x/rootupdater/keeper/abci.go b/x/rootupdater/keeper/abci.go
@@ -18,10 +18,11 @@ func (k Keeper) EndBlocker(ctx sdk.Context) {
 
 	// Creating operation to be signed by TSS parties
 	index, err := k.rarimo.CreateRootUpdateOperation(ctx, types.ModuleName, &rarimocoremoduletypes.PassportRootUpdate{
-		ContractAddress: params.ContractAddress,
-		Root:            params.Root,
-		Timestamp:       params.RootTimestamp,
-		BlockHeight:     params.BlockHeight,
+		SourceContractAddress:      params.SourceContractAddress,
+		DestinationContractAddress: params.DestinationContractAddress,
+		Root:                       params.Root,
+		Timestamp:                  params.RootTimestamp,
+		BlockHeight:                params.BlockHeight,
 	})
 
 	if err != nil {

diff --git a/x/rootupdater/keeper/keeper.go b/x/rootupdater/keeper/keeper.go
@@ -65,7 +65,7 @@ func (k Keeper) PostTxProcessing(ctx sdk.Context, msg core.Message, receipt *eth
 		return nil
 	}
 
-	contractAddress, err := hexutil.Decode(params.ContractAddress)
+	contractAddress, err := hexutil.Decode(params.SourceContractAddress)
 	if err != nil {
 		// If return an error here, the whole EVM module won't work
 		k.Logger(ctx).Error("failed to decode contract address")