mleku/warp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: wasm access to SmartWeave env, feat: proper logging from WASM

Browse Source
This commit is contained in:
ppedziwiatr
2022-02-19 14:13:22 +01:00
committed by Piotr Pędziwiatr
parent ad1bed08f6
commit 20525ed66a
4 changed files with 14 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
src/__tests__/integration/data/wasm/counter.wasm
View File

Binary file not shown.

1
src/__tests__/integration/wasm-deploy-write-read.test.ts
View File

@@ -37,6 +37,7 @@ describe('Testing the SmartWeave client for WASM contract', () => {
LoggerFactory.INST.logLevel('error');
LoggerFactory.INST.logLevel('debug', 'WasmContractHandlerApi');
LoggerFactory.INST.logLevel('debug', 'WASM');
smartweave = SmartWeaveNodeFactory.memCached(arweave);

3
src/core/modules/impl/WasmContractHandlerApi.ts
View File

@@ -34,9 +34,6 @@ export class WasmContractHandlerApi<State> implements HandlerApi<State> {
currentResult: EvalStateResult<State>,
interactionData: InteractionData<Input>
): Promise<InteractionResult<State, Result>> {
const contractLogger = LoggerFactory.INST.create('Contract');
try {
const {interaction, interactionTx, currentTx} = interactionData;

25
src/core/modules/impl/wasmImports.ts
View File

@@ -1,6 +1,7 @@
import {SmartWeaveGlobal} from "@smartweave";
import {LoggerFactory, SmartWeaveGlobal} from "@smartweave";
export const imports = (swGlobal: SmartWeaveGlobal, wasmModule: any): any => {
const wasmLogger = LoggerFactory.INST.create('WASM');
return {
metering: {
usegas: (gas) => {
@@ -15,45 +16,45 @@ export const imports = (swGlobal: SmartWeaveGlobal, wasmModule: any): any => {
},
console: {
"console.log": function (msgPtr) {
console.log(`Contract: ${wasmModule.exports.__getString(msgPtr)}`);
wasmLogger.debug(`${swGlobal.contract.id}: ${wasmModule.exports.__getString(msgPtr)}`);
},
"console.logO": function (msgPtr, objPtr) {
console.log(`Contract: ${wasmModule.exports.__getString(msgPtr)}`, JSON.parse(wasmModule.exports.__getString(objPtr)));
wasmLogger.debug(`${swGlobal.contract.id}: ${wasmModule.exports.__getString(msgPtr)}`, JSON.parse(wasmModule.exports.__getString(objPtr)));
},
},
block: {
"Block.height": function () {
return 875290;
return swGlobal.block.height;
},
"Block.indep_hash": function () {
return wasmModule.exports.__newString("iIMsQJ1819NtkEUEMBRl6-7I6xkeDipn1tK4w_cDFczRuD91oAZx5qlgSDcqq1J1");
return wasmModule.exports.__newString(swGlobal.block.indep_hash);
},
"Block.timestamp": function () {
return 123123123;
return swGlobal.block.timestamp;
},
},
transaction: {
"Transaction.id": function () {
return wasmModule.exports.__newString("Transaction.id");
return wasmModule.exports.__newString(swGlobal.transaction.id);
},
"Transaction.owner": function () {
return wasmModule.exports.__newString("Transaction.owner");
return wasmModule.exports.__newString(swGlobal.transaction.owner);
},
"Transaction.target": function () {
return wasmModule.exports.__newString("Transaction.target");
return wasmModule.exports.__newString(swGlobal.transaction.target);
},
},
contract: {
"Contract.id": function () {
return wasmModule.exports.__newString("Contract.id");
return wasmModule.exports.__newString(swGlobal.contract.id);
},
"Contract.owner": function () {
return wasmModule.exports.__newString("Contract.owner");
return wasmModule.exports.__newString(swGlobal.contract.owner);
},
},
msg: {
"msg.sender": function () {
return wasmModule.exports.__newString("msg.sender");
return wasmModule.exports.__newString(swGlobal.transaction.owner);
},
},
api: {