added metadata for fee option token (#815)

* added metadata for fee option token

* check token address + removed unused imports

Author: VGabriel45

packages/wallet/core/src/relayer/relayer.ts

@@ -1,9 +1,9 @@
 import { Payload, Precondition } from '@0xsequence/wallet-primitives'
 import { Address, Hex } from 'ox'
-import { GetMetaTxnReceiptReturn } from './standard/rpc/index.js'
+import { FeeToken, GetMetaTxnReceiptReturn } from './standard/rpc/index.js'
 
 export interface FeeOption {
-  token: Address.Address
+  token: FeeToken
   to: string
   value: string
   gasLimit: number

packages/wallet/core/src/relayer/standard/rpc/index.ts

@@ -4,17 +4,11 @@ import {
   MetaTxn as RpcMetaTxn,
   FeeTokenType,
   IntentPrecondition,
-  GetMetaTxnReceiptReturn,
 } from './relayer.gen.js'
 import { FeeOption, FeeQuote, OperationStatus, Relayer } from '../../relayer.js'
 import { Address, Hex, Bytes, AbiFunction } from 'ox'
-import { Constants, Payload, Precondition as PrimitivePrecondition } from '@0xsequence/wallet-primitives'
-import {
-  IntentPrecondition as RpcIntentPrecondition,
-  ETHTxnStatus,
-  FeeOption as RpcFeeOption,
-  FeeToken as RpcFeeToken,
-} from './relayer.gen.js'
+import { Constants, Payload } from '@0xsequence/wallet-primitives'
+import { ETHTxnStatus, FeeToken as RpcFeeToken } from './relayer.gen.js'
 import { decodePrecondition } from '../../../preconditions/index.js'
 import {
   erc20BalanceOf,
@@ -87,8 +81,16 @@ export class RpcRelayer implements Relayer {
         data: Bytes.toHex(data),
       })
 
-      const options = result.options.map((feeOption) => this.mapRpcFeeOptionToFeeOption(feeOption))
       const quote = result.quote ? ({ _tag: 'FeeQuote', _quote: result.quote } as FeeQuote) : undefined
+      const options = result.options.map((option) => ({
+        token: {
+          ...option.token,
+          contractAddress: this.mapRpcFeeTokenToAddress(option.token),
+        },
+        to: option.to,
+        value: option.value,
+        gasLimit: option.gasLimit,
+      }))
 
       return { options, quote }
     } catch (e) {
@@ -364,15 +366,6 @@ export class RpcRelayer implements Relayer {
     }
   }
 
-  private mapRpcFeeOptionToFeeOption(rpcOption: RpcFeeOption): FeeOption {
-    return {
-      token: this.mapRpcFeeTokenToAddress(rpcOption.token),
-      to: rpcOption.to,
-      value: rpcOption.value,
-      gasLimit: rpcOption.gasLimit,
-    }
-  }
-
   private mapRpcFeeTokenToAddress(rpcToken: RpcFeeToken): Address.Address {
     if (rpcToken.type === FeeTokenType.ERC20_TOKEN && rpcToken.contractAddress) {
       return Address.from(rpcToken.contractAddress)

packages/wallet/core/src/relayer/standard/sequence.ts

@@ -1,5 +1,5 @@
 import { ETHTxnStatus, IntentPrecondition, Relayer as Service } from '@0xsequence/relayer'
-import { Constants, Payload } from '@0xsequence/wallet-primitives'
+import { Payload } from '@0xsequence/wallet-primitives'
 import { AbiFunction, Address, Bytes, Hex } from 'ox'
 import { FeeOption, FeeQuote, OperationStatus, Relayer } from '../relayer.js'
 
@@ -32,17 +32,7 @@ export class SequenceRelayer implements Relayer {
     const { options, quote } = await this.service.feeOptions({ wallet, to, data })
 
     return {
-      options: options.map(({ token: { contractAddress }, to, value, gasLimit }) => {
-        let token: Address.Address
-        if (contractAddress) {
-          Address.assert(contractAddress)
-          token = contractAddress
-        } else {
-          token = Constants.ZeroAddress
-        }
-
-        return { token, to, value, gasLimit }
-      }),
+      options,
       quote: quote ? { _tag: 'FeeQuote', _quote: quote } : undefined,
     }
   }

packages/wallet/wdk/src/sequence/transactions.ts

@@ -434,7 +434,7 @@ export class Transactions implements TransactionsInterface {
 
         Address.assert(to)
 
-        if (token === Constants.ZeroAddress) {
+        if (token.contractAddress === Constants.ZeroAddress) {
           tx.envelope.payload.calls.unshift({
             to,
             value: BigInt(value),
@@ -448,7 +448,7 @@ export class Transactions implements TransactionsInterface {
           const [transfer] = Abi.from(['function transfer(address to, uint256 amount) returns (bool)'])
 
           tx.envelope.payload.calls.unshift({
-            to: token,
+            to: token.contractAddress as Address.Address,
             value: 0n,
             data: AbiFunction.encodeData(transfer, [to, BigInt(value)]),
             gasLimit: BigInt(gasLimit),