@btc-vision/btc-runtime 1.9.11 → 1.9.12

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@btc-vision/btc-runtime",
-    "version": "1.9.11",
+    "version": "1.9.12",
     "description": "Bitcoin Smart Contract Runtime",
     "main": "btc/index.ts",
     "scripts": {

package/runtime/contracts/OP20.ts

@@ -402,7 +402,7 @@ export abstract class OP20 extends ReentrancyGuard implements IOP20 {
         return senderMap.get(spender);
     }
 
-    protected _transfer(from: Address, to: Address, amount: u256, emitEvent: boolean = true): void {
+    protected _transfer(from: Address, to: Address, amount: u256): void {
         if (from === Address.zero() || from === Address.dead()) {
             throw new Revert('Invalid sender');
         }
@@ -421,22 +421,17 @@ export abstract class OP20 extends ReentrancyGuard implements IOP20 {
         const toBal: u256 = this.balanceOfMap.get(to);
         this.balanceOfMap.set(to, SafeMath.add(toBal, amount));
 
-        if (emitEvent) {
-            this.createTransferredEvent(Blockchain.tx.sender, from, to, amount);
-        }
+        this.createTransferredEvent(Blockchain.tx.sender, from, to, amount);
     }
 
     protected _safeTransfer(from: Address, to: Address, amount: u256, data: Uint8Array): void {
-        this._transfer(from,  to, amount, false);
+        this._transfer(from,  to, amount);
 
         if (Blockchain.isContract(to)) {
             // In CALLBACK mode, the guard allows depth up to 1
             // In STANDARD mode, the guard blocks all reentrancy
             this._callOnOP20Received(from, to, amount, data);
         }
-
-        // Fire event at the end if everything succeeded indicating a successful transfer
-        this.createTransferredEvent(Blockchain.tx.sender, from, to, amount);
     }
 
     protected _spendAllowance(owner: Address, spender: Address, amount: u256): void {

package/runtime/shared-libraries/TransferHelper.ts

@@ -10,6 +10,8 @@ import {
     U32_BYTE_LENGTH,
 } from '../utils';
 
+export const transferSignature = 'transfer(address,uint256)';
+export const transferFromSignature = 'transferFrom(address,address,uint256)';
 export const SafeTransferSignature = 'safeTransfer(address,uint256,bytes)';
 export const SafeTransferFromSignature = 'safeTransferFrom(address,address,uint256,bytes)';
 export const IncreaseAllowanceSignature = 'increaseAllowance(address,uint256)';
@@ -26,14 +28,22 @@ export class TransferHelper {
     }
 
     public static get TRANSFER_SELECTOR(): Selector {
-        return encodeSelector(SafeTransferSignature);
+        return encodeSelector(transferSignature);
     }
 
     public static get TRANSFER_FROM_SELECTOR(): Selector {
+        return encodeSelector(transferFromSignature);
+    }
+
+    public static get SAFE_TRANSFER_SELECTOR(): Selector {
+        return encodeSelector(SafeTransferSignature);
+    }
+
+    public static get SAFE_TRANSFER_FROM_SELECTOR(): Selector {
         return encodeSelector(SafeTransferFromSignature);
     }
 
-    public static safeIncreaseAllowance(token: Address, spender: Address, amount: u256): void {
+    public static increaseAllowance(token: Address, spender: Address, amount: u256): void {
         const calldata = new BytesWriter(
             SELECTOR_BYTE_LENGTH + ADDRESS_BYTE_LENGTH + U256_BYTE_LENGTH,
         );
@@ -44,7 +54,7 @@ export class TransferHelper {
         Blockchain.call(token, calldata);
     }
 
-    public static safeDecreaseAllowance(token: Address, spender: Address, amount: u256): void {
+    public static decreaseAllowance(token: Address, spender: Address, amount: u256): void {
         const calldata = new BytesWriter(
             SELECTOR_BYTE_LENGTH + ADDRESS_BYTE_LENGTH + U256_BYTE_LENGTH,
         );
@@ -55,6 +65,42 @@ export class TransferHelper {
         Blockchain.call(token, calldata);
     }
 
+    public static transfer(
+        token: Address,
+        to: Address,
+        amount: u256
+    ): void {
+        const calldata = new BytesWriter(
+            SELECTOR_BYTE_LENGTH +
+            ADDRESS_BYTE_LENGTH +
+            U256_BYTE_LENGTH
+        );
+        calldata.writeSelector(this.TRANSFER_SELECTOR);
+        calldata.writeAddress(to);
+        calldata.writeU256(amount);
+
+        Blockchain.call(token, calldata);
+    }
+
+    public static transferFrom(
+        token: Address,
+        from: Address,
+        to: Address,
+        amount: u256
+    ): void {
+        const calldata = new BytesWriter(
+            SELECTOR_BYTE_LENGTH +
+            ADDRESS_BYTE_LENGTH * 2 +
+            U256_BYTE_LENGTH
+        );
+        calldata.writeSelector(this.TRANSFER_FROM_SELECTOR);
+        calldata.writeAddress(from);
+        calldata.writeAddress(to);
+        calldata.writeU256(amount);
+
+        Blockchain.call(token, calldata);
+    }
+
     public static safeTransfer(
         token: Address,
         to: Address,
@@ -68,7 +114,7 @@ export class TransferHelper {
                 U32_BYTE_LENGTH +
                 data.length,
         );
-        calldata.writeSelector(this.TRANSFER_SELECTOR);
+        calldata.writeSelector(this.SAFE_TRANSFER_SELECTOR);
         calldata.writeAddress(to);
         calldata.writeU256(amount);
         calldata.writeBytesWithLength(data);
@@ -104,7 +150,7 @@ export class TransferHelper {
                 U32_BYTE_LENGTH +
                 data.length,
         );
-        calldata.writeSelector(this.TRANSFER_FROM_SELECTOR);
+        calldata.writeSelector(this.SAFE_TRANSFER_FROM_SELECTOR);
         calldata.writeAddress(from);
         calldata.writeAddress(to);
         calldata.writeU256(amount);