Update

Author: pgherveou

benchmark/contracts.ts

@@ -1,9 +1,9 @@
 #!/usr/bin/env -S deno run --env-file --allow-all
-import { Hex } from 'viem'
 import { deploy as deployContract, env } from '../tools/lib/index.ts'
-import { Abis, abis } from '../codegen/abis.ts'
+import { abis } from '../codegen/abis.ts'
 import { logger } from '../utils/logger.ts'
 import {
+    Artifacts,
     build,
     deleteChainData,
     deploy,
@@ -14,37 +14,31 @@ import {
 } from './lib.ts'
 import { parseArgs } from '@std/cli'
 
-export const contracts = [
+export const contracts: Artifacts = [
     {
         id: 'Fibonacci',
         srcs: [
             ink('fibonacci'),
             rust('fibonacci'),
             ...solidity('fibonacci.sol', 'Fibonacci'),
         ],
-        deploy: async (
-            id: keyof Abis,
-            name: string,
-            bytecode: Hex,
-        ): Promise<Hex> => {
-            const receipt = await deployContract({
+        deploy: (id, name, bytecode) => {
+            return deployContract({
                 name: { id, name },
                 bytecode,
                 args: [],
             })
-            return receipt.transactionHash!
         },
         calls: [
             {
                 name: 'fib_10',
-                exec: async (address: Hex): Promise<Hex> => {
-                    const { request } = await env.wallet.simulateContract({
+                exec: async (address) => {
+                    return await env.wallet.writeContract({
                         address,
                         abi: abis.Fibonacci,
                         functionName: 'fibonacci',
                         args: [10],
                     })
-                    return await env.wallet.writeContract(request)
                 },
             },
         ],
@@ -56,23 +50,18 @@ export const contracts = [
             rust('simple_token_no_alloc'),
             ...solidity('simple_token.sol', 'SimpleToken'),
         ],
-        deploy: async (
-            id: keyof Abis,
-            name: string,
-            bytecode: Hex,
-        ): Promise<Hex> => {
-            const receipt = await deployContract({
+        deploy: (id, name, bytecode) => {
+            return deployContract({
                 name: { id, name },
                 bytecode,
                 args: [],
             })
-            return receipt.transactionHash!
         },
         calls: [
             {
                 name: 'mint',
-                exec: async (address: Hex): Promise<Hex> => {
-                    const { request } = await env.wallet.simulateContract({
+                exec: (address) => {
+                    return env.wallet.writeContract({
                         address,
                         abi: abis.SimpleToken,
                         functionName: 'mint',
@@ -81,7 +70,6 @@ export const contracts = [
                             10_000_000_000_000_000_000_000_000n,
                         ],
                     })
-                    return await env.wallet.writeContract(request)
                 },
             },
         ],

benchmark/lib.ts

@@ -1,4 +1,4 @@
-import { Hex } from 'viem'
+import { Hex, TransactionReceipt } from 'viem'
 import { env } from '../tools/lib/index.ts'
 import { Abis } from '../codegen/abis.ts'
 import { readBytecode } from '../utils/index.ts'
@@ -149,7 +149,11 @@ export function rust(name: string): ContractInfo {
 export type Artifacts = Array<{
     id: string
     srcs: ContractInfo[]
-    deploy: (id: keyof Abis, name: string, bytecode: Hex) => Promise<Hex>
+    deploy: (
+        id: keyof Abis,
+        name: string,
+        bytecode: Hex,
+    ) => Promise<TransactionReceipt>
     calls: Array<{
         name: string
         exec: (address: Hex) => Promise<Hex>
@@ -194,13 +198,18 @@ export async function deploy(contracts: Artifacts) {
             const contract = src.getName()
             logger.debug(`Deploying ${contract}...`)
 
-            const hash = await artifact.deploy(
+            const receipt = await artifact.deploy(
                 artifact.id as keyof Abis,
                 contract,
                 src.getBytecode(),
             )
 
-            await updateStats(artifact.id, contract, 'deploy', hash)
+            await updateStats(
+                artifact.id,
+                contract,
+                'deploy',
+                receipt.transactionHash,
+            )
         }
     }
 }

cli/playground.ts

@@ -2,15 +2,15 @@
 
 import { env } from '../tools/lib/index.ts'
 import { abis } from '../codegen/abis.ts'
-import { EnumTest } from '../codegen/addresses.ts'
+import { Storage } from '../codegen/addresses.ts'
 
 {
-    const result = await env.wallet.readContract(
+    const result = await env.wallet.writeContract(
         {
-            address: EnumTest,
-            abi: abis.EnumTest,
-            functionName: 'callTestEnum',
-            args: [2],
+            address: Storage,
+            abi: abis.Storage,
+            functionName: 'store',
+            args: [42n],
         },
     )
 

contracts/bug.sol

@@ -20,18 +20,8 @@ import { deploy } from './lib/index.ts'
 //     args: [],
 // })
 
-// await deploy({
-//     name: 'Storage',
-//     args: [],
-//     bytecodeType: 'polkavm', // Specify `pvm` for PVM bytecode deployment
-// })
-await deploy({
-    name: 'EnumTestChild',
-    args: [],
-    bytecodeType: 'polkavm', // Specify `pvm` for PVM bytecode deployment
-})
 await deploy({
-    name: 'EnumTest',
+    name: 'Storage',
     args: [],
-    bytecodeType: 'polkavm', // Specify `pvm` for PVM bytecode deployment
+    // bytecodeType: 'polkavm', // Specify `pvm` for PVM bytecode deployment
 })