feat(pol): add support for matic/pol token uploads and top ups PE-6721

src/cli/commands.ts

@@ -171,10 +171,15 @@ export async function topUp(options: TopUpOptions) {
       throw new Error('Must provide a wallet to top up');
     }
 
+    console.log('privateKey', privateKey);
     const turbo = TurboFactory.authenticated({
       ...config,
       privateKey,
     });
+    console.log(
+      'await turbo.signer.getNativeAddress()',
+      await turbo.signer.getNativeAddress(),
+    );
     return turbo.createCheckoutSession({
       amount,
       owner: await turbo.signer.getNativeAddress(),

src/cli/utils.ts

@@ -167,7 +167,8 @@ const tokenToDevGatewayMap: Record<TokenType, string> = {
   solana: 'https://api.devnet.solana.com',
   ethereum: 'https://ethereum-holesky-rpc.publicnode.com',
   kyve: 'https://api.korellia.kyve.network',
-  // matic: 'https://rpc-amoy.polygon.technology',
+  matic: 'https://rpc-amoy.polygon.technology',
+  pol: 'https://rpc-amoy.polygon.technology',
 };
 
 export function configFromOptions(

src/common/factory.ts

@@ -38,6 +38,8 @@ export abstract class TurboBaseFactory {
     uploadServiceConfig = {},
     token,
   }: TurboUnauthenticatedConfiguration = {}) {
+    token = token === 'pol' ? 'matic' : token;
+
     const paymentService = new TurboUnauthenticatedPaymentService({
       ...paymentServiceConfig,
       logger: this.logger,

src/common/payment.ts

@@ -182,6 +182,8 @@ export class TurboUnauthenticatedPaymentService
   ): Promise<TurboCheckoutSessionResponse> {
     const { amount: paymentAmount, type: currencyType } = amount;
 
+    console.log('owner', owner);
+    console.log('this.token', this.token);
     const endpoint = `/top-up/checkout-session/${owner}/${currencyType}/${paymentAmount}?uiMode=${uiMode}${
       promoCodes.length > 0
         ? `&${this.appendPromoCodesToQuery(promoCodes)}`

src/common/signer.ts

@@ -78,6 +78,7 @@ export abstract class TurboDataItemAbstractSigner
         return bs58.encode(fromB64Url(owner));
 
       case 'ethereum':
+      case 'matic':
         return computeAddress(computePublicKey(fromB64Url(owner)));
 
       case 'kyve':
@@ -112,6 +113,7 @@ export abstract class TurboDataItemAbstractSigner
   }
 
   public async getNativeAddress(): Promise<NativeAddress> {
+    console.log('this.token', this.token);
     return this.ownerToNativeAddress(
       toB64Url(await this.getPublicKey()),
       this.token,

src/common/token/index.ts

@@ -34,11 +34,16 @@ export const defaultTokenMap: TokenFactory = {
   kyve: (config: TokenConfig) => new KyveToken(config),
 } as const;
 
-export const tokenToBaseMap = {
+export const tokenToBaseMap: Record<
+  TokenType,
+  (a: BigNumber.Value) => BigNumber.Value
+> = {
   arweave: (a: BigNumber.Value) => ARToTokenAmount(a),
   solana: (a: BigNumber.Value) => SOLToTokenAmount(a),
   ethereum: (a: BigNumber.Value) => ETHToTokenAmount(a),
   kyve: (a: BigNumber.Value) => KYVEToTokenAmount(a),
+  matic: (a: BigNumber.Value) => ETHToTokenAmount(a),
+  pol: (a: BigNumber.Value) => ETHToTokenAmount(a),
 } as const;
 
 export function isTokenType(token: string): token is TokenType {

src/node/factory.ts

@@ -58,6 +58,8 @@ export class TurboFactory extends TurboBaseFactory {
     gatewayUrl,
     tokenTools,
   }: TurboAuthenticatedConfiguration) {
+    token = token === 'pol' ? 'matic' : token;
+
     if (!token) {
       if (providedSigner) {
         // Derive token from signer if not provided

src/types.ts

@@ -55,7 +55,14 @@ export function isCurrency(currency: string): currency is Currency {
 
 export type Country = 'United States' | 'United Kingdom' | 'Canada'; // TODO: add full list
 
-export const tokenTypes = ['arweave', 'solana', 'ethereum', 'kyve'] as const;
+export const tokenTypes = [
+  'arweave',
+  'solana',
+  'ethereum',
+  'kyve',
+  'matic',
+  'pol',
+] as const;
 export type TokenType = (typeof tokenTypes)[number];
 
 export type Adjustment = {
@@ -332,7 +339,7 @@ export type TurboAuthenticatedPaymentServiceConfiguration =
 export type TurboUnauthenticatedConfiguration = {
   paymentServiceConfig?: TurboUnauthenticatedPaymentServiceConfiguration;
   uploadServiceConfig?: TurboUnauthenticatedUploadServiceConfiguration;
-  token?: TokenType;
+  token?: TokenType | 'pol';
   gatewayUrl?: string;
 };
 

src/utils/common.ts

@@ -61,6 +61,7 @@ export function createTurboSigner({
     case 'solana':
       return new HexSolanaSigner(clientProvidedPrivateKey);
     case 'ethereum':
+    case 'matic':
       if (!isEthPrivateKey(clientProvidedPrivateKey)) {
         throw new Error(
           'A valid Ethereum private key must be provided for EthereumSigner.',

src/web/factory.ts

@@ -60,6 +60,8 @@ export class TurboFactory extends TurboBaseFactory {
     tokenMap,
     tokenTools,
   }: TurboAuthenticatedConfiguration) {
+    token = token === 'pol' ? 'matic' : token;
+
     if (!token) {
       if (providedSigner) {
         // Derive token from signer if not provided

tests/turbo.node.test.ts

@@ -65,11 +65,13 @@ describe('Node environment', () => {
   });
 
   describe('TurboDataItemSigner', () => {
-    const signers: Record<TokenType, [TurboSigner, NativeAddress]> = {
+    const signers: Record<string, [TurboSigner, NativeAddress]> = {
       arweave: [new ArweaveSigner(testJwk), testArweaveNativeB64Address],
       ethereum: [new EthereumSigner(testEthWallet), testEthNativeAddress],
       solana: [new HexSolanaSigner(testSolWallet), testSolNativeAddress],
       kyve: [new EthereumSigner(testKyvePrivatekey), testKyveNativeAddress],
+      matic: [new EthereumSigner(testEthWallet), testEthNativeAddress],
+      pol: [new EthereumSigner(testEthWallet), testEthNativeAddress],
     };
 
     for (const [token, [signer, expectedNativeAddress]] of Object.entries(