diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml new file mode 100644 index 000000000..812a4b75d --- /dev/null +++ b/.github/workflows/release.yaml @@ -0,0 +1,44 @@ +name: Release + +defaults: + run: + shell: bash + +on: + push: + branches-ignore: + - '**' + tags: + - 'v*.*.*' + +jobs: + release: + runs-on: ubuntu-latest + steps: + - name: Checkout + uses: actions/checkout@v3 + with: + ref: subscription-market + - name: Node + uses: actions/setup-node@v3 + with: + node-version: 14 + cache: 'yarn' + - name: Install & Build + run: | + export NODE_OPTIONS="--max-old-space-size=8192" + yarn install + yarn react-app:build + - name: Upload to FairOS + uses: onepeerlabs/fdfs@v0.0.9 + with: + version: 0.9.2 + path: packages/react-app/build/* + env: + BEE: ${{secrets.BEE}} + RPC: ${{secrets.RPC}} + STAMP: ${{secrets.STAMP}} + USER_NAME: ${{secrets.USER_NAME}} + PASSWORD: ${{secrets.PASSWORD}} + POD: ${{secrets.POD}} + ROOT: ${{secrets.ROOT}} diff --git a/package.json b/package.json index 6f1391abb..497c9075e 100644 --- a/package.json +++ b/package.json @@ -10,11 +10,11 @@ ], "private": true, "scripts": { - "react-app:build": "yarn workspace @scaffold-eth/react-app build --max-old-space-size=12288", + "react-app:build": "yarn workspace @scaffold-eth/react-app build --max-old-space-size=8192", "react-app:eject": "yarn workspace @scaffold-eth/react-app eject", "react-app:start": "yarn workspace @scaffold-eth/react-app start", "react-app:test": "yarn workspace @scaffold-eth/react-app test", - "build": "yarn workspace @scaffold-eth/react-app build --max-old-space-size=12288", + "build": "yarn workspace @scaffold-eth/react-app build --max-old-space-size=8192", "prettier": "yarn workspace @scaffold-eth/react-app prettier", "chain": "yarn workspace @scaffold-eth/hardhat chain", "fork": "yarn workspace @scaffold-eth/hardhat fork", diff --git a/packages/react-app/package.json b/packages/react-app/package.json index ba71c36f8..68650d77a 100644 --- a/packages/react-app/package.json +++ b/packages/react-app/package.json @@ -1,7 +1,7 @@ { "name": "@scaffold-eth/react-app", "version": "1.0.0", - "homepage": "./", + "homepage": "/public/464fbb8ce96db23dcea3d1667d1c6ab4d3e2a46147dd50d60105dacd93c63ca3", "browserslist": { "production": [ ">0.2%", diff --git a/packages/react-app/public/fairos.wasm b/packages/react-app/public/fairos.wasm index b45cb12bf..6ae3c5d80 100755 Binary files a/packages/react-app/public/fairos.wasm and b/packages/react-app/public/fairos.wasm differ diff --git a/packages/react-app/src/components/index.js b/packages/react-app/src/components/index.js index f6b010b38..96a05441e 100644 --- a/packages/react-app/src/components/index.js +++ b/packages/react-app/src/components/index.js @@ -22,4 +22,4 @@ export { default as NetworkDisplay } from "./NetworkDisplay"; export { default as FaucetHint } from "./FaucetHint"; export { default as NetworkSwitch } from "./NetworkSwitch"; export { default as AddressSimple } from "./AddressSimple"; -export { default as BeeNetworkSwitch } from "./BeeNetworkSwitch"; \ No newline at end of file +export { default as BeeNetworkSwitch } from "./BeeNetworkSwitch"; diff --git a/packages/react-app/src/utils/EncDec.js b/packages/react-app/src/utils/EncDec.js index 9ccffcb08..77dad1551 100644 --- a/packages/react-app/src/utils/EncDec.js +++ b/packages/react-app/src/utils/EncDec.js @@ -53,8 +53,7 @@ export const deriveDriveKey = async (seed, dataEncryptionKey) => { const driveKey = hkdf(Buffer.from(seed), keyByteLength, { info, hash: keyHash }); return urlEncodeHashKey(driveKey); }; -*/ -/* + export const encryptData = async (key, data) => { const keyData = Buffer.from(key, "base64"); const iv = crypto.randomBytes(12); @@ -213,7 +212,7 @@ export function generate_ephemeral_key_pair() { export function nacl_encrypt(message, receiverPublicKey) { try { var ephemeralKeyPair = generate_ephemeral_key_pair(); - return nacl_encrypt_with_key(message, receiverPublicKey, ephemeralKeyPair) + return nacl_encrypt_with_key(message, receiverPublicKey, ephemeralKeyPair); } catch (e) { console.error("nacl_encrypt", e); } @@ -281,9 +280,8 @@ export async function encryptAndUpload(data, recipientKey) { return encryptedDataLocation; } - export async function calculateSharedSecret(fromPrivateKey, toPublicKey) { var publickKey = nacl.scalarMult.base(fromPrivateKey); var sharedSecret = nacl.scalarMult(fromPrivateKey, toPublicKey); return sharedSecret; -} \ No newline at end of file +} diff --git a/packages/react-app/src/views/FairOSWasmConnect.jsx b/packages/react-app/src/views/FairOSWasmConnect.jsx index cd1e86ddf..a3308be86 100644 --- a/packages/react-app/src/views/FairOSWasmConnect.jsx +++ b/packages/react-app/src/views/FairOSWasmConnect.jsx @@ -142,20 +142,16 @@ export function FairOSWasmConnect({ } try { var resp = await window.login(values.username, values.password); - var userStat = await window.userStat(resp.sessionId); - var hash = await window.getNameHash(resp.sessionId, userStat.address); var loginObj = { user: resp.user, sessionId: resp.sessionId, - address: userStat.address, - portableAddress: userStat.address, - nameHash: hash.namehash, + address: resp.address, + portableAddress: resp.address, + nameHash: resp.nameHash, }; - - var loginObj = { user: resp.user, sessionId: resp.sessionId, address: userStat.address, nameHash: hash.namehash }; setLogin(loginObj); - console.log("Login", resp, userStat, loginObj); + console.log("Login", resp, loginObj); // { // "user": "demotime11", // "sessionId": "anfeayKjs1LkQC9fAW1jiiX74TLcJuOECgNQPWwJuOo=" @@ -219,16 +215,15 @@ export function FairOSWasmConnect({ if (!fairOS) { await ConnectFairOS(); } + console.log("LoginWithSignature", portableAddress, signature); let resp = await window.walletLogin(portableAddress, signature); - var userStat = await window.userStat(resp.sessionId); - var hash = await window.getNameHash(resp.sessionId, portableAddress); var loginObj = { user: resp.user, sessionId: resp.sessionId, - address: userStat.address, + address: resp.address, portableAddress: portableAddress, - nameHash: hash.namehash, + nameHash: resp.nameHash, }; setLogin(loginObj); if (loginObj.address.toString() !== loginObj.portableAddress.toString()) { diff --git a/packages/react-app/src/views/categories.js b/packages/react-app/src/views/categories.js index 6f715499d..001a250f8 100644 --- a/packages/react-app/src/views/categories.js +++ b/packages/react-app/src/views/categories.js @@ -693,7 +693,6 @@ export const categoriesTree = [ }, { label: "Health", items: [{ label: "Fitness" }, { label: "Sports" }, { label: "Nutrition" }] }, - { label: "Education", items: [ @@ -1263,5 +1262,3 @@ export const categoryList = [ value: ethers.utils.keccak256(ethers.utils.toUtf8Bytes("Video animation intros")), }, ]; - -