fix: provider id change (#215)

Add `providerId` at the end of the struct instead.

Author: aarshkshah1992

service_contracts/abi/ServiceProviderRegistry.abi.json

@@ -390,11 +390,6 @@
                 "type": "tuple",
                 "internalType": "struct ServiceProviderRegistryStorage.ServiceProviderInfo",
                 "components": [
-                  {
-                    "name": "providerId",
-                    "type": "uint256",
-                    "internalType": "uint256"
-                  },
                   {
                     "name": "serviceProvider",
                     "type": "address",
@@ -419,6 +414,11 @@
                     "name": "isActive",
                     "type": "bool",
                     "internalType": "bool"
+                  },
+                  {
+                    "name": "providerId",
+                    "type": "uint256",
+                    "internalType": "uint256"
                   }
                 ]
               },
@@ -697,11 +697,6 @@
         "type": "tuple",
         "internalType": "struct ServiceProviderRegistryStorage.ServiceProviderInfo",
         "components": [
-          {
-            "name": "providerId",
-            "type": "uint256",
-            "internalType": "uint256"
-          },
           {
             "name": "serviceProvider",
             "type": "address",
@@ -726,6 +721,11 @@
             "name": "isActive",
             "type": "bool",
             "internalType": "bool"
+          },
+          {
+            "name": "providerId",
+            "type": "uint256",
+            "internalType": "uint256"
           }
         ]
       }
@@ -748,11 +748,6 @@
         "type": "tuple",
         "internalType": "struct ServiceProviderRegistryStorage.ServiceProviderInfo",
         "components": [
-          {
-            "name": "providerId",
-            "type": "uint256",
-            "internalType": "uint256"
-          },
           {
             "name": "serviceProvider",
             "type": "address",
@@ -777,6 +772,11 @@
             "name": "isActive",
             "type": "bool",
             "internalType": "bool"
+          },
+          {
+            "name": "providerId",
+            "type": "uint256",
+            "internalType": "uint256"
           }
         ]
       }
@@ -856,11 +856,6 @@
                 "type": "tuple",
                 "internalType": "struct ServiceProviderRegistryStorage.ServiceProviderInfo",
                 "components": [
-                  {
-                    "name": "providerId",
-                    "type": "uint256",
-                    "internalType": "uint256"
-                  },
                   {
                     "name": "serviceProvider",
                     "type": "address",
@@ -885,6 +880,11 @@
                     "name": "isActive",
                     "type": "bool",
                     "internalType": "bool"
+                  },
+                  {
+                    "name": "providerId",
+                    "type": "uint256",
+                    "internalType": "uint256"
                   }
                 ]
               },
@@ -1115,11 +1115,6 @@
       }
     ],
     "outputs": [
-      {
-        "name": "providerId",
-        "type": "uint256",
-        "internalType": "uint256"
-      },
       {
         "name": "serviceProvider",
         "type": "address",
@@ -1144,6 +1139,11 @@
         "name": "isActive",
         "type": "bool",
         "internalType": "bool"
+      },
+      {
+        "name": "providerId",
+        "type": "uint256",
+        "internalType": "uint256"
       }
     ],
     "stateMutability": "view"

service_contracts/src/ServiceProviderRegistry.sol

@@ -158,12 +158,12 @@ contract ServiceProviderRegistry is
 
         // Store provider info
         providers[providerId] = ServiceProviderInfo({
-            providerId: providerId,
             serviceProvider: msg.sender,
             payee: payee,
             name: name,
             description: description,
-            isActive: true
+            isActive: true,
+            providerId: providerId
         });
 
         // Update address mapping

service_contracts/src/ServiceProviderRegistryStorage.sol

@@ -18,12 +18,12 @@ contract ServiceProviderRegistryStorage {
 
     /// @notice Main provider information
     struct ServiceProviderInfo {
-        uint256 providerId; // Unique identifier for the provider
         address serviceProvider; // Address that controls the provider registration
         address payee; // Address that receives payments (cannot be changed after registration)
         string name; // Optional provider name (max 128 chars)
         string description; //Service description, ToC, contract info, website..
         bool isActive;
+        uint256 providerId; // Unique identifier for the provider
     }
 
     /// @notice Product offering of the Service Provider