@btc-vision/btc-runtime 1.7.3 → 1.8.1

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@btc-vision/btc-runtime",
-    "version": "1.7.3",
+    "version": "1.8.1",
     "description": "Bitcoin Smart Contract Runtime",
     "main": "btc/index.ts",
     "scripts": {},
@@ -17,8 +17,8 @@
     "author": "BlobMaster41",
     "license": "MIT",
     "devDependencies": {
-        "@types/node": "^22.15.27",
-        "assemblyscript": "^0.28.1"
+        "@types/node": "^24.0.3",
+        "assemblyscript": "^0.28.2"
     },
     "repository": {
         "type": "git",
@@ -35,13 +35,13 @@
         "test/*.ts"
     ],
     "dependencies": {
-        "@assemblyscript/loader": "^0.28.1",
+        "@assemblyscript/loader": "^0.28.2",
         "@btc-vision/as-bignum": "^0.0.5",
-        "@btc-vision/opnet-transform": "^0.1.4",
-        "@eslint/js": "^9.27.0",
+        "@btc-vision/opnet-transform": "^0.1.6",
+        "@eslint/js": "^9.29.0",
         "gulplog": "^2.2.0",
         "ts-node": "^10.9.2",
         "typescript": "^5.8.3",
-        "typescript-eslint": "^8.33.0"
+        "typescript-eslint": "^8.35.0"
     }
 }

package/runtime/abort/abort.ts

@@ -1,22 +1,19 @@
-import { DataView } from 'dataview';
-import { ArrayBuffer } from 'arraybuffer';
 import { env_exit } from '../env/global';
 
 export function revertOnError(message: string, fileName: string, line: u32, column: u32): void {
     const selector = 0x63739d5c; // Error(string)
 
     const revertMessage = `${message} at ${fileName}:${line}:${column}`;
+    const revertMessageBytes = Uint8Array.wrap(String.UTF8.encode(revertMessage));
 
-    const length = revertMessage.length;
-
-    const arrayBuffer = new ArrayBuffer(4 + length + 4);
+    const arrayBuffer = new ArrayBuffer(4 + revertMessageBytes.length + 4);
     const writer = new DataView(arrayBuffer);
 
     writer.setUint32(0, selector, false);
-    writer.setUint32(4, length, false);
+    writer.setUint32(4, revertMessageBytes.length, false);
 
-    for (let i = 0; i < length; i++) {
-        writer.setUint8(8 + i, <u8>revertMessage.charCodeAt(i));
+    for (let i = 0; i < revertMessageBytes.length; i++) {
+        writer.setUint8(8 + i, revertMessageBytes[i]);
     }
 
     env_exit(1, arrayBuffer, arrayBuffer.byteLength);

package/runtime/buffer/BytesWriter.ts

@@ -253,7 +253,6 @@ export class BytesWriter {
         }
     }
 
-    @inline
     public writeBytesU8Array(value: u8[]): void {
         this.allocSafe(value.length);
         for (let i = 0; i < value.length; i++) {
@@ -275,9 +274,14 @@ export class BytesWriter {
     }
 
     public writeString(value: string): void {
-        for (let i: i32 = 0; i < value.length; i++) {
-            this.writeU8(u8(value.charCodeAt(i)));
-        }
+        const bytes = String.UTF8.encode(value);
+        this.writeBytes(Uint8Array.wrap(bytes));
+    }
+
+    public writeStringWithLength(value: string): void {
+        const bytes = String.UTF8.encode(value);
+        this.writeU32(bytes.byteLength);
+        this.writeBytes(Uint8Array.wrap(bytes));
     }
 
     public writeAddress(value: Address): void {
@@ -285,11 +289,6 @@ export class BytesWriter {
         this.writeBytes(bytes);
     }
 
-    public writeStringWithLength(value: string): void {
-        this.writeU32(u32(value.length));
-        this.writeString(value);
-    }
-
     /**
      * Equivalent to TS’s writeAddressValueTuple, except specialized for u256 values.
      */

package/runtime/contracts/DeployableOP_20.ts

@@ -106,7 +106,7 @@ export abstract class DeployableOP_20 extends OP_NET implements IOP_20 {
     @method('name')
     @returns({ name: 'name', type: ABIDataTypes.STRING })
     public fn_name(_: Calldata): BytesWriter {
-        const w = new BytesWriter(this.name.length + 4);
+        const w = new BytesWriter(String.UTF8.byteLength(this.name) + 4);
         w.writeStringWithLength(this.name);
         return w;
     }
@@ -114,7 +114,7 @@ export abstract class DeployableOP_20 extends OP_NET implements IOP_20 {
     @method('symbol')
     @returns({ name: 'symbol', type: ABIDataTypes.STRING })
     public fn_symbol(_: Calldata): BytesWriter {
-        const w = new BytesWriter(this.symbol.length + 4);
+        const w = new BytesWriter(String.UTF8.byteLength(this.symbol) + 4);
         w.writeStringWithLength(this.symbol);
         return w;
     }

package/runtime/env/BlockchainEnvironment.ts

@@ -108,6 +108,26 @@ export class BlockchainEnvironment {
         return this._contractAddress as Address;
     }
 
+    public _chainId: Potential<Uint8Array> = null;
+
+    public get chainId(): Uint8Array {
+        if (!this._chainId) {
+            throw new Revert('Chain id is required');
+        }
+
+        return this._chainId as Uint8Array;
+    }
+
+    public _protocolId: Potential<Uint8Array> = null;
+
+    public get protocolId(): Uint8Array {
+        if (!this._protocolId) {
+            throw new Revert('Protocol id is required');
+        }
+
+        return this._protocolId as Uint8Array;
+    }
+
     public registerPlugin(plugin: Plugin): void {
         this._plugins.push(plugin);
     }
@@ -154,11 +174,15 @@ export class BlockchainEnvironment {
         const contractDeployer = reader.readAddress();
         const caller = reader.readAddress();
         const origin = reader.readAddress();
+        const chainId = reader.readBytes(32);
+        const protocolId = reader.readBytes(32);
 
         this._tx = new Transaction(caller, origin, txId, txHash);
 
         this._contractDeployer = contractDeployer;
         this._contractAddress = contractAddress;
+        this._chainId = chainId;
+        this._protocolId = protocolId;
 
         this._block = new Block(blockHash, blockNumber, blockMedianTime);
 
@@ -191,7 +215,7 @@ export class BlockchainEnvironment {
     }
 
     public log(data: string): void {
-        const writer = new BytesWriter(data.length + 2);
+        const writer = new BytesWriter(String.UTF8.byteLength(data));
         writer.writeString(data);
 
         const buffer = writer.getBuffer();
@@ -200,7 +224,7 @@ export class BlockchainEnvironment {
 
     public emit(event: NetEvent): void {
         const data = event.getEventData();
-        const writer = new BytesWriter(event.eventType.length + 8 + data.byteLength);
+        const writer = new BytesWriter(String.UTF8.byteLength(event.eventType) + 8 + data.byteLength);
 
         writer.writeStringWithLength(event.eventType);
         writer.writeBytesWithLength(data);
@@ -209,7 +233,7 @@ export class BlockchainEnvironment {
     }
 
     public validateBitcoinAddress(address: string): bool {
-        const writer = new BytesWriter(address.length);
+        const writer = new BytesWriter(String.UTF8.byteLength(address));
         writer.writeString(address);
 
         const result = validateBitcoinAddress(writer.getBuffer().buffer, address.length);

package/runtime/env/classes/Transaction.ts

@@ -14,7 +14,8 @@ export class Transaction {
         public readonly origin: Address, // "leftmost thing in the call chain"
         public readonly txId: Uint8Array,
         public readonly hash: Uint8Array,
-    ) {}
+    ) {
+    }
 
     private _inputs: Potential<TransactionInput[]> = null;
 
@@ -44,7 +45,7 @@ export class Transaction {
 
     private loadInputs(): TransactionInput[] {
         const inputsSize = getInputsSize();
-        let resultBuffer = new ArrayBuffer(inputsSize);
+        const resultBuffer = new ArrayBuffer(inputsSize);
         inputs(resultBuffer);
 
         const reader = new BytesReader(Uint8Array.wrap(resultBuffer));
@@ -53,7 +54,7 @@ export class Transaction {
 
     private loadOutputs(): TransactionOutput[] {
         const outputsSize = getOutputsSize();
-        let resultBuffer = new ArrayBuffer(outputsSize);
+        const resultBuffer = new ArrayBuffer(outputsSize);
         outputs(resultBuffer);
 
         const reader = new BytesReader(Uint8Array.wrap(resultBuffer));

package/runtime/exports/index.ts

@@ -5,7 +5,7 @@ import { Selector } from '../math/abi';
 import { Calldata } from '../types';
 import { env_exit, getCalldata, getEnvironmentVariables } from '../env/global';
 
-const ENVIRONMENT_VARIABLES_BYTE_LENGTH: u32 = 240;
+const ENVIRONMENT_VARIABLES_BYTE_LENGTH: u32 = 304;
 
 export function execute(calldataLength: u32): u32 {
     const environmentVariablesBuffer = new ArrayBuffer(ENVIRONMENT_VARIABLES_BYTE_LENGTH);