Merge pull request #382 from alephium/fix-generating-constants

Fix generating constants

.project.json

@@ -49,11 +49,11 @@
     },
     "Assert": {
       "sourceFile": "test/assert.ral",
-      "sourceCodeHash": "65f8387941a38e88ef555f5d0b4992dab390d97ff97b2473fdea45b8d58a74a5",
+      "sourceCodeHash": "9f400f63bcdefcbccb09253140532bea0054f543fa7264b555abcadc0da2d87d",
       "bytecodeDebugPatch": "",
       "codeHashDebug": "46dc5e3835be6551dacbf81565912ec67575aa77522312ceed88472817735d6b",
       "warnings": [
-        "Found unused constants in Assert: A, Addresses.A, Addresses.B, B, ByteVecs.A, ByteVecs.B, C, Numbers.A, Numbers.B"
+        "Found unused constants in Assert: A, Addresses.A, Addresses.B, B, ByteVecs.A, ByteVecs.B, C, Numbers.A, Numbers.B, Numbers.C"
       ]
     },
     "Balances": {
@@ -299,7 +299,7 @@
     },
     "TestAssert": {
       "sourceFile": "test/assert.ral",
-      "sourceCodeHash": "65f8387941a38e88ef555f5d0b4992dab390d97ff97b2473fdea45b8d58a74a5",
+      "sourceCodeHash": "9f400f63bcdefcbccb09253140532bea0054f543fa7264b555abcadc0da2d87d",
       "bytecodeDebugPatch": "",
       "codeHashDebug": "",
       "warnings": []

artifacts/test/Assert.ral.json

@@ -1,5 +1,5 @@
 {
-  "version": "v2.14.7",
+  "version": "v3.1.4",
   "name": "Assert",
   "bytecode": "000110010000000006d362d460120d0e2f0f7b",
   "codeHash": "46dc5e3835be6551dacbf81565912ec67575aa77522312ceed88472817735d6b",
@@ -12,9 +12,6 @@
   "functions": [
     {
       "name": "test",
-      "usePreapprovedAssets": false,
-      "useAssetsInContract": false,
-      "isPublic": true,
       "paramNames": [],
       "paramTypes": [],
       "paramIsMutable": [],
@@ -87,6 +84,13 @@
             "type": "U256",
             "value": "1"
           }
+        },
+        {
+          "name": "C",
+          "value": {
+            "type": "U256",
+            "value": "115792089237316195423570985008687907853269984665640564039457584007913129639935"
+          }
         }
       ]
     },

artifacts/test/TestAssert.ral.json

@@ -1,5 +1,5 @@
 {
-  "version": "v2.14.7",
+  "version": "v3.1.4",
   "name": "TestAssert",
   "bytecodeTemplate": "010103000000040c0c{0}0100",
   "fieldsSig": {
@@ -16,9 +16,6 @@
   "functions": [
     {
       "name": "main",
-      "usePreapprovedAssets": true,
-      "useAssetsInContract": false,
-      "isPublic": true,
       "paramNames": [],
       "paramTypes": [],
       "paramIsMutable": [],

artifacts/ts/Assert.ts

@@ -83,15 +83,21 @@ class Factory extends ContractFactory<AssertInstance, {}> {
   }
 
   consts = {
-    Error: BigInt(3),
-    A: BigInt(-3),
+    Error: BigInt("3"),
+    A: BigInt("-3"),
     B: "1DrDyTr9RpRsQnDnXo2YRiPzPW4ooHX5LLoqXrqfMrpQH",
     C: "0011",
     Addresses: {
       A: "1DrDyTr9RpRsQnDnXo2YRiPzPW4ooHX5LLoqXrqfMrpQH",
       B: "14UAjZ3qcmEVKdTo84Kwf4RprTQi86w2TefnnGFjov9xF",
     },
-    Numbers: { A: BigInt(0), B: BigInt(1) },
+    Numbers: {
+      A: BigInt("0"),
+      B: BigInt("1"),
+      C: BigInt(
+        "115792089237316195423570985008687907853269984665640564039457584007913129639935"
+      ),
+    },
     ByteVecs: { A: "00", B: "11" },
   };
 

artifacts/ts/NFTCollectionTest.ts

@@ -136,9 +136,9 @@ class Factory extends ContractFactory<
 
   consts = {
     ErrorCodes: {
-      IncorrectTokenIndex: BigInt(0),
-      NFTNotFound: BigInt(1),
-      NFTNotPartOfCollection: BigInt(2),
+      IncorrectTokenIndex: BigInt("0"),
+      NFTNotFound: BigInt("1"),
+      NFTNotPartOfCollection: BigInt("2"),
     },
   };
 

artifacts/ts/NFTCollectionWithRoyaltyTest.ts

@@ -171,10 +171,10 @@ class Factory extends ContractFactory<
 
   consts = {
     ErrorCodes: {
-      IncorrectTokenIndex: BigInt(0),
-      NFTNotFound: BigInt(1),
-      NFTNotPartOfCollection: BigInt(2),
-      CollectionOwnerAllowedOnly: BigInt(1),
+      IncorrectTokenIndex: BigInt("0"),
+      NFTNotFound: BigInt("1"),
+      NFTNotPartOfCollection: BigInt("2"),
+      CollectionOwnerAllowedOnly: BigInt("1"),
     },
   };
 

artifacts/ts/Warnings.ts

@@ -95,7 +95,7 @@ class Factory extends ContractFactory<WarningsInstance, WarningsTypes.Fields> {
     return this.contract.getInitialFieldsWithDefaultValues() as WarningsTypes.Fields;
   }
 
-  consts = { C: BigInt(0) };
+  consts = { C: BigInt("0") };
 
   at(address: string): WarningsInstance {
     return new WarningsInstance(address);

contracts/test/assert.ral

@@ -7,6 +7,7 @@ Contract Assert() {
     enum Numbers {
         A = 0
         B = 1
+        C = 115792089237316195423570985008687907853269984665640564039457584007913129639935
     }
 
     enum Addresses {

packages/cli/src/codegen.ts

@@ -212,7 +212,7 @@ function nodeValToString(value: node.Val): string {
 function valToString(v: Val): string {
   if (typeof v === 'bigint') {
     // use BigInt(...) format to avoid that some projects do not support es2020
-    return `BigInt(${v.toString()})`
+    return `BigInt('${v.toString()}')`
   } else if (typeof v === 'string') {
     return `"${v}"`
   } else if (Array.isArray(v)) {

packages/web3-test/src/test-wallet.ts

@@ -131,7 +131,11 @@ export async function transfer(from: PrivateKeyWallet, to: Address, tokenId: str
   return await from.signAndSubmitTransferTx({ signerAddress: from.address, destinations: [destination] })
 }
 
-export async function expectAssertionError(p: Promise<unknown>, address: string, errorCode: number): Promise<void> {
+export async function expectAssertionError(
+  p: Promise<unknown>,
+  address: string,
+  errorCode: number | bigint
+): Promise<void> {
   expect(isBase58(address)).toEqual(true)
   await expect(p).rejects.toThrowError(
     new RegExp(`Assertion Failed in Contract @ ${address}, Error Code: ${errorCode}`, 'mg')

test/contract.test.ts

@@ -302,13 +302,19 @@ describe('contract', function () {
   })
 
   it('should test assert!', async () => {
+    expect(Assert.consts.Numbers.C).toEqual((1n << 256n) - 1n)
+
     const contractAddress = randomContractAddress()
-    expectAssertionError(Assert.tests.test({ address: contractAddress }), contractAddress, 3)
+    expectAssertionError(Assert.tests.test({ address: contractAddress }), contractAddress, Assert.consts.Error)
 
     const assertDeployResult = await Assert.deploy(signer, { initialFields: {} })
     const assertAddress = assertDeployResult.contractInstance.address
 
-    expectAssertionError(TestAssert.execute(signer, { initialFields: { assert: assertAddress } }), assertAddress, 3)
+    expectAssertionError(
+      TestAssert.execute(signer, { initialFields: { assert: assertAddress } }),
+      assertAddress,
+      Assert.consts.Error
+    )
 
     expectAssertionError(
       TestAssert.execute(signer, {