updates for multi token send

status-im · Dec 31, 2024 · 23ce959 · 23ce959
1 parent 6cd4280
commit 23ce959
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 14 deletions.
diff --git a/src/app_service/service/transaction/service.nim b/src/app_service/service/transaction/service.nim
@@ -15,7 +15,6 @@ import app/global/app_signals
 import app_service/common/wallet_constants as common_wallet_constants
 import app_service/common/utils as common_utils
 import app_service/common/types as common_types
-from app_service/common/account_constants import ZERO_ADDRESS
 import app_service/service/currency/service as currency_service
 import app_service/service/wallet_account/service as wallet_account_service
 import app_service/service/network/service as network_service
@@ -449,15 +448,14 @@ QtObject:
       self.suggestedRoutesReady(uuid, @[], "", $InternalErrorCode, e.msg)
 
   proc suggestedCommunityRoutes*(self: Service, uuid: string, sendType: SendType, chainId: int, accountFrom: string,
-    communityId: string, signerPubKey: string = "", amount: Uint256 = stint.u256(0), walletAddresses: seq[string] = @[],
-    tokenContractAddress: string = ZERO_ADDRESS, signature: string = "", ownerTokenParameters: JsonNode = JsonNode(),
+    communityId: string, signerPubKey: string = "", walletAddresses: seq[string] = @[],
+    transferDetails: seq[JsonNode] = @[], signature: string = "", ownerTokenParameters: JsonNode = JsonNode(),
     masterTokenParameters: JsonNode = JsonNode(), deploymentParameters: JsonNode = JsonNode()) =
     self.lastRequestForSuggestedRoutes = (uuid, sendType)
     try:
       let
         disabledFromChainIDs = self.networkService.getDisabledChainIdsForEnabledChainIds(@[chainId])
         disabledToChainIDs = disabledFromChainIDs
-        amountHex = "0x" & eth_utils.stripLeadingZeros(amount.toHex)
 
       let err = wallet.suggestedRoutesAsyncForCommunities(
         uuid,
@@ -466,15 +464,14 @@ QtObject:
         disabledFromChainIDs,
         disabledToChainIDs,
         communityId,
-        tokenContractAddress,
         signerPubKey = singletonInstance.userProfile.getPubKey(),
-        amount = amountHex,
         tokenIds = @[],
         walletAddresses = walletAddresses,
         tokenDeploymentSignature = signature,
         ownerTokenParameters,
         masterTokenParameters,
-        deploymentParameters
+        deploymentParameters,
+        transferDetails
       )
       if err.len > 0:
         raise newException(CatchableError, "err fetching the best route for deploying owner: " & err)

diff --git a/src/backend/wallet.nim b/src/backend/wallet.nim
@@ -176,22 +176,21 @@ proc suggestedRoutesAsync*(uuid: string, sendType: int, accountFrom: string, acc
     return rpcResponse.error.message
 
 proc suggestedRoutesAsyncForCommunities*(uuid: string, sendType: int, accountFrom: string, disabledFromChainIDs,
-  disabledToChainIDs: seq[int], communityId: string, tokenContractAddress: string = ZERO_ADDRESS, signerPubKey: string = "0x0",
-  amount: string = "0x0", tokenIds: seq[string] = @[], walletAddresses: seq[string] = @[],
-  tokenDeploymentSignature: string = "", ownerTokenParameters: JsonNode = JsonNode(),
-  masterTokenParameters: JsonNode = JsonNode(), deploymentParameters: JsonNode = JsonNode()): string {.raises: [RpcException].} =
+  disabledToChainIDs: seq[int], communityId: string, signerPubKey: string = "0x0", tokenIds: seq[string] = @[],
+  walletAddresses: seq[string] = @[], tokenDeploymentSignature: string = "", ownerTokenParameters: JsonNode = JsonNode(),
+  masterTokenParameters: JsonNode = JsonNode(), deploymentParameters: JsonNode = JsonNode(),
+  transferDetails: seq[JsonNode] = @[]): string {.raises: [RpcException].} =
 
   let data = %* {
     "communityID": communityId,
-    "tokenContractAddress": tokenContractAddress,
     "signerPubKey": signerPubKey,
-    "amount": amount,
     "tokenIds": tokenIds,
     "walletAddresses": walletAddresses,
     "tokenDeploymentSignature": tokenDeploymentSignature,
     "ownerTokenParameters": ownerTokenParameters,
     "masterTokenParameters": masterTokenParameters,
     "deploymentParameters": deploymentParameters,
+    "transferDetails": transferDetails,
   }
 
   let payload = prepareDataForSuggestedRoutes(uuid, sendType, accountFrom, accountTo=ZERO_ADDRESS, amountIn="0x0", amountOut="0x0", token="ETH",

diff --git a/vendor/status-go b/vendor/status-go
+110 −39		services/wallet/requests/router_input_community_params.go
+1 −1		services/wallet/routeexecution/manager.go
+11 −8		services/wallet/router/errors.go
+13 −13		services/wallet/router/pathprocessor/processor_community_burn.go
+5 −5		services/wallet/router/pathprocessor/processor_community_mint_tokens.go
+2 −1		services/wallet/router/pathprocessor/processor_community_remote_burn.go
+150 −110		services/wallet/router/router.go
+7 −1		services/wallet/router/routes/router_path.go
+4 −0		services/wallet/router/sendtype/send_type.go