@btc-vision/btc-runtime 1.1.1 → 1.1.2

package/package.json

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

package/runtime/contracts/DeployableOP_20.ts

@@ -90,7 +90,7 @@ export abstract class DeployableOP_20 extends OP_NET implements IOP_20 {
     }
 
     public instantiate(params: OP20InitParameters, skipOwnerVerification: boolean = false): void {
-        if (!skipOwnerVerification) this.onlyOwner(Blockchain.from());
+        if (!skipOwnerVerification) this.onlyOwner(Blockchain.origin());
 
         if (!this._maxSupply.value.isZero()) {
             throw new Revert('Already initialized');
@@ -125,7 +125,7 @@ export abstract class DeployableOP_20 extends OP_NET implements IOP_20 {
         const resp = this._approve(spender, value);
         response.writeBoolean(resp);
 
-        this.createApproveEvent(Blockchain.from(), spender, value);
+        this.createApproveEvent(Blockchain.origin(), spender, value);
 
         return response;
     }
@@ -234,7 +234,7 @@ export abstract class DeployableOP_20 extends OP_NET implements IOP_20 {
     }
 
     protected _approve(spender: Address, value: u256): boolean {
-        const callee = Blockchain.from();
+        const callee = Blockchain.origin();
 
         const senderMap = this.allowanceMap.get(callee);
         senderMap.set(spender, value);
@@ -254,7 +254,7 @@ export abstract class DeployableOP_20 extends OP_NET implements IOP_20 {
             throw new Revert(`No tokens`);
         }
 
-        const callee = Blockchain.from();
+        const callee = Blockchain.origin();
         const caller = Blockchain.sender();
 
         if (onlyOwner) this.onlyOwner(callee); // only indexers can burn tokens
@@ -276,7 +276,7 @@ export abstract class DeployableOP_20 extends OP_NET implements IOP_20 {
     }
 
     protected _mint(to: Address, value: u256, onlyOwner: boolean = true): boolean {
-        const callee = Blockchain.from();
+        const callee = Blockchain.origin();
 
         if (onlyOwner) this.onlyOwner(callee);
 
@@ -299,7 +299,7 @@ export abstract class DeployableOP_20 extends OP_NET implements IOP_20 {
     }
 
     protected _transfer(to: string, value: u256): boolean {
-        const caller = Blockchain.from();
+        const caller = Blockchain.origin();
 
         if (!this.balanceOfMap.has(caller)) throw new Revert();
         if (this.isSelf(caller)) throw new Revert('Can not transfer from self account');
@@ -355,7 +355,7 @@ export abstract class DeployableOP_20 extends OP_NET implements IOP_20 {
     }
 
     protected _transferFrom(from: Address, to: Address, value: u256): boolean {
-        const spender = Blockchain.from();
+        const spender = Blockchain.origin();
         if (Blockchain.sender() !== from) {
             throw new Revert('Not caller.');
         }

package/runtime/env/BTCEnvironment.ts

@@ -32,7 +32,7 @@ export class BlockchainEnvironment {
     private storage: PointerStorage = new MapU256();
     private events: NetEvent[] = [];
 
-    private _from: PotentialAddress = null;
+    private _origin: PotentialAddress = null;
     private _sender: PotentialAddress = null;
     private currentBlock: u256 = u256.Zero;
 
@@ -98,12 +98,12 @@ export class BlockchainEnvironment {
         return this.currentBlock.toU64();
     }
 
-    public from(): Address {
-        if (!this._from) {
+    public origin(): Address {
+        if (!this._origin) {
             throw this.error('Callee is required');
         }
 
-        return this._from as Address;
+        return this._origin as Address;
     }
 
     public sender(): Address {
@@ -118,7 +118,7 @@ export class BlockchainEnvironment {
         const reader: BytesReader = new BytesReader(data);
 
         this._sender = reader.readAddress();
-        this._from = reader.readAddress();
+        this._origin = reader.readAddress();
         this.currentBlock = reader.readU256();
 
         this._owner = reader.readAddress();
@@ -128,7 +128,7 @@ export class BlockchainEnvironment {
     }
 
     public call(destinationContract: Address, calldata: BytesWriter): BytesReader {
-        if (destinationContract === this._from) {
+        if (destinationContract === this._origin) {
             throw this.error('Cannot call self');
         }