@btc-vision/btc-runtime 1.3.3 → 1.3.5

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@btc-vision/btc-runtime",
-    "version": "1.3.3",
+    "version": "1.3.5",
     "description": "Bitcoin Smart Contract Runtime",
     "main": "btc/index.ts",
     "scripts": {
@@ -44,7 +44,7 @@
     "dependencies": {
         "@assemblyscript/loader": "^0.27.30",
         "@eslint/js": "^9.10.0",
-        "as-bignum": "^0.3.0",
+        "as-bignum": "^0.3.1",
         "gulplog": "^2.2.0",
         "mocha": "^10.7.3",
         "ts-node": "^10.9.2",

package/runtime/contracts/DeployableOP_20.ts

@@ -216,8 +216,12 @@ export abstract class DeployableOP_20 extends OP_NET implements IOP_20 {
     }
 
     protected _approve(owner: Address, spender: Address, value: u256): boolean {
-        if (owner === Blockchain.DEAD_ADDRESS || spender === Blockchain.DEAD_ADDRESS) {
-            throw new Revert('Cannot approve from or to dead address');
+        if (owner === Blockchain.DEAD_ADDRESS) {
+            throw new Revert('Address can not be dead address');
+        }
+
+        if (spender === Blockchain.DEAD_ADDRESS) {
+            throw new Revert('Spender cannot be dead address');
         }
 
         const senderMap = this.allowanceMap.get(owner);

package/runtime/contracts/OP_NET.ts

@@ -22,10 +22,6 @@ export class OP_NET implements IBTC {
         let response: BytesWriter;
 
         switch (method) {
-            case encodeSelector('address'):
-                response = new BytesWriter(ADDRESS_BYTE_LENGTH);
-                response.writeAddress(this.address);
-                break;
             case encodeSelector('owner'):
                 response = new BytesWriter(ADDRESS_BYTE_LENGTH);
                 response.writeAddress(this.owner);

package/runtime/env/BlockchainEnvironment.ts

@@ -17,6 +17,7 @@ import {
     loadPointer,
     log,
     storePointer,
+    validateBitcoinAddress,
 } from './global';
 import { DeployContractResponse } from '../interfaces/DeployContractResponse';
 import { MapU256 } from '../generic/MapU256';
@@ -162,6 +163,14 @@ export class BlockchainEnvironment {
         emit(buffer.getBuffer());
     }
 
+    public validateBitcoinAddress(address: string): bool {
+        const writer = new BytesWriter(address.length);
+        writer.writeString(address);
+
+        const reader = new BytesReader(validateBitcoinAddress(writer.getBuffer()));
+        return reader.readBoolean();
+    }
+
     public encodeVirtualAddress(virtualAddress: u8[]): Address {
         const writer: BytesWriter = new BytesWriter(virtualAddress.length + 4);
         writer.writeU32(virtualAddress.length);

package/runtime/env/global.ts

@@ -38,6 +38,10 @@ export declare function sha256(data: Uint8Array): Uint8Array;
 @external('env', 'ripemd160')
 export declare function ripemd160(data: Uint8Array): Uint8Array;
 
+// @ts-ignore
+@external('env', 'validateBitcoinAddress')
+export declare function validateBitcoinAddress(data: Uint8Array): Uint8Array;
+
 // @ts-ignore
 @external('env', 'inputs')
 export declare function inputs(): Uint8Array;

package/runtime/memory/MultiAddressMemoryMap.ts

@@ -25,17 +25,6 @@ export class MultiAddressMemoryMap<V extends MemorySlotData<u256>> extends Map<
         return super.get(key);
     }
 
-    public setUpperKey(key: Address, key2: Address, value: V): this {
-        this.createKeyMerger(key);
-
-        const subMap = super.get(key);
-        if (subMap) {
-            subMap.set(key2, value);
-        }
-
-        return this;
-    }
-
     public set(key: Address, value: Uint8ArrayMerger<V>): this {
         this.createKeyMerger(key);