Feat/v3 viem p #12

envin3 · 2023-10-16T19:09:49Z

No description provided.

packages/ptokens-swap/src/ptokens-swap.ts

packages/ptokens-swap/src/ptokens-swap-builder.ts

packages/ptokens-constants/src/index.ts

packages/ptokens-assets-evm/test/utils/viem-clients.ts

packages/ptokens-assets-evm/test/ptokens-utils-evm.test.ts

packages/ptokens-assets-evm/src/lib/index.ts

packages/ptokens-assets-evm/src/ptokens-evm-asset-builder.ts

packages/ptokens-assets-evm/src/ptokens-evm-provider.ts

packages/ptokens-assets-evm/test/ptokens-evm-asset.test.ts

packages/ptokens-assets-evm/test/ptokens-evm-provider.test.ts

packages/ptokens-assets-evm/src/ptokens-evm-provider.ts

packages/ptokens-assets-evm/src/lib/index.ts

packages/ptokens-assets-evm/src/index.ts

packages/ptokens-assets-evm/src/lib/index.ts

packages/ptokens-assets-evm/src/ptokens-evm-provider.ts

oliviera9 · 2023-11-09T17:55:09Z

packages/ptokens-assets-evm/src/ptokens-evm-provider.ts

+            const txReceipt: TransactionReceipt = await this._publicClient.waitForTransactionReceipt({
+              hash: txHash,
+              confirmations: confirmations ? confirmations : 1,
+            })
            promi.emit('txConfirmed', txReceipt)
            return resolve(txReceipt)
          } catch (_err) {


I would leave the txError emitted event

This does not work. Promi here is in a reject status and event emitter do not work for some reason.

packages/ptokens-assets-evm/src/ptokens-evm-provider.ts

oliviera9 · 2023-11-09T18:02:11Z

packages/ptokens-assets-evm/src/ptokens-evm-provider.ts

        const logs = await this._publicClient.getLogs({
          fromBlock: _fromBlock,
          address: stringUtils.addHexPrefix(_hubAddress),
-          events: events,
+          events: pNetworkHubAbi.filter((_fun) => _fun.type === 'event' && _fun.name === _eventName.toString()),


events is already defined. reuse it

events was created manually starting from pNetworkHubAbi. This means that in case of any change to pNetworkHubAbi events should be manually updated. In this way instead only EVENT_NAMES needs changes.

packages/ptokens-assets-evm/test/utils/receiptUserSend.json

packages/ptokens-assets-evm/test/utils/viem-clients.ts

packages/ptokens-entities/src/ptokens-asset-provider.ts

packages/ptokens-assets-evm/src/ptokens-evm-provider.ts

oliviera9 · 2023-11-09T18:21:57Z

packages/ptokens-swap/src/ptokens-swap.ts

@@ -137,17 +157,29 @@ export class pTokensSwap {
              .on('txConfirmed', (_swapResult: SwapResult) => {
                promi.emit('inputTxConfirmed', _swapResult)
              })
-            const outputTx = await this.monitorOutputTransactions(swapResult.operationId)
+            const interimTxHash = await this.monitorInterimTransactions(swapResult.operationId)


I would change monitorCrossChainOperations implementation in a way it returns the log instead of tx hash.

In this way you can pass the log directly into the already existing getOperationIdFromLog

This would mean to import Log type on ptoken-swap. It is not manadatory here but SwapResult should return the Log as any otherwise

envin3 added 4 commits October 6, 2023 19:45

fix(swap): fix swap

6a3d355

refactor(ptokens.js): update libraries and fix linting

35ee54b

fix(swap): fix swap, asset, provider

1a73921

refactor(test): add tests for swap and provider

2e09251

envin3 requested a review from oliviera9 October 16, 2023 19:09