@atomiqlabs/chain-solana 9.0.0 → 9.0.2

package/dist/solana/SolanaChains.d.ts

@@ -1,4 +1,10 @@
 export declare const SolanaChains: {
+    readonly 2: {
+        readonly addresses: {
+            readonly swapContract: "11111111111111111111111111111111";
+            readonly btcRelayContract: "11111111111111111111111111111111";
+        };
+    };
     readonly 1: {
         readonly addresses: {
             readonly swapContract: "4hfUykhqmD7ZRvNh1HuzVKEY7ToENixtdUKZspNDCrEM";

package/dist/solana/SolanaChains.js

@@ -3,6 +3,13 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.SolanaChains = void 0;
 const base_1 = require("@atomiqlabs/base");
 exports.SolanaChains = {
+    //TODO: Not deployed yet
+    [base_1.BitcoinNetwork.TESTNET4]: {
+        addresses: {
+            swapContract: "11111111111111111111111111111111",
+            btcRelayContract: "11111111111111111111111111111111"
+        }
+    },
     [base_1.BitcoinNetwork.TESTNET]: {
         addresses: {
             swapContract: "4hfUykhqmD7ZRvNh1HuzVKEY7ToENixtdUKZspNDCrEM",

package/dist/solana/btcrelay/SolanaBtcRelay.js

@@ -44,7 +44,7 @@ class SolanaBtcRelay extends SolanaProgramBase_1.SolanaProgramBase {
             headerTopic: this.BtcRelayHeader(serializedBlock.hash),
             systemProgram: web3_js_1.SystemProgram.programId
         })
-            .instruction());
+            .instruction(), 100000);
     }
     /**
      * Creates verify action to be used with the swap program, specifies the action to be firstIxBeforeComputeBudget,

package/dist/solana/chain/modules/SolanaFees.js

@@ -107,7 +107,6 @@ class SolanaFees {
         });
         if (request.ok) {
             const parsedResponse = await request.json();
-            // console.log(parsedResponse);
             return parsedResponse.result;
         }
         throw new Error(await request.text());

package/dist/solana/events/SolanaChainEvents.js

@@ -98,13 +98,11 @@ class SolanaChainEvents extends SolanaChainEventsBrowser_1.SolanaChainEventsBrow
             const eventObject = this.getEventObjectFromTransaction(transaction);
             if (eventObject == null)
                 return true;
-            console.log("Instructions: ", eventObject.instructions);
-            console.log("Events: ", eventObject.events);
             await this.processEvent(eventObject);
             return true;
         }
         catch (e) {
-            console.error(e);
+            this.logger.error("fetchTxAndProcessEvent(): Error fetching transaction and processing event, signature: " + signature, e);
             return false;
         }
     }
@@ -121,14 +119,14 @@ class SolanaChainEvents extends SolanaChainEventsBrowser_1.SolanaChainEventsBrow
                 return;
             if (this.isSignatureProcessed(signature))
                 return;
-            console.log("[Solana Events WebSocket] Process signature: ", signature);
+            this.logger.debug("getWsEventHandler(" + name + "): Process signature: ", signature);
             this.signaturesProcessing[signature] = this.processEvent({
                 events: [{ name, data: data }],
                 instructions: null,
                 blockTime: Math.floor(Date.now() / 1000),
                 signature
             }).then(() => true).catch(e => {
-                console.error(e);
+                this.logger.error("getWsEventHandler(" + name + "): Error processing signature: " + signature, e);
                 return false;
             });
         };
@@ -150,7 +148,7 @@ class SolanaChainEvents extends SolanaChainEventsBrowser_1.SolanaChainEventsBrow
                 }, "confirmed");
                 //Check if newest returned signature (index 0) is older than the latest signature's slot, this is a sanity check
                 if (fetched.length > 0 && fetched[0].slot < lastProcessedSignature.slot) {
-                    console.log("[Solana Events POLL] Sanity check triggered, returned signature slot height is older than latest!");
+                    this.logger.debug("getNewSignatures(): Sanity check triggered, returned signature slot height is older than latest!");
                     return;
                 }
             }
@@ -198,7 +196,7 @@ class SolanaChainEvents extends SolanaChainEventsBrowser_1.SolanaChainEventsBrow
                         continue;
                     }
                 }
-                console.log("[Solana Events POLL] Process signature: ", txSignature);
+                this.logger.debug("processSignatures(): Process signature: ", txSignature);
                 const processPromise = this.fetchTxAndProcessEvent(txSignature.signature);
                 this.signaturesProcessing[txSignature.signature] = processPromise;
                 const result = await processPromise;
@@ -210,7 +208,7 @@ class SolanaChainEvents extends SolanaChainEventsBrowser_1.SolanaChainEventsBrow
             }
         }
         catch (e) {
-            console.error(e);
+            this.logger.error("processSignatures(): Failed processing signatures: ", e);
         }
         return lastSuccessfulSignature;
     }
@@ -232,8 +230,7 @@ class SolanaChainEvents extends SolanaChainEventsBrowser_1.SolanaChainEventsBrow
         let func;
         func = async () => {
             await this.checkEvents().catch(e => {
-                console.error("Failed to fetch Sol log");
-                console.error(e);
+                this.logger.error("setupHttpPolling(): Failed to fetch Solana log: ", e);
             });
             if (this.stopped)
                 return;

package/dist/solana/events/SolanaChainEventsBrowser.js

@@ -153,7 +153,7 @@ class SolanaChainEventsBrowser {
                 blockTime: Math.floor(Date.now() / 1000),
                 signature
             }).then(() => true).catch(e => {
-                console.error(e);
+                this.logger.error("wsEventHandler: Error when processing signature: " + signature, e);
                 return false;
             });
         };

package/dist/solana/swaps/modules/SwapRefund.js

@@ -185,7 +185,6 @@ class SwapRefund extends SolanaSwapModule_1.SolanaSwapModule {
             throw new base_1.SwapDataVerificationError("ATA not initialized");
         if (feeRate == null)
             feeRate = await this.program.getRefundFeeRate(swapData);
-        console.log("[SolanaSwapProgram] txsRefundsWithAuthorization: feeRate: ", feeRate);
         const signatureBuffer = buffer_1.Buffer.from(signature, "hex");
         const shouldUnwrap = this.shouldUnwrap(swapData);
         const action = await this.RefundWithSignature(swapData, timeout, prefix, signatureBuffer);

package/dist/utils/Utils.js

@@ -31,10 +31,10 @@ function onceAsync(executor) {
 exports.onceAsync = onceAsync;
 function getLogger(prefix) {
     return {
-        debug: (msg, ...args) => console.debug(prefix + msg, ...args),
-        info: (msg, ...args) => console.info(prefix + msg, ...args),
-        warn: (msg, ...args) => console.warn(prefix + msg, ...args),
-        error: (msg, ...args) => console.error(prefix + msg, ...args)
+        debug: (msg, ...args) => global.atomiqLogLevel >= 3 && console.debug(prefix + msg, ...args),
+        info: (msg, ...args) => global.atomiqLogLevel >= 2 && console.info(prefix + msg, ...args),
+        warn: (msg, ...args) => (global.atomiqLogLevel == null || global.atomiqLogLevel >= 1) && console.warn(prefix + msg, ...args),
+        error: (msg, ...args) => (global.atomiqLogLevel == null || global.atomiqLogLevel >= 0) && console.error(prefix + msg, ...args)
     };
 }
 exports.getLogger = getLogger;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atomiqlabs/chain-solana",
-  "version": "9.0.0",
+  "version": "9.0.2",
   "description": "Solana specific base implementation",
   "main": "./dist/index.js",
   "types:": "./dist/index.d.ts",

package/src/solana/SolanaChains.ts

@@ -1,6 +1,13 @@
 import {BitcoinNetwork} from "@atomiqlabs/base";
 
 export const SolanaChains = {
+    //TODO: Not deployed yet
+    [BitcoinNetwork.TESTNET4]: {
+        addresses: {
+            swapContract: "11111111111111111111111111111111",
+            btcRelayContract: "11111111111111111111111111111111"
+        }
+    },
     [BitcoinNetwork.TESTNET]: {
         addresses: {
             swapContract: "4hfUykhqmD7ZRvNh1HuzVKEY7ToENixtdUKZspNDCrEM",

package/src/solana/btcrelay/SolanaBtcRelay.ts

@@ -62,7 +62,8 @@ export class SolanaBtcRelay<B extends BtcBlock> extends SolanaProgramBase<any> i
                     headerTopic: this.BtcRelayHeader(serializedBlock.hash),
                     systemProgram: SystemProgram.programId
                 })
-                .instruction()
+                .instruction(),
+            100_000
         )
     }
 

package/src/solana/chain/modules/SolanaFees.ts

@@ -157,7 +157,6 @@ export class SolanaFees {
 
         if(request.ok) {
             const parsedResponse = await request.json();
-            // console.log(parsedResponse);
             return parsedResponse.result;
         }
 

package/src/solana/events/SolanaChainEvents.ts

@@ -125,13 +125,10 @@ export class SolanaChainEvents extends SolanaChainEventsBrowser {
             const eventObject = this.getEventObjectFromTransaction(transaction);
             if(eventObject==null) return true;
 
-            console.log("Instructions: ", eventObject.instructions);
-            console.log("Events: ", eventObject.events);
-
             await this.processEvent(eventObject);
             return true;
         } catch (e) {
-            console.error(e);
+            this.logger.error("fetchTxAndProcessEvent(): Error fetching transaction and processing event, signature: "+signature, e);
             return false;
         }
     }
@@ -150,7 +147,7 @@ export class SolanaChainEvents extends SolanaChainEventsBrowser {
             if(this.signaturesProcessing[signature]!=null) return;
             if(this.isSignatureProcessed(signature)) return;
 
-            console.log("[Solana Events WebSocket] Process signature: ", signature);
+            this.logger.debug("getWsEventHandler("+name+"): Process signature: ", signature);
 
             this.signaturesProcessing[signature] = this.processEvent({
                 events: [{name, data: data as any}],
@@ -158,7 +155,7 @@ export class SolanaChainEvents extends SolanaChainEventsBrowser {
                 blockTime: Math.floor(Date.now()/1000),
                 signature
             }).then(() => true).catch(e => {
-                console.error(e);
+                this.logger.error("getWsEventHandler("+name+"): Error processing signature: "+signature, e);
                 return false;
             });
         };
@@ -182,7 +179,7 @@ export class SolanaChainEvents extends SolanaChainEventsBrowser {
                 }, "confirmed");
                 //Check if newest returned signature (index 0) is older than the latest signature's slot, this is a sanity check
                 if(fetched.length>0 && fetched[0].slot<lastProcessedSignature.slot) {
-                    console.log("[Solana Events POLL] Sanity check triggered, returned signature slot height is older than latest!");
+                    this.logger.debug("getNewSignatures(): Sanity check triggered, returned signature slot height is older than latest!");
                     return;
                 }
             } else {
@@ -236,7 +233,7 @@ export class SolanaChainEvents extends SolanaChainEventsBrowser {
                     }
                 }
 
-                console.log("[Solana Events POLL] Process signature: ", txSignature);
+                this.logger.debug("processSignatures(): Process signature: ", txSignature);
 
                 const processPromise: Promise<boolean> = this.fetchTxAndProcessEvent(txSignature.signature);
                 this.signaturesProcessing[txSignature.signature] = processPromise;
@@ -248,7 +245,7 @@ export class SolanaChainEvents extends SolanaChainEventsBrowser {
                 delete this.signaturesProcessing[txSignature.signature];
             }
         } catch (e) {
-            console.error(e);
+            this.logger.error("processSignatures(): Failed processing signatures: ", e);
         }
         return lastSuccessfulSignature;
     }
@@ -276,8 +273,7 @@ export class SolanaChainEvents extends SolanaChainEventsBrowser {
         let func;
         func = async () => {
             await this.checkEvents().catch(e => {
-                console.error("Failed to fetch Sol log");
-                console.error(e);
+                this.logger.error("setupHttpPolling(): Failed to fetch Solana log: ", e);
             });
             if(this.stopped) return;
             this.timeout = setTimeout(func, this.logFetchInterval);

package/src/solana/events/SolanaChainEventsBrowser.ts

@@ -211,7 +211,7 @@ export class SolanaChainEventsBrowser implements ChainEvents<SolanaSwapData> {
                 blockTime: Math.floor(Date.now()/1000),
                 signature
             }).then(() => true).catch(e => {
-                console.error(e);
+                this.logger.error("wsEventHandler: Error when processing signature: "+signature, e);
                 return false;
             });
         };

package/src/solana/swaps/modules/SwapRefund.ts

@@ -249,7 +249,6 @@ export class SwapRefund extends SolanaSwapModule {
         if(shouldInitAta && !initAta) throw new SwapDataVerificationError("ATA not initialized");
 
         if(feeRate==null) feeRate = await this.program.getRefundFeeRate(swapData);
-        console.log("[SolanaSwapProgram] txsRefundsWithAuthorization: feeRate: ", feeRate);
 
         const signatureBuffer = Buffer.from(signature, "hex");
 

package/src/utils/Utils.ts

@@ -28,10 +28,10 @@ export function onceAsync<T>(executor: () => Promise<T>): () => Promise<T> {
 
 export function getLogger(prefix: string) {
     return {
-        debug: (msg, ...args) => console.debug(prefix+msg, ...args),
-        info: (msg, ...args) => console.info(prefix+msg, ...args),
-        warn: (msg, ...args) => console.warn(prefix+msg, ...args),
-        error: (msg, ...args) => console.error(prefix+msg, ...args)
+        debug: (msg, ...args) => global.atomiqLogLevel >= 3 && console.debug(prefix+msg, ...args),
+        info: (msg, ...args) => global.atomiqLogLevel >= 2 && console.info(prefix+msg, ...args),
+        warn: (msg, ...args) => (global.atomiqLogLevel==null || global.atomiqLogLevel >= 1) && console.warn(prefix+msg, ...args),
+        error: (msg, ...args) => (global.atomiqLogLevel==null || global.atomiqLogLevel >= 0) && console.error(prefix+msg, ...args)
     };
 }