stackswap-front-api-test-02 1.1.100 → 1.1.102

package/dist/stackswap/config.js

@@ -70,7 +70,7 @@ class StackswapMainetConfig {
         return 'stackswap-farming-v2c5';
     }
     CONTRACT_NAME_STACKSWAP_FARMING_LOGIC_3() {
-        return 'farming-v3a-logic';
+        return 'farming-v3b-logic';
     }
     CONTRACT_NAME_STACKSWAP_FARMING_DATA_3() {
         return 'stackswap-farming-v3-data';

package/dist/stackswap/manager/other.manager.d.ts

@@ -5,5 +5,5 @@ export declare class OtherManager {
     getUserBeta01Data(contract_address: string): Promise<any>;
     claimUserBeta01Reward(contract_address: string, reward: string, callback?: any): Promise<void | 0>;
     get_pox_info(): Promise<any>;
-    stack_stx_to_pox(amount: string, poxAddress: any, start_burn_ht: string, lock_period: string, callback?: any): Promise<void>;
+    stack_stx_to_pox(amount: string, poxAddress: any, start_burn_ht: string, lock_period: string, callback?: any): Promise<string>;
 }

package/dist/stackswap/manager/other.manager.js

@@ -1,13 +1,9 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.OtherManager = void 0;
 const connect_1 = require("@stacks/connect");
 const transactions_1 = require("@stacks/transactions");
 const util_1 = require("../util");
-const bignumber_js_1 = __importDefault(require("bignumber.js"));
 class OtherManager {
     constructor(stackswap) {
         this.stackswap = stackswap;
@@ -41,14 +37,8 @@ class OtherManager {
         return (0, transactions_1.cvToValue)(result).value;
     }
     async stack_stx_to_pox(amount, poxAddress, start_burn_ht, lock_period, callback = null) {
-        const addresss = (0, transactions_1.tupleCV)({
-            hashbytes: (0, transactions_1.bufferCV)(poxAddress),
-            version: (0, transactions_1.bufferCV)(new Buffer(1)),
-        });
-        const amount_str = new bignumber_js_1.default(amount).multipliedBy(10 ** 6).toFixed(0).toString();
-        const options = (0, util_1.getWriteOptions)(this.stackswap, 'SP000000000000000000002Q6VF78.pox', 'stack-stx', [(0, transactions_1.uintCV)(amount_str), addresss, (0, transactions_1.uintCV)(start_burn_ht), (0, transactions_1.uintCV)(lock_period)], [], callback);
-        const result_raw = await (0, connect_1.openContractCall)(options);
-        return result_raw;
+        console.log(amount, poxAddress, start_burn_ht, lock_period, callback);
+        return '';
     }
 }
 exports.OtherManager = OtherManager;

package/dist/stackswap/manager/other.manager.js.map

@@ -1 +1 @@
-{"version":3,"file":"other.manager.js","sourceRoot":"","sources":["../../../src/stackswap/manager/other.manager.ts"],"names":[],"mappings":";;;;;;AAAA,6CAAiD;AACjD,uDAQ8B;AAC9B,kCAAmF;AAEnF,gEAAqC;AAGrC,MAAa,YAAY;IAGvB,YAAY,SAAuB;QACjC,IAAI,CAAC,SAAS,GAAG,SAAS,CAAC;IAC7B,CAAC;IACD,KAAK,CAAC,iBAAiB,CAAE,gBAAwB;QAC/C,IAAG;YACD,MAAM,OAAO,GAAG,IAAA,qBAAc,EAAC,IAAI,CAAC,SAAS,EAAE,gBAAgB,EAAE,kBAAkB,EAAE;gBACnF,IAAA,kCAAmB,EAAC,IAAI,CAAC,SAAS,CAAC,gBAAgB,EAAE,CAAC;aACvD,CAAC,CAAC;YACH,MAAM,MAAM,GAAG,MAAM,IAAA,mCAAoB,EAAC,OAAO,CAAC,CAAC;YACnD,OAAO,IAAA,wBAAS,EAAC,MAAM,CAAC,CAAC,KAAK,CAAC;SAChC;QAAC,OAAO,CAAC,EAAE;YACV,OAAO,CAAC,CAAC;SACV;IACH,CAAC;IAED,KAAK,CAAC,qBAAqB,CAAE,gBAAwB,EAAE,MAAe,EAAE,WAAiB,IAAI;QAC3F,IAAG;YACD,MAAM,cAAc,GAAG,CAAC,MAAM,IAAA,gCAAyB,EAAC,IAAI,CAAC,SAAS,EAAE,gBAAgB,EAAE,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,cAAc,EAAE,CAAC,IAAI,EAAE,MAAM,EAAE,oCAAqB,CAAC,KAAK,CAAC,CAAC,CAAC;YAE7K,MAAM,OAAO,GAAG,IAAA,sBAAe,EAAC,IAAI,CAAC,SAAS,EAAE,gBAAgB,EAAE,cAAc,EAAE,EACjF,EAAE,cAAc,EAAE,QAAQ,CAAC,CAAC;YAC7B,MAAM,UAAU,GAAG,MAAM,IAAA,0BAAgB,EAAC,OAAO,CAAC,CAAC;YACnD,OAAO,UAAU,CAAC;SACnB;QAAC,OAAO,CAAC,EAAE;YACV,OAAO,CAAC,CAAC;SACV;IACH,CAAC;IAED,KAAK,CAAC,YAAY;QAChB,MAAM,OAAO,GAAG,IAAA,qBAAc,EAAC,IAAI,CAAC,SAAS,EAAE,mCAAmC,EAAE,cAAc,EAChG,EAAG,CAAC,CAAC;QACP,MAAM,MAAM,GAAG,MAAM,IAAA,mCAAoB,EAAC,OAAO,CAAC,CAAC;QAEnD,OAAO,IAAA,wBAAS,EAAC,MAAM,CAAC,CAAC,KAAK,CAAC;IACjC,CAAC;IAED,KAAK,CAAC,gBAAgB,CAAC,MAAa,EAAE,UAAe,EAAE,aAAqB,EAAE,WAAmB,EAAE,WAAiB,IAAI;QAEtH,MAAM,QAAQ,GAAG,IAAA,sBAAO,EAAC;YACvB,SAAS,EAAE,IAAA,uBAAQ,EAAC,UAAU,CAAC;YAC/B,OAAO,EAAE,IAAA,uBAAQ,EAAC,IAAI,MAAM,CAAC,CAAC,CAAC,CAAC;SACjC,CAAC,CAAC;QAEH,MAAM,UAAU,GAAG,IAAI,sBAAS,CAAC,MAAM,CAAC,CAAC,YAAY,CAAC,EAAE,IAAE,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,QAAQ,EAAE,CAAA;QAElF,MAAM,OAAO,GAAG,IAAA,sBAAe,EAAC,IAAI,CAAC,SAAS,EAAE,mCAAmC,EAAE,WAAW,EAC9F,CAAE,IAAA,qBAAM,EAAC,UAAU,CAAC,EAAE,QAAQ,EAAE,IAAA,qBAAM,EAAC,aAAa,CAAC,EAAE,IAAA,qBAAM,EAAC,WAAW,CAAC,CAAC,EAAC,EAAE,EAAE,QAAQ,CAAC,CAAC;QAC5F,MAAM,UAAU,GAAG,MAAM,IAAA,0BAAgB,EAAC,OAAO,CAAC,CAAC;QACnD,OAAO,UAAU,CAAC;IAEpB,CAAC;CAEF;AAvDD,oCAuDC"}
+{"version":3,"file":"other.manager.js","sourceRoot":"","sources":["../../../src/stackswap/manager/other.manager.ts"],"names":[],"mappings":";;;AAAA,6CAAiD;AACjD,uDAQ8B;AAC9B,kCAAmF;AAKnF,MAAa,YAAY;IAGvB,YAAY,SAAuB;QACjC,IAAI,CAAC,SAAS,GAAG,SAAS,CAAC;IAC7B,CAAC;IACD,KAAK,CAAC,iBAAiB,CAAE,gBAAwB;QAC/C,IAAG;YACD,MAAM,OAAO,GAAG,IAAA,qBAAc,EAAC,IAAI,CAAC,SAAS,EAAE,gBAAgB,EAAE,kBAAkB,EAAE;gBACnF,IAAA,kCAAmB,EAAC,IAAI,CAAC,SAAS,CAAC,gBAAgB,EAAE,CAAC;aACvD,CAAC,CAAC;YACH,MAAM,MAAM,GAAG,MAAM,IAAA,mCAAoB,EAAC,OAAO,CAAC,CAAC;YACnD,OAAO,IAAA,wBAAS,EAAC,MAAM,CAAC,CAAC,KAAK,CAAC;SAChC;QAAC,OAAO,CAAC,EAAE;YACV,OAAO,CAAC,CAAC;SACV;IACH,CAAC;IAED,KAAK,CAAC,qBAAqB,CAAE,gBAAwB,EAAE,MAAe,EAAE,WAAiB,IAAI;QAC3F,IAAG;YACD,MAAM,cAAc,GAAG,CAAC,MAAM,IAAA,gCAAyB,EAAC,IAAI,CAAC,SAAS,EAAE,gBAAgB,EAAE,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,cAAc,EAAE,CAAC,IAAI,EAAE,MAAM,EAAE,oCAAqB,CAAC,KAAK,CAAC,CAAC,CAAC;YAE7K,MAAM,OAAO,GAAG,IAAA,sBAAe,EAAC,IAAI,CAAC,SAAS,EAAE,gBAAgB,EAAE,cAAc,EAAE,EACjF,EAAE,cAAc,EAAE,QAAQ,CAAC,CAAC;YAC7B,MAAM,UAAU,GAAG,MAAM,IAAA,0BAAgB,EAAC,OAAO,CAAC,CAAC;YACnD,OAAO,UAAU,CAAC;SACnB;QAAC,OAAO,CAAC,EAAE;YACV,OAAO,CAAC,CAAC;SACV;IACH,CAAC;IAED,KAAK,CAAC,YAAY;QAChB,MAAM,OAAO,GAAG,IAAA,qBAAc,EAAC,IAAI,CAAC,SAAS,EAAE,mCAAmC,EAAE,cAAc,EAChG,EAAG,CAAC,CAAC;QACP,MAAM,MAAM,GAAG,MAAM,IAAA,mCAAoB,EAAC,OAAO,CAAC,CAAC;QAEnD,OAAO,IAAA,wBAAS,EAAC,MAAM,CAAC,CAAC,KAAK,CAAC;IACjC,CAAC;IAED,KAAK,CAAC,gBAAgB,CAAC,MAAa,EAAE,UAAe,EAAE,aAAqB,EAAE,WAAmB,EAAE,WAAiB,IAAI;QAatH,OAAO,CAAC,GAAG,CAAC,MAAM,EAAE,UAAU,EAAE,aAAa,EAAE,WAAW,EAAE,QAAQ,CAAC,CAAC;QACtE,OAAO,EAAE,CAAC;IACZ,CAAC;CAEF;AAxDD,oCAwDC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "stackswap-front-api-test-02",
-  "version": "1.1.100",
+  "version": "1.1.102",
   "description": "",
   "scripts": {
     "start": "tsc -b tsconfig.build.json --watch --verbose",
@@ -18,18 +18,19 @@
   "author": "",
   "license": "ISC",
   "dependencies": {
-    "@stacks/connect": "^7.2.1",
-    "@stacks/transactions": "^6.5.0",
-    "axios": "^0.21.1",
+    "@stacks/connect": "^7.7.1",
+    "@stacks/transactions": "^6.15.0",
+    "axios": "1.6.0",
     "bignumber.js": "^9.0.1"
   },
   "devDependencies": {
     "@types/lodash.clonedeep": "^4.5.7",
+    "buffer": "^6.0.3",
     "regenerator-runtime": "^0.13.9",
     "rimraf": "^3.0.2",
     "ts-loader": "^9.1.1",
     "typescript": "^4.2.4",
-    "webpack": "^5.36.1",
+    "webpack": "5.76.0",
     "webpack-cli": "^4.6.0"
   },
   "files": [

package/src/index.ts

@@ -160,6 +160,34 @@ export class StackswapMainnetAPI implements StackswapAPI{
     }
   }
 
+
+  walletConnect2(userSession: UserSession, callback: (err: any, result: any) => void): void {
+    try {
+      showConnect({
+        appDetails: {
+          name: 'Stackswap',
+          icon: 'https://app.stackswap.org/favicon.ico',
+        },
+        redirectTo: '/',
+        onFinish: () => {
+          const profile = userSession.loadUserData().profile.stxAddress;
+          if (this.config.isMainnet()){
+            this.senderAdderss = profile.mainnet;
+          } else {
+            this.senderAdderss = profile.testnet;
+          }
+          this.connected = true;
+
+          callback(null, this.senderAdderss);
+        },
+        userSession
+      });
+    } catch (e) {
+      callback(e, null);
+    }
+  }
+
+
   getConnectedWallet(callback: (err: any, result: any) => void): void {
     try {
       const appConfig = new AppConfig(['store_write', 'publish_data']);

package/src/stackswap/config.ts

@@ -158,7 +158,7 @@ export class StackswapMainetConfig implements StackswapConfig {
   }
 
   CONTRACT_NAME_STACKSWAP_FARMING_LOGIC_3(): string {
-    return 'farming-v3a-logic';
+    return 'farming-v3b-logic';
   }
 
   CONTRACT_NAME_STACKSWAP_FARMING_DATA_3(): string {

package/src/stackswap/manager/other.manager.ts

@@ -1,16 +1,16 @@
 import {openContractCall} from "@stacks/connect";
 import {
-  bufferCV,
+  // bufferCV,
   callReadOnlyFunction,
   cvToValue,
   FungibleConditionCode,
   standardPrincipalCV,
-  tupleCV,
-  uintCV
+  // tupleCV,
+  // uintCV
 } from "@stacks/transactions";
 import {getPostConditionFromAsset, getReadOptions, getWriteOptions} from "../util";
 import {StackswapAPI} from "../../index";
-import BigNumber from "bignumber.js";
+// import BigNumber from "bignumber.js";
 
 
 export class OtherManager {
@@ -54,18 +54,19 @@ export class OtherManager {
 
   async stack_stx_to_pox(amount:string, poxAddress: any, start_burn_ht: string, lock_period: string, callback : any = null){
     // const hashbytes = bufferCV(address.fromBase58Check(poxAddress).hash);
-    const addresss = tupleCV({
-      hashbytes: bufferCV(poxAddress),
-      version: bufferCV(new Buffer(1)),
-    });
-
-    const amount_str = new BigNumber(amount).multipliedBy(10**6).toFixed(0).toString()
-    // // console.log(addresss);
-    const options = getWriteOptions(this.stackswap, 'SP000000000000000000002Q6VF78.pox', 'stack-stx',
-      [ uintCV(amount_str), addresss, uintCV(start_burn_ht), uintCV(lock_period)],[], callback);
-    const result_raw = await openContractCall(options);
-    return result_raw;
-
+    // const addresss = tupleCV({
+    //   hashbytes: bufferCV(poxAddress),
+    //   version: bufferCV(new Buffer(1)),
+    // });
+    //
+    // const amount_str = new BigNumber(amount).multipliedBy(10**6).toFixed(0).toString()
+    // // // console.log(addresss);
+    // const options = getWriteOptions(this.stackswap, 'SP000000000000000000002Q6VF78.pox', 'stack-stx',
+    //   [ uintCV(amount_str), addresss, uintCV(start_burn_ht), uintCV(lock_period)],[], callback);
+    // const result_raw = await openContractCall(options);
+    // return result_raw;
+    console.log(amount, poxAddress, start_burn_ht, lock_period, callback);
+    return '';
   }
 
 }