Commit 4a621817 authored by allan's avatar allan

bare update

parent 2713fa3d
This diff is collapsed.
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
"preelectron-pack": "npm run build", "preelectron-pack": "npm run build",
"prettier": "prettier --write --single-quote --trailing-comma es5 \"src/**/*.js\" public/electron.js", "prettier": "prettier --write --single-quote --trailing-comma es5 \"src/**/*.js\" public/electron.js",
"preinstall": "npx npm-force-resolutions", "preinstall": "npx npm-force-resolutions",
"postinstall": "pip3 install git+https://git.bitsoko.org/bitsoko/tinyman-py-sdk.git && npm install -g @grpc/proto-loader @grpc/grpc-js react-dom faker --runtime=electron && npm run protobuf", "postinstall": "pip3 install git+https://git.bitsoko.org/bitsoko/tinyman-py-sdk.git && npm install @grpc/proto-loader @grpc/grpc-js react-dom faker --runtime=electron --legacy-peer-deps && npm run protobuf",
"storybook": "start-storybook -p 9009 -s public", "storybook": "start-storybook -p 9009 -s public",
"build-storybook": "build-storybook -s public", "build-storybook": "build-storybook -s public",
"build-icon": "svgr --native --icon --filename-case kebab -d src/asset/icon src/asset/icon", "build-icon": "svgr --native --icon --filename-case kebab -d src/asset/icon src/asset/icon",
...@@ -32,8 +32,8 @@ ...@@ -32,8 +32,8 @@
"dependencies": { "dependencies": {
"@capacitor/android": "^3.3.3", "@capacitor/android": "^3.3.3",
"@capacitor/core": "^3.3.3", "@capacitor/core": "^3.3.3",
"@grpc/grpc-js": "^1.3.7", "@grpc/grpc-js": "^1.7.1",
"@grpc/proto-loader": "^0.6.9", "@grpc/proto-loader": "^0.6.13",
"@react-native-async-storage/async-storage": "latest", "@react-native-async-storage/async-storage": "latest",
"@solana/web3.js": "latest", "@solana/web3.js": "latest",
"algosdk": "latest", "algosdk": "latest",
...@@ -55,7 +55,7 @@ ...@@ -55,7 +55,7 @@
"react": "^16.10.0", "react": "^16.10.0",
"react-art": "^16.8.6", "react-art": "^16.8.6",
"react-chartjs-2": "^4.0.0", "react-chartjs-2": "^4.0.0",
"react-dom": "16.8.6", "react-dom": "^16.14.0",
"react-native-web": "^0.11.2", "react-native-web": "^0.11.2",
"react-scripts": "4.0.1", "react-scripts": "4.0.1",
"router-dom": "^2.2.9", "router-dom": "^2.2.9",
...@@ -103,7 +103,7 @@ ...@@ -103,7 +103,7 @@
"unexpected": "^10.37.2", "unexpected": "^10.37.2",
"unexpected-sinon": "^10.10.1", "unexpected-sinon": "^10.10.1",
"wait-on": "^2.1.0", "wait-on": "^2.1.0",
"webpack": "4.44.2" "webpack": "^4.46.0"
}, },
"resolutions": { "resolutions": {
"react-error-overlay": "6.0.9" "react-error-overlay": "6.0.9"
......
...@@ -51,13 +51,15 @@ function handleExit(code) { ...@@ -51,13 +51,15 @@ function handleExit(code) {
function getProcessName(binName) { function getProcessName(binName) {
const filePath = path.join(__dirname, '..', 'src', 'chains', 'algo', 'pools.py');
/*
const filename = os.platform() === 'win32' ? `${binName}.exe` : binName; const filename = os.platform() === 'win32' ? `${binName}.exe` : binName;
const filePath = __dirname.includes('asar') const filePath = __dirname.includes('asar')
? path.join(__dirname, '..', '..', 'assets', 'bin', os.platform(), filename) ? path.join(__dirname, '..', '..', 'assets', 'bin', os.platform(), filename)
: path.join(__dirname, '..', 'assets', 'bin', os.platform(), filename); : path.join(__dirname, '..', 'assets', 'bin', os.platform(), filename);
*/
console.log(fs.existsSync(filePath),path.join(__dirname, '..', 'assets', 'bin', os.platform(), filename)); console.log(fs.existsSync(filePath), filePath);
return fs.existsSync(filePath) ? filePath : filename; return fs.existsSync(filePath) ? filePath : filename;
} }
......
File mode changed from 100644 to 100755
#!/usr/bin/env python3
from tinyman.v1.client import TinymanTestnetClient, TinymanMainnetClient from tinyman.v1.client import TinymanTestnetClient, TinymanMainnetClient
from algosdk import account, encoding , mnemonic from algosdk import account, encoding , mnemonic
from bootstrap import prepare_bootstrap_transactions from bootstrap import prepare_bootstrap_transactions
...@@ -183,7 +184,7 @@ if action == "swap": ...@@ -183,7 +184,7 @@ if action == "swap":
'private_key': priv_key, 'private_key': priv_key,
} }
client = TinymanTestnetClient(user_address=account['address']) client = TinymanMainnetClient(user_address=account['address'])
swap(client,action,aID1,aID2,account,mne,amount) swap(client,action,aID1,aID2,account,mne,amount)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment