merge commit

Author: jonty007

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "bitcoin-computer",
-  "version": "0.21.0-beta.0",
+  "version": "0.22.0-beta.0",
   "description": "Lightweight Smart Contracts for Bitcoin and Litecoin",
   "contributors": [
     "Clemens Ley",
@@ -38,6 +38,7 @@
     "@endo/static-module-record": "^1.0.4"
   },
   "devDependencies": {
+    "@types/dotenv": "^8.2.3",
     "@types/node": "^20.11.21",
     "edit-json-file": "^1.8.0",
     "eslint": "^8.57.0",

package.json

@@ -4,7 +4,9 @@ export declare class Token extends Contract {
     symbol: string;
     _owners: string[];
     constructor(to: string, amount: number, name: string, symbol?: string);
-    transfer(to: string, amount?: number): Token | null;
+    transfer(to: string, amount?: number): Token | undefined;
+    burn(): void;
+    merge(tokens: Token[]): void;
 }
 export interface ITBC20 {
     deploy(): Promise<string>;
@@ -13,7 +15,7 @@ export interface ITBC20 {
     balanceOf(publicKey: string, root: string): Promise<number>;
     transfer(to: string, amount: number, root: string): Promise<void>;
 }
-export declare class TBC20 implements ITBC20 {
+export declare class TokenHelper implements ITBC20 {
     name: string;
     symbol: string;
     computer: any;

packages/TBC20/build/src/token.d.ts

@@ -5,16 +5,27 @@ export class Token extends Contract {
     transfer(to, amount) {
         if (typeof amount === 'undefined') {
             this._owners = [to];
-            return null;
+            return undefined;
         }
         if (this.amount >= amount) {
             this.amount -= amount;
             return new Token(to, amount, this.name, this.symbol);
         }
         throw new Error('Insufficient funds');
     }
+    burn() {
+        this.amount = 0;
+    }
+    merge(tokens) {
+        let total = 0;
+        tokens.forEach((token) => {
+            total += token.amount;
+            token.burn();
+        });
+        this.amount += total;
+    }
 }
-export class TBC20 {
+export class TokenHelper {
     constructor(computer, mod) {
         this.computer = computer;
         this.mod = mod;

packages/TBC20/build/src/token.js

@@ -28,7 +28,7 @@
     "prettier": "prettier --write \"src/**/*.{js,jsx,ts,tsx,css,scss,md}\"",
     "types": "tsc",
     "test": "mocha --config .mocharc.json",
-    "test-and-show": "npm run test 2>&1 | tee tbc20-test.log && open tbc20-test.log"
+    "test-and-show": "npm run test 2>&1 | tee TBC20-test.log && open TBC20-test.log"
   },
   "author": "Clemens Ley <clemens@bitcoincomputer.io>",
   "license": "Apache-2.0",

packages/TBC20/package.json

@@ -0,0 +1,76 @@
+/* eslint-disable max-classes-per-file */
+export class Token extends Contract {
+    constructor(to, amount, name, symbol = '') {
+        super({ _owners: [to], amount, name, symbol });
+    }
+    transfer(to, amount) {
+        if (typeof amount === 'undefined') {
+            // Send entire amount
+            this._owners = [to];
+            return undefined;
+        }
+        if (this.amount >= amount) {
+            // Send partial amount in a new object
+            this.amount -= amount;
+            return new Token(to, amount, this.name, this.symbol);
+        }
+        throw new Error('Insufficient funds');
+    }
+    burn() {
+        this.amount = 0;
+    }
+    merge(tokens) {
+        let total = 0;
+        tokens.forEach((token) => {
+            total += token.amount;
+            token.burn();
+        });
+        this.amount += total;
+    }
+}
+export class TokenHelper {
+    constructor(computer, mod) {
+        this.computer = computer;
+        this.mod = mod;
+    }
+    async deploy() {
+        this.mod = await this.computer.deploy(`export ${Token}`);
+        return this.mod;
+    }
+    async mint(publicKey, amount, name, symbol) {
+        const args = [publicKey, amount, name, symbol];
+        const token = await this.computer.new(Token, args, this.mod);
+        return token._root;
+    }
+    async totalSupply(root) {
+        const rootBag = await this.computer.sync(root);
+        return rootBag.amount;
+    }
+    async getBags(publicKey, root) {
+        const revs = await this.computer.query({ publicKey, mod: this.mod });
+        const bags = await Promise.all(revs.map(async (rev) => this.computer.sync(rev)));
+        return bags.flatMap((bag) => (bag._root === root ? [bag] : []));
+    }
+    async balanceOf(publicKey, root) {
+        if (typeof root === 'undefined')
+            throw new Error('Please pass a root into balanceOf.');
+        const bags = await this.getBags(publicKey, root);
+        return bags.reduce((prev, curr) => prev + curr.amount, 0);
+    }
+    async transfer(to, amount, root) {
+        let _amount = amount;
+        const owner = this.computer.getPublicKey();
+        const bags = await this.getBags(owner, root);
+        const results = [];
+        while (_amount > 0 && bags.length > 0) {
+            const [bag] = bags.splice(0, 1);
+            const available = Math.min(_amount, bag.amount);
+            // eslint-disable-next-line no-await-in-loop
+            results.push(await bag.transfer(to, available));
+            _amount -= available;
+        }
+        if (_amount > 0)
+            throw new Error('Could not send entire amount');
+        await Promise.all(results);
+    }
+}

packages/TBC20/src/token.js

@@ -10,20 +10,32 @@ export class Token extends Contract {
     super({ _owners: [to], amount, name, symbol })
   }
 
-  transfer(to: string, amount?: number): Token | null {
-    // Send entire amount
+  transfer(to: string, amount?: number): Token | undefined {
     if (typeof amount === 'undefined') {
+      // Send entire amount
       this._owners = [to]
-      return null
+      return undefined
     }
-    // Send partial amount in a new object
     if (this.amount >= amount) {
+      // Send partial amount in a new object
       this.amount -= amount
       return new Token(to, amount, this.name, this.symbol)
     }
-
     throw new Error('Insufficient funds')
   }
+
+  burn() {
+    this.amount = 0
+  }
+
+  merge(tokens: Token[]) {
+    let total = 0
+    tokens.forEach((token) => {
+      total += token.amount
+      token.burn()
+    })
+    this.amount += total
+  }
 }
 
 export interface ITBC20 {
@@ -34,7 +46,7 @@ export interface ITBC20 {
   transfer(to: string, amount: number, root: string): Promise<void>
 }
 
-export class TBC20 implements ITBC20 {
+export class TokenHelper implements ITBC20 {
   name: string
   symbol: string
   computer: any