Fixed runtime issues

btc-vision · Dec 12, 2024 · 3cd1fe2 · 3cd1fe2
1 parent dfac7b3
commit 3cd1fe2
Show file tree

Hide file tree

Showing 48 changed files with 489 additions and 441 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@btc-vision/btc-runtime",
-    "version": "1.3.14",
+    "version": "1.3.15",
     "description": "Bitcoin Smart Contract Runtime",
     "main": "btc/index.ts",
     "scripts": {
@@ -43,8 +43,8 @@
     ],
     "dependencies": {
         "@assemblyscript/loader": "^0.27.30",
+        "@btc-vision/as-bignum": "^0.0.2",
         "@eslint/js": "^9.10.0",
-        "as-bignum": "^0.3.1",
         "gulplog": "^2.2.0",
         "mocha": "^10.7.3",
         "ts-node": "^10.9.2",

diff --git a/runtime/buffer/BytesReader.ts b/runtime/buffer/BytesReader.ts
@@ -1,6 +1,6 @@
 import { Address, ADDRESS_BYTE_LENGTH } from '../types/Address';
 import { Selector } from '../math/abi';
-import { i128, u128, u256 } from 'as-bignum/assembly';
+import { i128, u128, u256 } from '@btc-vision/as-bignum/assembly';
 import { Revert } from '../types/Revert';
 import { TransactionInput, TransactionOutput } from '../env/classes/UTXO';
 import { i256 } from '../math/i256';

diff --git a/runtime/buffer/BytesWriter.ts b/runtime/buffer/BytesWriter.ts
@@ -1,4 +1,4 @@
-import { i128, u128, u256 } from 'as-bignum/assembly';
+import { i128, u128, u256 } from '@btc-vision/as-bignum/assembly';
 import { Address, ADDRESS_BYTE_LENGTH } from '../types/Address';
 import { Selector } from '../math/abi';
 import { BytesReader } from './BytesReader';

diff --git a/runtime/contracts/DeployableOP_20.ts b/runtime/contracts/DeployableOP_20.ts
@@ -1,4 +1,4 @@
-import { u256 } from 'as-bignum/assembly';
+import { u256 } from '@btc-vision/as-bignum/assembly';
 import { BytesWriter } from '../buffer/BytesWriter';
 import { Blockchain } from '../env';
 import { ApproveEvent, BurnEvent, MintEvent, TransferEvent } from '../events/predefined';

diff --git a/runtime/contracts/OP_20.ts b/runtime/contracts/OP_20.ts
@@ -1,5 +1,5 @@
 import { DeployableOP_20 } from './DeployableOP_20';
-import { u256 } from 'as-bignum/assembly';
+import { u256 } from '@btc-vision/as-bignum/assembly';
 import { OP20InitParameters } from './interfaces/OP20InitParameters';
 
 export abstract class OP_20 extends DeployableOP_20 {

diff --git a/runtime/contracts/interfaces/OP20InitParameters.ts b/runtime/contracts/interfaces/OP20InitParameters.ts
@@ -1,4 +1,4 @@
-import { u256 } from 'as-bignum/assembly';
+import { u256 } from '@btc-vision/as-bignum/assembly';
 
 export class OP20InitParameters {
     readonly maxSupply: u256;

diff --git a/runtime/env/BlockchainEnvironment.ts b/runtime/env/BlockchainEnvironment.ts
@@ -1,7 +1,7 @@
 import { Address, ADDRESS_BYTE_LENGTH } from '../types/Address';
 import { MemorySlotPointer } from '../memory/MemorySlotPointer';
 import { MemorySlotData } from '../memory/MemorySlot';
-import { u256 } from 'as-bignum/assembly';
+import { u256 } from '@btc-vision/as-bignum/assembly';
 import { BytesReader } from '../buffer/BytesReader';
 import { BytesWriter } from '../buffer/BytesWriter';
 import { NetEvent } from '../events/NetEvent';

diff --git a/runtime/env/classes/Block.ts b/runtime/env/classes/Block.ts
@@ -1,4 +1,4 @@
-import { u256 } from 'as-bignum/assembly';
+import { u256 } from '@btc-vision/as-bignum/assembly';
 
 @final
 export class Block {

diff --git a/runtime/events/predefined/ApproveEvent.ts b/runtime/events/predefined/ApproveEvent.ts
@@ -1,4 +1,4 @@
-import { u256 } from 'as-bignum/assembly';
+import { u256 } from '@btc-vision/as-bignum/assembly';
 import { Address, ADDRESS_BYTE_LENGTH } from '../../types/Address';
 import { NetEvent } from '../NetEvent';
 import { BytesWriter } from '../../buffer/BytesWriter';

diff --git a/runtime/events/predefined/BurnEvent.ts b/runtime/events/predefined/BurnEvent.ts
@@ -1,4 +1,4 @@
-import { u256 } from 'as-bignum/assembly';
+import { u256 } from '@btc-vision/as-bignum/assembly';
 import { NetEvent } from '../NetEvent';
 import { BytesWriter } from '../../buffer/BytesWriter';
 

diff --git a/runtime/events/predefined/ClaimEvent.ts b/runtime/events/predefined/ClaimEvent.ts
@@ -1,4 +1,4 @@
-import { u256 } from 'as-bignum/assembly';
+import { u256 } from '@btc-vision/as-bignum/assembly';
 import { NetEvent } from '../NetEvent';
 import { BytesWriter } from '../../buffer/BytesWriter';
 

diff --git a/runtime/events/predefined/MintEvent.ts b/runtime/events/predefined/MintEvent.ts
@@ -1,4 +1,4 @@
-import { u256 } from 'as-bignum/assembly';
+import { u256 } from '@btc-vision/as-bignum/assembly';
 import { NetEvent } from '../NetEvent';
 import { BytesWriter } from '../../buffer/BytesWriter';
 import { Address, ADDRESS_BYTE_LENGTH } from '../../types/Address';

diff --git a/runtime/events/predefined/StakeEvent.ts b/runtime/events/predefined/StakeEvent.ts
@@ -1,4 +1,4 @@
-import { u256 } from 'as-bignum/assembly';
+import { u256 } from '@btc-vision/as-bignum/assembly';
 import { NetEvent } from '../NetEvent';
 import { BytesWriter } from '../../buffer/BytesWriter';
 

diff --git a/runtime/events/predefined/TransferEvent.ts b/runtime/events/predefined/TransferEvent.ts
@@ -1,4 +1,4 @@
-import { u256 } from 'as-bignum/assembly';
+import { u256 } from '@btc-vision/as-bignum/assembly';
 import { NetEvent } from '../NetEvent';
 import { Address, ADDRESS_BYTE_LENGTH } from '../../types/Address';
 import { BytesWriter } from '../../buffer/BytesWriter';

diff --git a/runtime/events/predefined/UnstakeEvent.ts b/runtime/events/predefined/UnstakeEvent.ts
@@ -1,4 +1,4 @@
-import { u256 } from 'as-bignum/assembly';
+import { u256 } from '@btc-vision/as-bignum/assembly';
 import { NetEvent } from '../NetEvent';
 import { BytesWriter } from '../../buffer/BytesWriter';
 

diff --git a/runtime/generic/MapU256.ts b/runtime/generic/MapU256.ts
@@ -1,5 +1,5 @@
 import { Revert } from '../types/Revert';
-import { u256 } from 'as-bignum/assembly';
+import { u256 } from '@btc-vision/as-bignum/assembly';
 import { Map } from './Map';
 
 export class MapU256 extends Map<u256, u256> {

diff --git a/runtime/interfaces/DeployContractResponse.ts b/runtime/interfaces/DeployContractResponse.ts
@@ -1,4 +1,4 @@
-import { u256 } from 'as-bignum/assembly';
+import { u256 } from '@btc-vision/as-bignum/assembly';
 import { Address } from '../types/Address';
 
 export class DeployContractResponse {

diff --git a/runtime/math/bytes.ts b/runtime/math/bytes.ts
@@ -1,4 +1,4 @@
-import { u128, u256 } from 'as-bignum/assembly';
+import { u128, u256 } from '@btc-vision/as-bignum/assembly';
 
 export function bytes(number: u256[]): Uint8Array {
     const result = new Uint8Array(32 * number.length);

diff --git a/runtime/math/i256.ts b/runtime/math/i256.ts
@@ -1,4 +1,4 @@
-import { i128, u128, u256 } from 'as-bignum/assembly';
+import { i128, u128, u256 } from '@btc-vision/as-bignum/assembly';
 
 export class i256 {
 

diff --git a/runtime/math/u160.ts b/runtime/math/u160.ts
@@ -1,4 +1,4 @@
-import { i128, u128 } from 'as-bignum/assembly';
+import { i128, u128 } from '@btc-vision/as-bignum/assembly';
 import { __carry, __uadd64, __umulh64 } from 'as-bignum/assembly/globals';
 
 @lazy const HEX_CHARS = '0123456789abcdef';

diff --git a/runtime/memory/AddressMemoryMap.ts b/runtime/memory/AddressMemoryMap.ts
@@ -2,7 +2,7 @@ import { MemorySlotPointer } from './MemorySlotPointer';
 import { Blockchain } from '../env';
 import { encodePointer } from '../math/abi';
 import { MemorySlotData } from './MemorySlot';
-import { u256 } from 'as-bignum/assembly';
+import { u256 } from '@btc-vision/as-bignum/assembly';
 import { BytesWriter } from '../buffer/BytesWriter';
 import { Address } from '../types/Address';
 

diff --git a/runtime/memory/KeyMerger.ts b/runtime/memory/KeyMerger.ts
@@ -1,5 +1,5 @@
 import { MemorySlotData } from './MemorySlot';
-import { u256 } from 'as-bignum/assembly';
+import { u256 } from '@btc-vision/as-bignum/assembly';
 import { Blockchain } from '../env';
 import { MemorySlotPointer } from './MemorySlotPointer';
 import { encodePointer } from '../math/abi';

diff --git a/runtime/memory/MemorySlotPointer.ts b/runtime/memory/MemorySlotPointer.ts
@@ -1,3 +1,3 @@
-import { u256 } from 'as-bignum/assembly';
+import { u256 } from '@btc-vision/as-bignum/assembly';
 
 export type MemorySlotPointer = u256;
diff --git a/runtime/memory/MultiAddressMemoryMap.ts b/runtime/memory/MultiAddressMemoryMap.ts
@@ -1,5 +1,5 @@
 import { MemorySlotData } from './MemorySlot';
-import { u256 } from 'as-bignum/assembly';
+import { u256 } from '@btc-vision/as-bignum/assembly';
 import { Uint8ArrayMerger } from './Uint8ArrayMerger';
 import { Address } from '../types/Address';
 

diff --git a/runtime/memory/MultiStringMemoryMap.ts b/runtime/memory/MultiStringMemoryMap.ts
@@ -1,5 +1,5 @@
 import { MemorySlotData } from './MemorySlot';
-import { u256 } from 'as-bignum/assembly';
+import { u256 } from '@btc-vision/as-bignum/assembly';
 import { KeyMerger } from './KeyMerger';
 
 @final

diff --git a/runtime/memory/StringMemoryMap.ts b/runtime/memory/StringMemoryMap.ts
@@ -2,7 +2,7 @@ import { MemorySlotPointer } from './MemorySlotPointer';
 import { Blockchain } from '../env';
 import { encodePointer } from '../math/abi';
 import { MemorySlotData } from './MemorySlot';
-import { u256 } from 'as-bignum/assembly';
+import { u256 } from '@btc-vision/as-bignum/assembly';
 import { BytesWriter } from '../buffer/BytesWriter';
 
 @final

diff --git a/runtime/memory/Uint8ArrayMerger.ts b/runtime/memory/Uint8ArrayMerger.ts
@@ -1,5 +1,5 @@
 import { MemorySlotData } from './MemorySlot';
-import { u256 } from 'as-bignum/assembly';
+import { u256 } from '@btc-vision/as-bignum/assembly';
 import { Blockchain } from '../env';
 import { MemorySlotPointer } from './MemorySlotPointer';
 import { encodePointer } from '../math/abi';

diff --git a/runtime/secp256k1/ECPoint.ts b/runtime/secp256k1/ECPoint.ts
@@ -1,4 +1,4 @@
-import { u256 } from 'as-bignum/assembly';
+import { u256 } from '@btc-vision/as-bignum/assembly';
 import { SafeMath } from '../types/SafeMath';
 
 // secp256k1 curve parameters (using little-endian byte arrays)

diff --git a/runtime/shared-libraries/OP20Utils.ts b/runtime/shared-libraries/OP20Utils.ts
@@ -1,5 +1,5 @@
 import { Address, ADDRESS_BYTE_LENGTH } from '../types/Address';
-import { u256 } from 'as-bignum/assembly';
+import { u256 } from '@btc-vision/as-bignum/assembly';
 import { BytesWriter } from '../buffer/BytesWriter';
 import { Blockchain } from '../env';
 import { encodeSelector, Selector } from '../math/abi';

diff --git a/runtime/shared-libraries/TransferHelper.ts b/runtime/shared-libraries/TransferHelper.ts
@@ -1,4 +1,4 @@
-import { u256 } from 'as-bignum/assembly';
+import { u256 } from '@btc-vision/as-bignum/assembly';
 import { encodeSelector, Selector } from '../math/abi';
 import { Address, ADDRESS_BYTE_LENGTH } from '../types/Address';
 import { BytesWriter } from '../buffer/BytesWriter';

diff --git a/runtime/storage/Serializable.ts b/runtime/storage/Serializable.ts
@@ -1,4 +1,4 @@
-import { u256 } from 'as-bignum/assembly';
+import { u256 } from '@btc-vision/as-bignum/assembly';
 import { Blockchain } from '../env';
 import { MemorySlotPointer } from '../memory/MemorySlotPointer';
 import { BytesWriter } from '../buffer/BytesWriter';

diff --git a/runtime/storage/StorageBacked.ts b/runtime/storage/StorageBacked.ts
@@ -1,4 +1,4 @@
-import { u256 } from 'as-bignum/assembly';
+import { u256 } from '@btc-vision/as-bignum/assembly';
 
 export interface StorageBacked {
     serialize(): Array<u256>;

diff --git a/runtime/storage/StorageSlot.ts b/runtime/storage/StorageSlot.ts
@@ -1,4 +1,4 @@
-import { u256 } from 'as-bignum/assembly';
+import { u256 } from '@btc-vision/as-bignum/assembly';
 import { BlockchainEnvironment } from '../env/BlockchainEnvironment';
 import { Sha256 } from '../math/sha256';
 import { MemorySlotPointer } from '../memory/MemorySlotPointer';

diff --git a/runtime/storage/StorageValue.ts b/runtime/storage/StorageValue.ts
@@ -1,4 +1,4 @@
-import { u256 } from 'as-bignum/assembly';
+import { u256 } from '@btc-vision/as-bignum/assembly';
 import { StorageSlot } from './StorageSlot';
 
 export class StorageValue<T> {

diff --git a/runtime/storage/StoredAddress.ts b/runtime/storage/StoredAddress.ts
@@ -1,4 +1,4 @@
-import { u256 } from 'as-bignum/assembly';
+import { u256 } from '@btc-vision/as-bignum/assembly';
 import { Blockchain } from '../env';
 import { encodePointer } from '../math/abi';
 import { BytesWriter } from '../buffer/BytesWriter';