Tool 393 add relayer v 3 support #543
Conversation
src/proto/serializer.ts
Outdated
| if (transaction.relayer && !transaction.relayer.isEmpty()) { | ||
| protoTransaction.Relayer = transaction.relayer.getPublicKey(); | ||
| protoTransaction.RelayerSignature = transaction.relayerSignature; | ||
| } |
There was a problem hiding this comment.
Let's extract to a function similar to the guardian check above, and also check if relayer signature is set.
There was a problem hiding this comment.
we discussed about this internally and said it is not needed
src/transaction.spec.ts
Outdated
| it("should serialize transaction with relayer", async () => { | ||
| const transaction = new Transaction({ | ||
| chainID: networkConfig.ChainID, | ||
| sender: wallets.alice.address.bech32(), |
There was a problem hiding this comment.
use toBech32(), here and bellow.
src/transaction.ts
Outdated
| /** | ||
| * The relayer, in address format, next version all the other addresses will not be string anymore. | ||
| */ | ||
| public relayer?: Address; |
There was a problem hiding this comment.
maybe this doesn't need to be optional. Make it optional on the constructor and if not provided, set to Address.empty()?
src/transactionComputer.ts
Outdated
| applyRelayer(transaction: ITransaction, relayer: Address) { | ||
| transaction.relayer = relayer; | ||
| } |
There was a problem hiding this comment.
this is kind of useless since one can simply do:
transaction.relayer = relayerAddress;| @@ -25,9 +26,11 @@ export class TransactionsConverter { | |||
| chainID: transaction.chainID.valueOf(), | |||
| version: transaction.version, | |||
| options: transaction.options == 0 ? undefined : transaction.options, | |||
| relayer: !transaction.relayer || transaction.relayer.isEmpty() ? undefined : transaction.relayer.toBech32(), | |||
There was a problem hiding this comment.
We should have relayer and guardian done in the same way. Which way should we choose?
There was a problem hiding this comment.
Oh, now I see, cannot be same as guardian, since that's a string 👍
| @@ -46,6 +49,7 @@ export class TransactionsConverter { | |||
| nonce: BigInt(object.nonce), | |||
| value: BigInt(object.value || ""), | |||
| receiver: object.receiver, | |||
| relayer: object.relayer ? Address.newFromBech32(object.relayer) : Address.empty(), | |||
There was a problem hiding this comment.
Can we have it the same as guardian? If so, which way?
There was a problem hiding this comment.
Oh, now I see, cannot be same as guardian, since that's a string 👍
src/proto/serializer.ts
Outdated
| @@ -60,6 +60,11 @@ export class ProtoSerializer { | |||
| protoTransaction.GuardianSignature = transaction.guardianSignature; | |||
| } | |||
|
|
|||
| if (transaction.relayer && !transaction.relayer.isEmpty()) { | |||
There was a problem hiding this comment.
Can refactor to have a mini private function isRelayedTransaction (for symmetry) .
src/transaction.ts
Outdated
| @@ -92,6 +91,11 @@ export class Transaction { | |||
| */ | |||
| public guardian: string; | |||
|
|
|||
| /** | |||
| * The relayer, in address format, next version all the other addresses will not be string anymore. | |||
There was a problem hiding this comment.
Can be rephrased.
The relayer address.
Note: in the next major version, `sender`, `receiver` and `guardian` will also have the type `Address`, instead of `string`.
src/transaction.ts
Outdated
| @@ -137,9 +148,11 @@ export class Transaction { | |||
| this.version = Number(options.version?.valueOf() || TRANSACTION_VERSION_DEFAULT); | |||
| this.options = Number(options.options?.valueOf() || TRANSACTION_OPTIONS_DEFAULT); | |||
| this.guardian = options.guardian ? this.addressAsBech32(options.guardian) : ""; | |||
| this.relayer = options.relayer?.isEmpty() ? undefined : options.relayer; | |||
There was a problem hiding this comment.
Oh, now I see, cannot be same as guardian, since that's a string 👍
src/transactionComputer.ts
Outdated
| @@ -94,6 +95,17 @@ export class TransactionComputer { | |||
| transaction.guardian = guardian; | |||
| } | |||
|
|
|||
| applyRelayer(transaction: ITransaction, relayer: Address) { | |||
There was a problem hiding this comment.
In sdk-py, we don't have it:
Should we have it?
https://github.com/multiversx/mx-sdk-specs/blob/main/core/transaction_computer.md
There was a problem hiding this comment.
I suggest we delete it from specs, as well. It is useless.
src/transactionComputer.ts
Outdated
| } | ||
|
|
||
| isRelayedV3Transaction(transaction: ITransaction) { | ||
| if (transaction.relayer && !transaction.relayer.isEmpty()) { |
There was a problem hiding this comment.
Can use a one-line return (can also stay as it is).
src/transaction.ts
Outdated
| /** | ||
| * The relayer, in address format, next version all the other addresses will not be string anymore. | ||
| */ | ||
| public relayer?: Address; |
There was a problem hiding this comment.
Indeed, optional - I see we have the same in PY 👍
https://github.com/multiversx/mx-sdk-py/blob/feat/next/multiversx_sdk/core/transaction.py#L49
No description provided.