Integrate the SC Intents Factory in the SmartContract Class #330

popenta · 2023-09-12T14:25:48Z

Integrated the SC transaction intents factory in the smart contract module.

src/smartcontracts/codeMetadata.ts

andreibancioiu

We should further discuss about using / not using the exact gas limit provided by the user.

andreibancioiu · 2023-09-15T10:54:26Z

src/smartcontracts/codeMetadata.ts

+        if (bytes.length !== this.codeMetadataLength) {
+            return new CodeMetadata();
+        }


Perhaps raising an exception would have worked as well?

Well, I've done it how it's done in vm-common.

andreibancioiu · 2023-09-15T10:54:58Z

src/smartcontracts/codeMetadata.ts

@@ -22,6 +23,22 @@ export class CodeMetadata {
        this.payableBySc = payableBySc
    }

+    static fromBytes(bytes: Uint8Array): CodeMetadata {


Should be unit tested.

added unit test.

andreibancioiu · 2023-09-15T10:56:54Z

src/smartcontracts/interaction.spec.ts

@@ -41,7 +41,7 @@ describe("test smart contract interactor", function () {
        assert.deepEqual(transaction.getReceiver(), dummyAddress);
        assert.equal(transaction.getValue().toString(), "1000000000000000000");
        assert.equal(transaction.getNonce(), 7);
-        assert.equal(transaction.getGasLimit().valueOf(), 20000000);
+        assert.equal(transaction.getGasLimit().valueOf(), 20057500);


This is somehow a behavioral change. I think, in the smart contracts factory, we should simply use the provided gas limit as the "final" one, without adding an extra gas limit for data movement (the computed one). Debatable, though (we should specify this in the specs).

As discussed, and already done, we are not modifying the gas limit that was set by the user for smart contract transactions.

Will also fix the unit tests.

andreibancioiu · 2023-09-15T10:57:25Z

src/smartcontracts/interface.ts

@@ -31,7 +31,7 @@ export interface ISmartContract {
 export interface DeployArguments {
    code: ICode;
    codeMetadata?: ICodeMetadata;
-    initArguments?: TypedValue[];
+    initArguments?: any[];


Indeed. Not a breaking change.

andreibancioiu · 2023-09-15T11:00:32Z

src/smartcontracts/interaction.spec.ts

@@ -188,7 +188,7 @@ describe("test smart contract interactor", function () {
        assert.equal(transaction.getData().toString(), "getUltimateAnswer");
        assert.equal(
            transaction.getHash().toString(),
-            "60d0956a8902c1179dce92d91bd9670e31b9a9cd07c1d620edb7754a315b4818"
+            "3ff6309bfe87ecc4ab541db649d57187f3a012291570552ac003866f77212c19"


Ideally, gas limit should stay the same (and the transaction hashes, as well).

andreibancioiu · 2023-09-15T11:04:22Z

src/smartcontracts/smartContract.ts

-            .setCodeMetadata(codeMetadata)
-            .setInitArgs(initArguments)
-            .build();
+        const bytecode = Uint8Array.from(Buffer.from(code.toString(), 'hex'));


const bytecode = Buffer.from(code.toString(), 'hex');

Should have worked, as well, since Buffer implements Uint8Array.

andreibancioiu · 2023-09-15T11:07:45Z

src/transactionIntentsFactories/smartContractTransactionIntentsFactory.ts

@@ -15,16 +15,23 @@ interface Config {
    gasLimitPerByte: BigNumber.Value;
 }

+interface Abi {


andreibancioiu · 2023-09-15T11:08:17Z

src/transactionIntentsFactories/smartContractTransactionIntentsFactory.ts


-        const preparedArgs = this.argsToDataParts(args, this.abiRegistry?.constructorDefinition)
+        const preparedArgs = this.argsToDataParts(args, this.abiRegistry?.getEndpoint(options.functionName));


andreibancioiu · 2023-09-15T11:09:26Z

src/transactionIntentsFactories/smartContractTransactionIntentsFactory.ts

-        const isReadable = options.isReadable || true;
-        const isPayable = options.isPayable || false;
-        const isPayableBySmartContract = options.isPayableBySmartContract || true;
+        const isUpgradeable = options.isUpgradeable ?? true;


Now I see, we should define some constants in the specs, such as:

DEFAULT_CODE_METADATA_IS_READABLE = true;

andreibancioiu · 2023-09-15T11:13:01Z

src/smartcontracts/smartContract.ts

+        else {
+            metadata = new CodeMetadata();
+        }
+        const metadataAsJson = metadata.toJSON() as {


Alternatively, we can directly make the fields of CodeMetadata as public readonly:

https://github.com/multiversx/mx-sdk-js-core/blob/main/src/smartcontracts/codeMetadata.ts

Then use those, without an extra mapping to JSON.

Not really good if someone uses the toggle... methods.

started to use sc intents factory in the sc class

a5a141e

popenta self-assigned this Sep 12, 2023

popenta marked this pull request as draft September 12, 2023 14:25

popenta added 3 commits September 13, 2023 10:59

fix transaction intent for deploy

bffae4a

contract upgrade

19a643e

integrate sc intents factory

48ee428

popenta marked this pull request as ready for review September 13, 2023 10:58

bogdan-rosianu self-requested a review September 13, 2023 11:02

bogdan-rosianu reviewed Sep 13, 2023

View reviewed changes

src/smartcontracts/codeMetadata.ts Outdated Show resolved Hide resolved

rename variable

bf0a653

bogdan-rosianu previously approved these changes Sep 13, 2023

View reviewed changes

andreibancioiu reviewed Sep 15, 2023

View reviewed changes

popenta added 2 commits September 20, 2023 15:03

Merge branch 'feat/factories' into sc-intents-factory

22aa9a6

fixes after review

74b0478

popenta dismissed bogdan-rosianu’s stale review via 74b0478 September 20, 2023 13:14

bogdan-rosianu approved these changes Sep 20, 2023

View reviewed changes

andreibancioiu approved these changes Sep 22, 2023

View reviewed changes

popenta merged commit 17e4312 into feat/factories Sep 25, 2023
1 check passed

popenta deleted the sc-intents-factory branch September 25, 2023 14:24

popenta mentioned this pull request Feb 13, 2024

v13: Merge feat/next into main #347

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Integrate the SC Intents Factory in the SmartContract Class #330

Integrate the SC Intents Factory in the SmartContract Class #330

popenta commented Sep 12, 2023 •

edited

Loading

andreibancioiu left a comment

andreibancioiu Sep 15, 2023

popenta Sep 20, 2023

andreibancioiu Sep 15, 2023

popenta Sep 20, 2023

andreibancioiu Sep 15, 2023

popenta Sep 20, 2023

popenta Sep 20, 2023

andreibancioiu Sep 15, 2023

andreibancioiu Sep 15, 2023

popenta Sep 20, 2023

andreibancioiu Sep 15, 2023

andreibancioiu Sep 15, 2023

andreibancioiu Sep 15, 2023

andreibancioiu Sep 15, 2023

andreibancioiu Sep 15, 2023

popenta Sep 20, 2023


		const preparedArgs = this.argsToDataParts(args, this.abiRegistry?.constructorDefinition)
		const preparedArgs = this.argsToDataParts(args, this.abiRegistry?.getEndpoint(options.functionName));

Integrate the SC Intents Factory in the SmartContract Class #330

Integrate the SC Intents Factory in the SmartContract Class #330

Conversation

popenta commented Sep 12, 2023 • edited Loading

andreibancioiu 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

popenta commented Sep 12, 2023 •

edited

Loading