EN-13168: added relayed v1 tx builder #235

bogdan-rosianu · 2022-09-20T14:25:09Z

Added a buidler for relayed v1 tx builder + some fixes for relayed v2

# Conflicts: # package-lock.json

schimih

Approve: I don't see any issue, only small beautifiers. I may do the changes when support for frozen account will be needed for relayed transactions as well.

schimih · 2022-09-21T15:17:14Z

src/relayedTransactionV1Builder.ts

+import BigNumber from "bignumber.js";
+
+export class RelayedTransactionV1Builder {
+


Suggested change

schimih · 2022-09-21T15:18:02Z

src/relayedTransactionV1Builder.ts

+    }
+
+    /**
+     * Sets the network config to be used for building the relayed v2 transaction


Suggested change

* Sets the network config to be used for building the relayed v2 transaction

* Sets the network config to be used for building the relayed v1 transaction

schimih · 2022-09-21T15:18:55Z

src/relayedTransactionV1Builder.ts

+    }
+
+    /**
+     * Sets the address of the relayer (the one that will actually pay the fee


Suggested change

* Sets the address of the relayer (the one that will actually pay the fee

* Sets the address of the relayer (the one that will actually pay the fee)

schimih · 2022-09-21T15:20:35Z

src/relayedTransactionV1Builder.ts

+            .setFunction(new ContractFunction("relayedTx"))
+            .setArgs([
+                new StringValue(serializedTransaction),
+                //new StringValue(serializedTransaction.toString("hex"))


I don't see why this should stay here.

true, removed

schimih · 2022-09-21T15:22:10Z

src/relayedTransactionV2Builder.spec.ts

+        builder = builder
+            .setNetworkConfig(networkConfig)
+            .setInnerTransactionGasLimit(10)
+            .setInnerTransaction(innerTx)
+            .setRelayerAddress(alice.address);


schimih · 2022-09-21T15:22:36Z

src/relayedTransactionV2Builder.spec.ts

@@ -68,6 +76,7 @@ describe("test relayed v2 transaction builder", function () {
            .setInnerTransaction(innerTx)
            .setInnerTransactionGasLimit(60_000_000)
            .setNetworkConfig(networkConfig)
+            .setRelayerAddress(alice.getAddress())


schimih · 2022-09-21T15:23:43Z

src/relayedTransactionV2Builder.ts

        this.netConfig = netConfig;
        return this;
    }

    /**
-     * Tries to build the relayed v2 transaction based on the previously set fields
+     * Sets the address of the relayer (the one that will actually pay the fee


Like the one before

Suggested change

* Sets the address of the relayer (the one that will actually pay the fee

* Sets the address of the relayer (the one that will actually pay the fee)

andreibancioiu · 2022-09-22T08:54:53Z

src/relayedTransactionV1Builder.spec.ts

@@ -0,0 +1,81 @@
+import {loadTestWallets, TestWallet} from "./testutils";


Imports formatting is inconsistent with other files (optional).

andreibancioiu · 2022-09-22T08:59:43Z

src/relayedTransactionV1Builder.spec.ts

+            nonce: 15,
+            sender: alice.address,
+            receiver: Address.fromBech32("erd1qqqqqqqqqqqqqqqpqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqzllls8a5w6u"),
+            gasLimit: 10,


Can use a more real-world value her (optional).

andreibancioiu · 2022-09-22T09:01:26Z

src/relayedTransactionV1Builder.spec.ts

+        const relayedTxV1 = builder
+            .setInnerTransaction(innerTx)
+            .setRelayerNonce({
+                valueOf: function () {


I think passing the number directly should work (since Number implements valueOf).

andreibancioiu · 2022-09-22T09:02:06Z

src/relayedTransactionV1Builder.ts

+    netConfig: INetworkConfig | undefined;
+
+    /**
+     * Sets the inner transaction to be used. It has to be already signed.


andreibancioiu · 2022-09-22T09:03:12Z

src/relayedTransactionV1Builder.ts

+     *
+     * @param {Transaction} transaction The inner transaction to be used
+     */
+    setInnerTransaction(transaction: Transaction): RelayedTransactionV1Builder {


Could we have received an ITransaction here? Please leave as it is otherwise :)

no, we cannot use that

andreibancioiu · 2022-09-22T09:04:33Z

src/relayedTransactionV1Builder.ts

+        const payload = TransactionPayload.contractCall()
+            .setFunction(new ContractFunction("relayedTx"))
+            .setArgs([
+                new StringValue(serializedTransaction),


andreibancioiu · 2022-09-22T09:05:02Z

src/relayedTransactionV1Builder.ts

+            receiver: this.innerTransaction.getSender(),
+            value: 0,
+            gasLimit:
+                this.netConfig.MinGasLimit + this.netConfig.GasPerDataByte * payload.length() + this.innerTransaction.getGasLimit().valueOf(),


Optionally, this could have been a separate variable.

andreibancioiu · 2022-09-22T09:05:56Z

src/relayedTransactionV1Builder.ts

+
+        const txObject = {
+            "nonce": this.innerTransaction.getNonce().valueOf(),
+            "sender": new Address(this.innerTransaction.getSender().bech32()).pubkey().toString("base64"),


Oh, I've forgot about this 👍

andreibancioiu · 2022-09-22T09:06:42Z

src/relayedTransactionV2Builder.spec.ts

@@ -67,10 +75,17 @@ describe("test relayed v2 transaction builder", function () {
        const relayedTxV2 = builder
            .setInnerTransaction(innerTx)
            .setInnerTransactionGasLimit(60_000_000)
+            .setRelayerNonce({


Could have been setRelayerNonce(37) (I think).

andreibancioiu · 2022-09-22T09:07:33Z

src/relayedTransactionV2Builder.ts

    innerTransaction: Transaction | undefined;
    innerTransactionGasLimit: IGasLimit | undefined;
+    relayerAddress: IAddress | undefined;


All right, they don't seem to be breaking changes.

bogdan-rosianu added 2 commits September 20, 2022 17:24

EN-13168: added relayed v1 tx builder

763e8c0

EN-13168: minor fixes

f0123db

bogdan-rosianu marked this pull request as ready for review September 21, 2022 13:19

bogdan-rosianu added 2 commits September 21, 2022 16:23

removed TODO

a8940d8

Merge branch 'main' into EN-13168-relayed-v1-tx-builder

3c67a83

# Conflicts: # package-lock.json

bogdan-rosianu self-assigned this Sep 21, 2022

schimih self-requested a review September 21, 2022 13:30

bogdan-rosianu added 2 commits September 21, 2022 16:33

fix test

2a45067

fix after self review

36c4c3b

schimih previously approved these changes Sep 21, 2022

View reviewed changes

add optional setRelayerNonce

b1b7b25

bogdan-rosianu dismissed schimih’s stale review via b1b7b25 September 22, 2022 08:28

bogdan-rosianu added 2 commits September 22, 2022 11:30

fix after review

d0c7766

update package lock

60673b0

vladbucur1 previously approved these changes Sep 22, 2022

View reviewed changes

schimih previously approved these changes Sep 22, 2022

View reviewed changes

andreibancioiu previously approved these changes Sep 22, 2022

View reviewed changes

fixes after second review

b6e7c99

bogdan-rosianu dismissed stale reviews from andreibancioiu, schimih, and vladbucur1 via b6e7c99 September 22, 2022 09:24

andreibancioiu previously approved these changes Sep 22, 2022

View reviewed changes

schimih previously approved these changes Sep 22, 2022

View reviewed changes

bump version + update changelog

8efa383

bogdan-rosianu dismissed stale reviews from schimih and andreibancioiu via 8efa383 September 22, 2022 09:38

schimih approved these changes Sep 22, 2022

View reviewed changes

andreibancioiu approved these changes Sep 22, 2022

View reviewed changes

bogdan-rosianu merged commit 150613a into main Sep 22, 2022

andreibancioiu deleted the EN-13168-relayed-v1-tx-builder branch October 31, 2023 10:16

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

EN-13168: added relayed v1 tx builder #235

EN-13168: added relayed v1 tx builder #235

bogdan-rosianu commented Sep 20, 2022 •

edited

Loading

schimih left a comment

schimih Sep 21, 2022

bogdan-rosianu Sep 22, 2022

schimih Sep 21, 2022

bogdan-rosianu Sep 22, 2022

schimih Sep 21, 2022

bogdan-rosianu Sep 22, 2022

schimih Sep 21, 2022

bogdan-rosianu Sep 22, 2022

schimih Sep 21, 2022

schimih Sep 21, 2022

schimih Sep 21, 2022

bogdan-rosianu Sep 22, 2022

andreibancioiu Sep 22, 2022

andreibancioiu Sep 22, 2022

bogdan-rosianu Sep 22, 2022

andreibancioiu Sep 22, 2022

bogdan-rosianu Sep 22, 2022

andreibancioiu Sep 22, 2022

andreibancioiu Sep 22, 2022

bogdan-rosianu Sep 22, 2022

andreibancioiu Sep 22, 2022

andreibancioiu Sep 22, 2022

bogdan-rosianu Sep 22, 2022

andreibancioiu Sep 22, 2022

andreibancioiu Sep 22, 2022

bogdan-rosianu Sep 22, 2022

andreibancioiu Sep 22, 2022

		import BigNumber from "bignumber.js";

		export class RelayedTransactionV1Builder {

	* Sets the network config to be used for building the relayed v2 transaction
	* Sets the network config to be used for building the relayed v1 transaction

	* Sets the address of the relayer (the one that will actually pay the fee
	* Sets the address of the relayer (the one that will actually pay the fee)

		@@ -0,0 +1,81 @@
		import {loadTestWallets, TestWallet} from "./testutils";

EN-13168: added relayed v1 tx builder #235

EN-13168: added relayed v1 tx builder #235

Conversation

bogdan-rosianu commented Sep 20, 2022 • edited Loading

schimih left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

bogdan-rosianu commented Sep 20, 2022 •

edited

Loading