Merge pull request #242 from arda-org/dev

dev into main
arda-org · Dec 14, 2024 · 425d2e1 · 425d2e1
2 parents 8120244 + 2228482
commit 425d2e1
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 6 deletions.
diff --git a/website/app/data-converter/pageClient.tsx b/website/app/data-converter/pageClient.tsx
@@ -52,7 +52,9 @@ const DataConverter = () => {
     queryKey: ["proxyUrl", proxyUrl, "address", address],
     queryFn: () => new Proxy(proxyUrl).getSerializableAccount(address),
   });
-  const addressMainnetState = JSON.stringify(query.data, null, 2);
+  const addressMainnetState = query.data
+    ? JSON.stringify(query.data, null, 2)
+    : undefined;
 
   return (
     <Box maxW="breakpoint-2xl" mx="auto" px="4">
@@ -102,8 +104,10 @@ const DataConverter = () => {
         </Clipboard.Trigger>
       </Clipboard.Root>
       <Box mb="8" />
-      <Box as="pre" overflow="auto">
-        {addressMainnetState}
+      <Box>
+        {addressMainnetState !== undefined
+          ? `Chars: ${addressMainnetState.length}`
+          : undefined}
       </Box>
       <Box mb="8" />
     </Box>

diff --git a/xsuite-fullsimulnet/build-binary.mjs b/xsuite-fullsimulnet/build-binary.mjs
@@ -10,5 +10,5 @@ if (process.env.CI) {
   ]);
 }
 
-await $`GOBIN="$(pwd)" go install -ldflags ${argv.ldflags} github.com/multiversx/mx-chain-simulator-go/cmd/chainsimulator@v1.8.4-fix1`;
+await $`GOBIN="$(pwd)" go install -ldflags ${argv.ldflags} github.com/multiversx/mx-chain-simulator-go/cmd/chainsimulator@v1.8.6`;
 await $`mv ./chainsimulator ../xsuite-fullsimulnet-${argv.os}-${argv.arch}/bin/fsproxy`;
diff --git a/xsuite-fullsimulnet/config/nodeOverride.toml b/xsuite-fullsimulnet/config/nodeOverride.toml
@@ -12,6 +12,7 @@
 OverridableConfigTomlValues = [
     { File = "config.toml", Path = "VirtualMachine.Execution.WasmVMVersions", Value = [{ StartEpoch = 0, Version = "v1.5" }] },
     { File = "config.toml", Path = "VirtualMachine.Querying.WasmVMVersions", Value = [{ StartEpoch = 0, Version = "v1.5" }] },
+    { File = "economics.toml", Path = "FeeSettings.MinGasPrice", Value = "0"},
     { File = "enableEpochs.toml", Path = "EnableEpochs.SCDeployEnableEpoch", Value = 0 },
     { File = "enableEpochs.toml", Path = "EnableEpochs.BuiltInFunctionsEnableEpoch", Value = 0 },
     { File = "enableEpochs.toml", Path = "EnableEpochs.RelayedTransactionsEnableEpoch", Value = 0 },

diff --git a/xsuite/src/world/fsworld.test.ts b/xsuite/src/world/fsworld.test.ts
@@ -43,6 +43,21 @@ test.concurrent("FSWorld.start - epoch, round, nonce", async () => {
   });
 });
 
+test.concurrent("FSWorld.start - gasPrice 0", async () => {
+  using world = await FSWorld.start({ gasPrice: 0 });
+  const wallet = await world.createWallet({
+    balance: 10n ** 18n,
+  });
+  await wallet.transfer({
+    receiver: wallet,
+    value: 1,
+    gasLimit: 50_000,
+  });
+  assertAccount(await wallet.getAccount(), {
+    balance: 10n ** 18n,
+  });
+});
+
 test.concurrent("FSWorld.proxy.blockNonce", async () => {
   using world = await FSWorld.start();
   const wallet = await world.createWallet({
@@ -52,11 +67,11 @@ test.concurrent("FSWorld.proxy.blockNonce", async () => {
     balance: 2n * 10n ** 18n,
   });
   world.proxy.blockNonce = 2;
-  assertAccount(await world.getAccount(wallet), {
+  assertAccount(await wallet.getAccount(), {
     balance: 10n ** 18n,
   });
   world.proxy.blockNonce = undefined;
-  assertAccount(await world.getAccount(wallet), {
+  assertAccount(await wallet.getAccount(), {
     balance: 2n * 10n ** 18n,
   });
 });