@btc-vision/btc-runtime 1.11.0-rc.9 → 1.11.0

package/docs/types/bytes-writer-reader.md

@@ -615,11 +615,11 @@ protected override encodeData(writer: BytesWriter): void {
 }
 ```
 
-## Solidity vs OPNet Comparison
+## Solidity vs OP_NET Comparison
 
 ### Encoding/Decoding Comparison Table
 
-| Feature | Solidity | OPNet |
+| Feature | Solidity | OP_NET |
 |---------|----------|-------|
 | **Encode function** | `abi.encode(...)` | `BytesWriter` methods |
 | **Decode function** | `abi.decode(data, (types))` | `BytesReader` methods |
@@ -632,7 +632,7 @@ protected override encodeData(writer: BytesWriter): void {
 
 ### Type Encoding Comparison
 
-| Solidity Encoding | OPNet Encoding |
+| Solidity Encoding | OP_NET Encoding |
 |-------------------|----------------|
 | `abi.encode(uint256)` | `writer.writeU256(value)` |
 | `abi.encode(uint128)` | `writer.writeU128(value)` |
@@ -659,12 +659,12 @@ bytes memory packed = abi.encodePacked(recipient, amount);
 ```
 
 ```typescript
-// OPNet
+// OP_NET
 const writer = new BytesWriter(64);  // 32 + 32 bytes
 writer.writeAddress(recipient);
 writer.writeU256(amount);
 const data: Uint8Array = writer.getBuffer();
-// OPNet encoding is similar to encodePacked (no padding)
+// OP_NET encoding is similar to encodePacked (no padding)
 ```
 
 #### Basic Decoding
@@ -675,7 +675,7 @@ const data: Uint8Array = writer.getBuffer();
 ```
 
 ```typescript
-// OPNet
+// OP_NET
 const reader = new BytesReader(data);
 const to: Address = reader.readAddress();
 const amount: u256 = reader.readU256();
@@ -696,7 +696,7 @@ function encodeTransferData(
 ```
 
 ```typescript
-// OPNet
+// OP_NET
 function encodeTransferData(
     from: Address,
     to: Address,
@@ -724,7 +724,7 @@ bytes memory callData = abi.encodeWithSignature("transfer(address,uint256)", to,
 ```
 
 ```typescript
-// OPNet
+// OP_NET
 const TRANSFER_SELECTOR: Selector = Selector.from("transfer(address,uint256)");
 const writer = new BytesWriter(68);  // 4 + 32 + 32
 writer.writeSelector(TRANSFER_SELECTOR);
@@ -745,7 +745,7 @@ function getInfo() public view returns (address, uint256, bool) {
 ```
 
 ```typescript
-// OPNet - Manual return encoding
+// OP_NET - Manual return encoding
 public getInfo(_calldata: Calldata): BytesWriter {
     const writer = new BytesWriter(65);  // 32 + 32 + 1
     writer.writeAddress(this._owner.value);
@@ -766,7 +766,7 @@ if (success) {
 ```
 
 ```typescript
-// OPNet
+// OP_NET
 const result = Blockchain.call(target, callData, true);
 if (result.success) {
     const reader = new BytesReader(result.data);
@@ -793,7 +793,7 @@ function encodeOrder(Order memory order) public pure returns (bytes memory) {
 ```
 
 ```typescript
-// OPNet
+// OP_NET
 class Order {
     maker: Address;
     taker: Address;
@@ -826,7 +826,7 @@ function _transfer(address from, address to, uint256 amount) internal {
 ```
 
 ```typescript
-// OPNet - Custom event class with manual encoding
+// OP_NET - Custom event class with manual encoding
 export class TransferEvent extends NetEvent {
     constructor(
         public readonly from: Address,
@@ -861,7 +861,7 @@ function extractAddress(bytes calldata data, uint offset) public pure returns (a
 ```
 
 ```typescript
-// OPNet
+// OP_NET
 function extractSelector(data: Uint8Array): Selector {
     const reader = new BytesReader(data);
     return reader.readSelector();
@@ -879,7 +879,7 @@ function extractAddress(data: Uint8Array, offset: u32): Address {
 
 ### Size Comparison (Encoding Overhead)
 
-| Data | Solidity abi.encode | Solidity encodePacked | OPNet |
+| Data | Solidity abi.encode | Solidity encodePacked | OP_NET |
 |------|---------------------|----------------------|-------|
 | `bool` | 32 bytes | 1 byte | 1 byte |
 | `uint8` | 32 bytes | 1 byte | 1 byte |
@@ -893,7 +893,7 @@ function extractAddress(data: Uint8Array, offset: u32): Address {
 
 ### Key Differences Summary
 
-| Aspect | Solidity | OPNet |
+| Aspect | Solidity | OP_NET |
 |--------|----------|-------|
 | **Encoding approach** | `abi.encode()` function | BytesWriter object methods |
 | **Decoding approach** | `abi.decode()` with type tuple | BytesReader sequential reads |
@@ -914,7 +914,7 @@ bytes memory encoded = abi.encode(addr, amount, flag);
 ```
 
 ```typescript
-// OPNet equivalent
+// OP_NET equivalent
 const writer = new BytesWriter(65);  // 32 + 32 + 1
 writer.writeAddress(addr);
 writer.writeU256(amount);
@@ -930,7 +930,7 @@ const encoded = writer.getBuffer();
 ```
 
 ```typescript
-// OPNet equivalent
+// OP_NET equivalent
 const reader = new BytesReader(data);
 const addr = reader.readAddress();
 const amount = reader.readU256();
@@ -949,7 +949,7 @@ bytes memory data = abi.encodeWithSelector(
 ```
 
 ```typescript
-// OPNet equivalent
+// OP_NET equivalent
 const TRANSFER_SELECTOR: Selector = Selector.from("transfer(address,uint256)");
 const writer = new BytesWriter(68);
 writer.writeSelector(TRANSFER_SELECTOR);

package/docs/types/calldata.md

@@ -235,11 +235,11 @@ Arrays use a u16 length prefix (max 65535 elements):
 |----------------------|-----------|-----------|-----|
 ```
 
-## Solidity vs OPNet Comparison
+## Solidity vs OP_NET Comparison
 
 ### Calldata Decoding Comparison Table
 
-| Feature | Solidity | OPNet |
+| Feature | Solidity | OP_NET |
 |---------|----------|-------|
 | **Parameter access** | Automatic (named parameters) | Manual sequential reading |
 | **Decode function** | `abi.decode(data, (T1, T2))` | `calldata.readT1(); calldata.readT2();` |
@@ -251,7 +251,7 @@ Arrays use a u16 length prefix (max 65535 elements):
 
 ### Type-by-Type Decoding Comparison
 
-| Solidity Decoding | OPNet Decoding |
+| Solidity Decoding | OP_NET Decoding |
 |-------------------|----------------|
 | `abi.decode(data, (uint256))` | `calldata.readU256()` |
 | `abi.decode(data, (uint128))` | `calldata.readU128()` |
@@ -282,7 +282,7 @@ function transfer(address to, uint256 amount) public returns (bool) {
 ```
 
 ```typescript
-// OPNet - Parameters read sequentially
+// OP_NET - Parameters read sequentially
 public transfer(calldata: Calldata): BytesWriter {
     // Must read in exact order they were encoded
     const to: Address = calldata.readAddress();
@@ -312,7 +312,7 @@ function transferFrom(
 ```
 
 ```typescript
-// OPNet
+// OP_NET
 public transferFrom(calldata: Calldata): BytesWriter {
     const from: Address = calldata.readAddress();
     const to: Address = calldata.readAddress();
@@ -344,7 +344,7 @@ function decodeWithOffset(bytes calldata data) public pure {
 ```
 
 ```typescript
-// OPNet - Sequential reading handles offset automatically
+// OP_NET - Sequential reading handles offset automatically
 public decodeTransfer(calldata: Calldata): BytesWriter {
     const to: Address = calldata.readAddress();      // Reads bytes 0-31
     const amount: u256 = calldata.readU256();        // Reads bytes 32-63
@@ -372,7 +372,7 @@ function processData(bytes calldata data) public {
 ```
 
 ```typescript
-// OPNet
+// OP_NET
 public setName(calldata: Calldata): BytesWriter {
     const name: string = calldata.readString();  // Length-prefixed
     if (name.length == 0) {
@@ -408,7 +408,7 @@ function batchTransfer(
 ```
 
 ```typescript
-// OPNet
+// OP_NET
 public batchTransfer(calldata: Calldata): BytesWriter {
     const recipients: Address[] = calldata.readAddressArray();
     const amounts: u256[] = calldata.readU256Array();
@@ -443,7 +443,7 @@ function safeTransferFrom(
 ```
 
 ```typescript
-// OPNet - Check for remaining data
+// OP_NET - Check for remaining data
 public safeTransferFrom(calldata: Calldata): BytesWriter {
     const from: Address = calldata.readAddress();
     const to: Address = calldata.readAddress();
@@ -466,7 +466,7 @@ public safeTransferFrom(calldata: Calldata): BytesWriter {
 
 ### Encoding Format Differences
 
-| Aspect | Solidity ABI | OPNet |
+| Aspect | Solidity ABI | OP_NET |
 |--------|--------------|-------|
 | **Byte order** | Big-endian | Big-endian (default) |
 | **Address padding** | Left-padded to 32 bytes | 32 bytes (native size) |
@@ -478,7 +478,7 @@ public safeTransferFrom(calldata: Calldata): BytesWriter {
 
 ### Encoding Size Comparison
 
-| Type | Solidity ABI Size | OPNet Size |
+| Type | Solidity ABI Size | OP_NET Size |
 |------|-------------------|------------|
 | `bool` | 32 bytes | 1 byte |
 | `uint8` | 32 bytes | 1 byte |
@@ -492,7 +492,7 @@ public safeTransferFrom(calldata: Calldata): BytesWriter {
 
 ### Key Differences Summary
 
-| Solidity | OPNet |
+| Solidity | OP_NET |
 |----------|-------|
 | Named parameters in function signature | Single `Calldata` parameter |
 | Automatic ABI decoding | Manual `read*()` methods |

package/package.json

@@ -1,10 +1,10 @@
 {
     "name": "@btc-vision/btc-runtime",
-    "version": "1.11.0-rc.9",
-    "description": "Bitcoin L1 Smart Contract Runtime for OPNet. Build decentralized applications on Bitcoin using AssemblyScript and WebAssembly. Fully audited.",
+    "version": "1.11.0",
+    "description": "Bitcoin L1 Smart Contract Runtime for OP_NET. Build decentralized applications on Bitcoin using AssemblyScript and WebAssembly. Fully audited.",
     "main": "btc/index.ts",
     "types": "btc/index.ts",
-    "author": "OPNet <support@opnet.org>",
+    "author": "OP_NET <support@opnet.org>",
     "license": "Apache-2.0",
     "homepage": "https://opnet.org",
     "repository": {
@@ -59,16 +59,16 @@
         "node": ">=24.0.0"
     },
     "dependencies": {
-        "@assemblyscript/loader": "^0.28.9",
-        "@btc-vision/as-bignum": "^0.1.2",
-        "@btc-vision/assemblyscript": "^0.29.2",
-        "@btc-vision/opnet-transform": "^1.2.0",
+        "@btc-vision/as-bignum": "^1.0.0",
+        "@btc-vision/as-loader": "^0.0.0",
+        "@btc-vision/assemblyscript": "^0.29.3",
+        "@btc-vision/opnet-transform": "^1.2.2",
         "@eslint/js": "^10.0.1",
-        "eslint": "^10.0.0",
+        "eslint": "^10.0.3",
         "gulplog": "^2.2.0",
         "ts-node": "^10.9.2",
         "typescript": "^5.9.3",
-        "typescript-eslint": "^8.56.0"
+        "typescript-eslint": "^8.57.1"
     },
     "devDependencies": {
         "@btc-vision/as-covers-assembly": "^0.4.4",
@@ -76,6 +76,6 @@
         "@btc-vision/as-pect-assembly": "^8.2.0",
         "@btc-vision/as-pect-cli": "^8.2.0",
         "@btc-vision/as-pect-transform": "^8.2.0",
-        "@types/node": "^25.2.3"
+        "@types/node": "^25.5.0"
     }
 }

package/runtime/constants/Exports.ts

@@ -16,39 +16,9 @@ export const ALLOWANCE_DECREASE_TYPE_HASH: u8[] = [
 // onOP721Received(address,address,uint256,bytes)
 export const ON_OP721_RECEIVED_SELECTOR: u32 = 0x5349f6de;
 
-// onOP1155Received(address,address,uint256,uint256,bytes)
-export const ON_OP1155_RECEIVED_MAGIC: u32 = 0xcedc9fdf;
-
-// onOP1155BatchReceived(address,address,uint256[],uint256[],bytes)
-export const ON_OP1155_BATCH_RECEIVED_MAGIC: u32 = 0x5d95545f;
-
-// Interface IDs
-// balanceOf(address,uint256) -> 0x7ab6c0bc
-// balanceOfBatch(address[],uint256[]) -> 0xed4db4b0
-// safeTransferFrom(address,address,uint256,uint256,bytes) -> 0x0875aead
-// safeBatchTransferFrom(address,address,uint256[],uint256[],bytes) -> 0x1917c486
-// setApprovalForAll(address,bool) -> 0xd97fb4c0
-// isApprovedForAll(address,address) -> 0x67da1fb2
-export const INTERFACE_ID_OP1155: u32 = 0x383cb555;
-
-// sha256("uri(uint256)")
-export const INTERFACE_ID_OP1155_METADATA_URI: u32 = 0x31473f54;
-
 // sha256("supportsInterface(bytes4)")
 export const INTERFACE_ID_ERC165: u32 = 0x0e2b7fe2;
 
-// OP1155Transfer(address from,address to,uint256 id,uint256 amount,uint256 nonce,uint64 deadline)
-export const OP1155_TRANSFER_TYPE_HASH: u8[] = [
-    0x5a, 0x64, 0x2c, 0xa2, 0xd8, 0xfd, 0xe9, 0xe1, 0x28, 0x87, 0x7c, 0xf5, 0x5d, 0x71, 0x96, 0xe3,
-    0x3a, 0xd4, 0x4b, 0xb3, 0x4b, 0x0a, 0x8d, 0x85, 0x8d, 0xa8, 0x04, 0xbd, 0x3b, 0x86, 0x21, 0x0e,
-];
-
-// OP1155BatchTransfer(address from,address to,uint256[] ids,uint256[] amounts,uint256 nonce,uint64 deadline)
-export const OP1155_BATCH_TRANSFER_TYPE_HASH: u8[] = [
-    0x7b, 0xf8, 0xb6, 0x39, 0x5f, 0xea, 0xcc, 0x15, 0x97, 0x12, 0x38, 0x00, 0x91, 0xb9, 0x2b, 0x96,
-    0x67, 0x6b, 0x2b, 0x73, 0x46, 0xff, 0x29, 0x27, 0xbf, 0x1a, 0x54, 0xf8, 0xfc, 0xef, 0x9c, 0x0b,
-];
-
 // sha256("OP712Domain(string name,string version,bytes32 chainId,bytes32 protocolId,address verifyingContract)")
 export const OP712_DOMAIN_TYPE_HASH: u8[] = [
     0xfe, 0xe8, 0x22, 0x92, 0x35, 0x1d, 0x1a, 0x8b, 0xab, 0x21, 0xc4, 0xef, 0xdd, 0x15, 0x7e, 0x31,

package/runtime/contracts/OP20.ts

@@ -21,7 +21,7 @@ import {
 } from '../constants/Exports';
 import { Blockchain } from '../env';
 import { sha256, sha256String } from '../env/global';
-import { ApprovedEvent, BurnedEvent, MintedEvent, TransferredEvent } from '../events/predefined';
+import { OP20ApprovedEvent, OP20BurnedEvent, OP20MintedEvent, OP20TransferredEvent } from '../events/predefined';
 import { Selector } from '../math/abi';
 import { EMPTY_POINTER } from '../math/bytes';
 import { AddressMemoryMap } from '../memory/AddressMemoryMap';
@@ -56,7 +56,7 @@ const allowanceMapPointer: u16 = Blockchain.nextPointer;
 const nonceMapPointer: u16 = Blockchain.nextPointer;
 
 /**
- * OP20 Token Standard Implementation for OPNet.
+ * OP20 Token Standard Implementation for OP_NET.
  *
  * This abstract class implements the OP20 token standard, providing a complete
  * fungible token implementation with advanced features including:
@@ -67,7 +67,7 @@ const nonceMapPointer: u16 = Blockchain.nextPointer;
  * - Unlimited approval optimization (u256.Max)
  *
  * @remarks
- * OP20 is OPNet's equivalent of ERC20, adapted for Bitcoin's UTXO model with
+ * OP20 is OP_NET's equivalent of ERC20, adapted for Bitcoin's UTXO model with
  * additional security features. All storage uses persistent pointers for
  * cross-transaction state management. The contract includes built-in protection
  * against common attack vectors including reentrancy and integer overflow.
@@ -949,15 +949,15 @@ export abstract class OP20 extends ReentrancyGuard implements IOP20 {
 
     /** Event creation helpers */
     protected createBurnedEvent(from: Address, amount: u256): void {
-        this.emitEvent(new BurnedEvent(from, amount));
+        this.emitEvent(new OP20BurnedEvent(from, amount));
     }
 
     protected createApprovedEvent(owner: Address, spender: Address, amount: u256): void {
-        this.emitEvent(new ApprovedEvent(owner, spender, amount));
+        this.emitEvent(new OP20ApprovedEvent(owner, spender, amount));
     }
 
     protected createMintedEvent(to: Address, amount: u256): void {
-        this.emitEvent(new MintedEvent(to, amount));
+        this.emitEvent(new OP20MintedEvent(to, amount));
     }
 
     protected createTransferredEvent(
@@ -966,6 +966,6 @@ export abstract class OP20 extends ReentrancyGuard implements IOP20 {
         to: Address,
         amount: u256,
     ): void {
-        this.emitEvent(new TransferredEvent(operator, from, to, amount));
+        this.emitEvent(new OP20TransferredEvent(operator, from, to, amount));
     }
 }

package/runtime/contracts/OP721.ts

@@ -28,13 +28,7 @@ import { IOP721 } from './interfaces/IOP721';
 import { OP721InitParameters } from './interfaces/OP721InitParameters';
 import { ReentrancyGuard } from './ReentrancyGuard';
 import { StoredMapU256 } from '../storage/maps/StoredMapU256';
-import {
-    ApprovedEvent,
-    ApprovedForAllEvent,
-    MAX_URI_LENGTH,
-    TransferredEvent,
-    URIEvent,
-} from '../events/predefined';
+import { MAX_URI_LENGTH, OP721ApprovedForAllEvent, URIEvent } from '../events/predefined';
 import {
     ON_OP721_RECEIVED_SELECTOR,
     OP712_DOMAIN_TYPE_HASH,
@@ -43,6 +37,10 @@ import {
     OP721_APPROVAL_TYPE_HASH,
 } from '../constants/Exports';
 import { ExtendedAddress } from '../types/ExtendedAddress';
+import { OP721TransferredEvent } from '../events/predefined/OP721TransferredEvent';
+import { OP721ApprovedEvent } from '../events/predefined/OP721ApprovedEvent';
+import { OP721MintedEvent } from '../events/predefined/OP721MintedEvent';
+import { OP721BurnedEvent } from '../events/predefined/OP721BurnedEvent';
 
 const stringPointer: u16 = Blockchain.nextPointer;
 const totalSupplyPointer: u16 = Blockchain.nextPointer;
@@ -63,10 +61,10 @@ export abstract class OP721 extends ReentrancyGuard implements IOP721 {
     protected readonly _name: StoredString;
     protected readonly _symbol: StoredString;
     protected readonly _baseURI: StoredString;
-    protected readonly _collectionBanner: StoredString;
-    protected readonly _collectionIcon: StoredString;
-    protected readonly _collectionDescription: StoredString;
-    protected readonly _collectionWebsite: StoredString;
+    protected readonly _banner: StoredString;
+    protected readonly _icon: StoredString;
+    protected readonly _description: StoredString;
+    protected readonly _website: StoredString;
 
     protected readonly _totalSupply: StoredU256;
     protected readonly _maxSupply: StoredU256;
@@ -97,10 +95,10 @@ export abstract class OP721 extends ReentrancyGuard implements IOP721 {
         this._name = new StoredString(stringPointer, 0);
         this._symbol = new StoredString(stringPointer, 2);
         this._baseURI = new StoredString(stringPointer, 3);
-        this._collectionBanner = new StoredString(stringPointer, 4);
-        this._collectionIcon = new StoredString(stringPointer, 5);
-        this._collectionDescription = new StoredString(stringPointer, 6);
-        this._collectionWebsite = new StoredString(stringPointer, 7);
+        this._banner = new StoredString(stringPointer, 4);
+        this._icon = new StoredString(stringPointer, 5);
+        this._description = new StoredString(stringPointer, 6);
+        this._website = new StoredString(stringPointer, 7);
 
         this._totalSupply = new StoredU256(totalSupplyPointer, EMPTY_POINTER);
         this._maxSupply = new StoredU256(maxSupplyPointer, EMPTY_POINTER);
@@ -128,6 +126,10 @@ export abstract class OP721 extends ReentrancyGuard implements IOP721 {
         return this._symbol.value;
     }
 
+    public get icon(): string {
+        return this._icon.value;
+    }
+
     public get baseURI(): string {
         return this._baseURI.value;
     }
@@ -140,20 +142,16 @@ export abstract class OP721 extends ReentrancyGuard implements IOP721 {
         return this._maxSupply.value;
     }
 
-    public get collectionBanner(): string {
-        return this._collectionBanner.value;
+    public get banner(): string {
+        return this._banner.value;
     }
 
-    public get collectionIcon(): string {
-        return this._collectionIcon.value;
+    public get description(): string {
+        return this._description.value;
     }
 
-    public get collectionDescription(): string {
-        return this._collectionDescription.value;
-    }
-
-    public get collectionWebsite(): string {
-        return this._collectionWebsite.value;
+    public get website(): string {
+        return this._website.value;
     }
 
     public instantiate(
@@ -175,10 +173,10 @@ export abstract class OP721 extends ReentrancyGuard implements IOP721 {
         this._initialized.value = u256.One;
         this._tokenURICounter.value = u256.Zero;
 
-        this._collectionBanner.value = params.collectionBanner;
-        this._collectionIcon.value = params.collectionIcon;
-        this._collectionDescription.value = params.collectionDescription;
-        this._collectionWebsite.value = params.collectionWebsite;
+        this._banner.value = params.banner;
+        this._icon.value = params.icon;
+        this._description.value = params.description;
+        this._website.value = params.website;
     }
 
     @method('name')
@@ -207,28 +205,6 @@ export abstract class OP721 extends ReentrancyGuard implements IOP721 {
         return w;
     }
 
-    @method('collectionInfo')
-    @returns(
-        { name: 'icon', type: ABIDataTypes.STRING },
-        { name: 'banner', type: ABIDataTypes.STRING },
-        { name: 'description', type: ABIDataTypes.STRING },
-        { name: 'website', type: ABIDataTypes.STRING },
-    )
-    public collectionInfo(_: Calldata): BytesWriter {
-        const length =
-            String.UTF8.byteLength(this.collectionIcon) +
-            String.UTF8.byteLength(this.collectionDescription) +
-            String.UTF8.byteLength(this.collectionWebsite) +
-            String.UTF8.byteLength(this.collectionBanner);
-
-        const w = new BytesWriter(U32_BYTE_LENGTH * 4 + length);
-        w.writeStringWithLength(this.collectionIcon);
-        w.writeStringWithLength(this.collectionBanner);
-        w.writeStringWithLength(this.collectionDescription);
-        w.writeStringWithLength(this.collectionWebsite);
-        return w;
-    }
-
     @method({ name: 'tokenId', type: ABIDataTypes.UINT256 })
     @returns({ name: 'uri', type: ABIDataTypes.STRING })
     public tokenURI(calldata: Calldata): BytesWriter {
@@ -272,10 +248,10 @@ export abstract class OP721 extends ReentrancyGuard implements IOP721 {
         if (description.length == 0) throw new Revert('Description cannot be empty');
         if (website.length == 0) throw new Revert('Website cannot be empty');
 
-        this._collectionIcon.value = icon;
-        this._collectionBanner.value = banner;
-        this._collectionDescription.value = description;
-        this._collectionWebsite.value = website;
+        this._icon.value = icon;
+        this._banner.value = banner;
+        this._description.value = description;
+        this._website.value = website;
 
         return new BytesWriter(0);
     }
@@ -489,7 +465,7 @@ export abstract class OP721 extends ReentrancyGuard implements IOP721 {
     }
 
     @method({ name: 'tokenId', type: ABIDataTypes.UINT256 })
-    @emit('Transferred')
+    @emit('Burned')
     public burn(calldata: Calldata): BytesWriter {
         const tokenId = calldata.readU256();
         this._burn(tokenId);
@@ -526,7 +502,7 @@ export abstract class OP721 extends ReentrancyGuard implements IOP721 {
 
     @method({ name: 'owner', type: ABIDataTypes.ADDRESS })
     @returns({ name: 'nonce', type: ABIDataTypes.UINT256 })
-    public getApproveNonce(calldata: Calldata): BytesWriter {
+    public nonceOf(calldata: Calldata): BytesWriter {
         const owner = calldata.readAddress();
         const nonce = this._approveNonceMap.get(owner);
         const w = new BytesWriter(U256_BYTE_LENGTH);
@@ -565,10 +541,10 @@ export abstract class OP721 extends ReentrancyGuard implements IOP721 {
     public metadata(_: Calldata): BytesWriter {
         const name = this.name;
         const symbol = this.symbol;
-        const icon = this.collectionIcon;
-        const banner = this.collectionBanner;
-        const description = this.collectionDescription;
-        const website = this.collectionWebsite;
+        const icon = this.icon;
+        const banner = this.banner;
+        const description = this.description;
+        const website = this.website;
         const domainSeparator = this._buildDomainSeparator();
 
         const nameLength = String.UTF8.byteLength(name);
@@ -628,7 +604,7 @@ export abstract class OP721 extends ReentrancyGuard implements IOP721 {
         // Update total supply
         this._totalSupply.value = SafeMath.add(this._totalSupply.value, u256.One);
 
-        this.createTransferEvent(Address.zero(), to, tokenId);
+        this.createMintedEvent(to, tokenId);
     }
 
     protected _burn(tokenId: u256): void {
@@ -667,12 +643,17 @@ export abstract class OP721 extends ReentrancyGuard implements IOP721 {
         // Update total supply
         this._totalSupply.value = SafeMath.sub(this._totalSupply.value, u256.One);
 
-        this.createTransferEvent(owner, Address.zero(), tokenId);
+        this.createBurnedEvent(owner, tokenId);
     }
 
     protected _transfer(from: Address, to: Address, tokenId: u256): void {
-        // Skip self-transfers
-        if (from === to) return;
+        if (from === Address.zero()) {
+            throw new Revert('Invalid sender');
+        }
+
+        if (to === Address.zero()) {
+            throw new Revert('Invalid receiver');
+        }
 
         const owner = this._ownerOf(tokenId);
 
@@ -680,10 +661,6 @@ export abstract class OP721 extends ReentrancyGuard implements IOP721 {
             throw new Revert('Transfer from incorrect owner');
         }
 
-        if (to === Address.zero()) {
-            throw new Revert('Transfer to zero address');
-        }
-
         // Check authorization
         const sender = Blockchain.tx.sender;
         if (sender !== from && !this._isApprovedForAll(from, sender)) {
@@ -712,7 +689,7 @@ export abstract class OP721 extends ReentrancyGuard implements IOP721 {
         // Transfer ownership
         this.ownerOfMap.set(tokenId, this._u256FromAddress(to));
 
-        this.createTransferEvent(from, to, tokenId);
+        this.createTransferredEvent(from, to, tokenId);
     }
 
     protected _safeTransfer(from: Address, to: Address, tokenId: u256, data: Uint8Array): void {
@@ -1019,19 +996,28 @@ export abstract class OP721 extends ReentrancyGuard implements IOP721 {
     }
 
     // Event creation helpers
-    protected createTransferEvent(from: Address, to: Address, tokenId: u256): void {
-        this.emitEvent(new TransferredEvent(Blockchain.tx.sender, from, to, tokenId));
+    protected createTransferredEvent(from: Address, to: Address, tokenId: u256): void {
+        this.emitEvent(new OP721TransferredEvent(Blockchain.tx.sender, from, to, tokenId));
     }
 
     protected createApprovedEvent(owner: Address, approved: Address, tokenId: u256): void {
-        this.emitEvent(new ApprovedEvent(owner, approved, tokenId));
+        this.emitEvent(new OP721ApprovedEvent(owner, approved, tokenId));
+    }
+
+    protected createMintedEvent(to: Address, tokenId: u256): void {
+        this.emitEvent(new OP721MintedEvent(to, tokenId));
     }
 
+    protected createBurnedEvent(from: Address, tokenId: u256): void {
+        this.emitEvent(new OP721BurnedEvent(from, tokenId));
+    }
+
+
     protected createApprovedForAllEvent(
         owner: Address,
         operator: Address,
         approved: boolean,
     ): void {
-        this.emitEvent(new ApprovedForAllEvent(owner, operator, approved));
+        this.emitEvent(new OP721ApprovedForAllEvent(owner, operator, approved));
     }
 }

package/runtime/contracts/OP_NET.ts

@@ -33,7 +33,7 @@ export class OP_NET implements IBTC {
 
     /**
      * Called when the contract's bytecode is updated via updateContractFromExisting.
-     * Override this method to perform migration logic when the contract is upgraded.
+     * Override this method to perform migration logic when the contract is updated.
      *
      * @param calldata - The calldata passed to updateContractFromExisting
      *
@@ -100,7 +100,7 @@ export class OP_NET implements IBTC {
      * ```typescript
      * public constructor() {
      *     super();
-     *     this.registerPlugin(new UpgradeablePlugin(144));
+     *     this.registerPlugin(new UpdatablePlugin(144));
      * }
      * ```
      *