update tracing output (#739)

AcalaNetwork · Apr 17, 2024 · ea723e8 · ea723e8
1 parent e876e63
commit ea723e8
Show file tree

Hide file tree

Showing 10 changed files with 650 additions and 10 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -108,7 +108,7 @@ jobs:
         run: npx playwright install --with-deps
       - name: Run Playwright tests
         run: yarn workspace web-test run test
-      - uses: actions/upload-artifact@v3
+      - uses: actions/upload-artifact@v4
         if: always()
         with:
           name: playwright-report

diff --git a/executor/package.json b/executor/package.json
@@ -1,7 +1,7 @@
 {
 	"name": "@acala-network/chopsticks-executor",
 	"description": "Chopsticks executor",
-	"version": "0.10.0",
+	"version": "0.10.1",
 	"license": "Apache-2.0",
 	"type": "module",
 	"repository": {

diff --git a/packages/chopsticks/package.json b/packages/chopsticks/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@acala-network/chopsticks",
-	"version": "0.10.0",
+	"version": "0.10.1",
 	"author": "Acala Developers <hello@acala.network>",
 	"license": "Apache-2.0",
 	"bin": "./chopsticks.cjs",

diff --git a/.../chopsticks/src/plugins/trace-transaction/__tests__/__snapshots__/trace-call.test.ts.snap b/.../chopsticks/src/plugins/trace-transaction/__tests__/__snapshots__/trace-call.test.ts.snap
diff --git a/packages/chopsticks/src/plugins/trace-transaction/types.ts b/packages/chopsticks/src/plugins/trace-transaction/types.ts
@@ -13,9 +13,33 @@ export type CallTrace = {
   error: string | null
   revertReason: string | null
   depth: number
+  logs: LogTrace[]
   calls: CallTrace[]
 }
 
+export type LogTrace =
+  | {
+      log: {
+        address: HexString
+        topics: HexString[]
+        data: HexString
+      }
+    }
+  | {
+      sLoad: {
+        address: HexString
+        index: HexString
+        value: HexString
+      }
+    }
+  | {
+      sStore: {
+        address: HexString
+        index: HexString
+        value: HexString
+      }
+    }
+
 export type Step = {
   op: number
   pc: number
@@ -53,6 +77,28 @@ export const registerTypes = (registry: Registry) => {
         SUICIDE: null,
       },
     },
+    Log: {
+      address: 'H160',
+      topics: 'Vec<H256>',
+      data: 'Bytes',
+    },
+    SLoad: {
+      address: 'H160',
+      index: 'H256',
+      value: 'H256',
+    },
+    SStore: {
+      address: 'H160',
+      index: 'H256',
+      value: 'H256',
+    },
+    LogTrace: {
+      _enum: {
+        Log: 'Log',
+        SLoad: 'SLoad',
+        SStore: 'SStore',
+      },
+    },
     CallTrace: {
       type: 'CallType',
       from: 'H160',
@@ -65,6 +111,7 @@ export const registerTypes = (registry: Registry) => {
       error: 'Option<String>',
       revertReason: 'Option<String>',
       depth: 'Compact<u32>',
+      logs: 'Vec<LogTrace>',
       calls: 'Vec<CallTrace>',
     },
     TraceOutcome: {

diff --git a/packages/core/package.json b/packages/core/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@acala-network/chopsticks-core",
-	"version": "0.10.0",
+	"version": "0.10.1",
 	"author": "Acala Developers <hello@acala.network>",
 	"license": "Apache-2.0",
 	"type": "module",

diff --git a/packages/core/src/blockchain/inherent/parachain/validation-data.ts b/packages/core/src/blockchain/inherent/parachain/validation-data.ts
@@ -113,9 +113,12 @@ export class SetValidationData implements InherentProvider {
       extrinsic.relayChainState.trieNodes,
     )
 
-    const slotIncrease = (meta.consts.timestamp.minimumPeriod as any as BN)
-      .divn(3000) // relaychain min period
-      .toNumber()
+    const slotIncrease = Math.max(
+      1,
+      (meta.consts.timestamp.minimumPeriod as any as BN)
+        .divn(3000) // relaychain min period
+        .toNumber(),
+    )
 
     for (const key of Object.values(WELL_KNOWN_KEYS)) {
       if (key === WELL_KNOWN_KEYS.CURRENT_SLOT) {

diff --git a/packages/db/package.json b/packages/db/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@acala-network/chopsticks-db",
-	"version": "0.10.0",
+	"version": "0.10.1",
 	"author": "Acala Developers <hello@acala.network>",
 	"license": "Apache-2.0",
 	"type": "module",

diff --git a/packages/testing/package.json b/packages/testing/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@acala-network/chopsticks-testing",
-	"version": "0.10.0",
+	"version": "0.10.1",
 	"author": "Acala Developers <hello@acala.network>",
 	"license": "Apache-2.0",
 	"type": "module",

diff --git a/packages/utils/package.json b/packages/utils/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@acala-network/chopsticks-utils",
-	"version": "0.10.0",
+	"version": "0.10.1",
 	"author": "Acala Developers <hello@acala.network>",
 	"license": "Apache-2.0",
 	"type": "module",