Merge pull request #89 from ardriveapp/main

chore: merge main back to alpha
ardriveapp · Mar 15, 2024 · 589f4f6 · 589f4f6
2 parents b88dca0 + a98767b
commit 589f4f6
Show file tree

Hide file tree

Showing 9 changed files with 51 additions and 28 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -10,7 +10,7 @@ jobs:
     strategy:
       matrix:
         node_version: [18.x, 20.x]
-        command: ['lint', 'format', 'test:docker', 'build']
+        command: ['lint', 'format', 'test', 'build']
     steps:
       - uses: actions/checkout@v3
 

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,10 @@
+## [1.4.2](https://github.com/ardriveapp/turbo-sdk/compare/v1.4.1...v1.4.2) (2024-03-15)
+
+
+### Bug Fixes
+
+* **arbundles:** pin arbundles to 0.9.9 and run tests locally ([c92ce38](https://github.com/ardriveapp/turbo-sdk/commit/c92ce381b63b378443dee5f0d73578df8e3fc7fe))
+
 ## [1.4.1](https://github.com/ardriveapp/turbo-sdk/compare/v1.4.0...v1.4.1) (2024-03-11)
 
 

diff --git a/Dockerfile.test b/Dockerfile.test
@@ -0,0 +1,8 @@
+ARG NODE_VERSION=18.17.0
+
+FROM node:${NODE_VERSION}-bullseye-slim
+WORKDIR /usr/src/turbo-sdk
+RUN apt-get update && apt-get install -y git
+COPY . .
+RUN yarn 
+CMD yarn test
diff --git a/README.md b/README.md
@@ -339,7 +339,8 @@ Types are exported from `./lib/types/[node/web]/index.d.ts` and should be automa
 
 ### Testing
 
-- `yarn test` - runs integration tests
+- `yarn test` - runs integration tests against dev environment (e.g. `https://payment.ardrive.dev` and `https://upload.ardrive.dev`)
+- `yarn test:docker` - runs integration tests against locally running docker containers (recommended)
 - `yarn example:web` - opens up the example web page
 - `yarn example:cjs` - runs example CJS node script
 - `yarn example:esm` - runs example ESM node script

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -1,6 +1,17 @@
 version: 3.0.0
 
 services:
+  test-runner:
+    build:
+      context: .
+      dockerfile: Dockerfile.test
+    environment:
+      - NODE_ENV=test
+      - PAYMENT_SERVICE_BASE_URL=http://payment-service:4000
+      - UPLOAD_SERVICE_BASE_URL=http://upload-service:3000
+    depends_on:
+      - upload-service
+      - payment-service
   upload-service:
     image: ghcr.io/ardriveapp/turbo-upload-service:latest
     ports:

diff --git a/examples/typescript/esm/yarn.lock b/examples/typescript/esm/yarn.lock
@@ -2,12 +2,12 @@
 # yarn lockfile v1
 
 
-"@ardrive/turbo-sdk@^1.4.1":
-  version "1.4.1"
-  resolved "https://registry.yarnpkg.com/@ardrive/turbo-sdk/-/turbo-sdk-1.4.1.tgz#a7c41f9125e8998bced2a8b8e5490ebe74c92685"
-  integrity sha512-O+bH5b/2yPuwa1ZgL1sHhgrAJoR6aUHubz2AK72e2tQ00r4LAMAhyYq+ymhCk0IAhAfhQX/Ho5FSx7k88S9+CA==
+"@ardrive/turbo-sdk@latest":
+  version "1.4.2"
+  resolved "https://registry.yarnpkg.com/@ardrive/turbo-sdk/-/turbo-sdk-1.4.2.tgz#024066dffafe9b27c2fc1771174f6c6b25045b9c"
+  integrity sha512-EIrKAxkNoslV62yLEQgIXrrLUjhM8x9BADPtEkuoPyjKxOWelPMtRJ6kIm/Rugm68Nwna1qFsFp7dcuDG7yUZA==
   dependencies:
-    arbundles "^0.9.9"
+    arbundles "0.9.9"
     arweave "^1.14.4"
     axios "^1.4.0"
     axios-retry "^3.7.0"
@@ -427,10 +427,10 @@ algosdk@^1.13.1:
     tweetnacl "^1.0.3"
     vlq "^2.0.4"
 
-arbundles@^0.9.9:
-  version "0.9.11"
-  resolved "https://registry.yarnpkg.com/arbundles/-/arbundles-0.9.11.tgz#4dbccecc20876b38f01ba4b80abe8ee761c3e1e9"
-  integrity sha512-y42MaiPWzW7MVHd+b/xWvv2Uj0nthAk3SIxRO5r5uw7427KRNYjld293sNyhzK52CHkdaiQIPDdfinmjrxNRYQ==
+arbundles@0.9.9:
+  version "0.9.9"
+  resolved "https://registry.yarnpkg.com/arbundles/-/arbundles-0.9.9.tgz#3b4d6c215a9d022e0805e294287280b2f64fe5c4"
+  integrity sha512-2//u+DW2fDGC+5y2gaM4M4Q+Lx6V71YgVvMF869m41eHYPZZC4OU+Oq2iJpcONv7uao9kvVHE8f1VknmW5GpAQ==
   dependencies:
     "@ethersproject/bytes" "^5.7.0"
     "@ethersproject/hash" "^5.7.0"
@@ -443,7 +443,7 @@ arbundles@^0.9.9:
     base64url "^3.0.1"
     bs58 "^4.0.1"
     keccak "^3.0.2"
-    secp256k1 "^5.0.0"
+    secp256k1 "^4.0.2"
   optionalDependencies:
     "@randlabs/myalgo-connect" "^1.1.2"
     algosdk "^1.13.1"
@@ -991,11 +991,6 @@ node-addon-api@^2.0.0:
   resolved "https://registry.yarnpkg.com/node-addon-api/-/node-addon-api-2.0.2.tgz#432cfa82962ce494b132e9d72a15b29f71ff5d32"
   integrity sha512-Ntyt4AIXyaLIuMHF6IOoTakB3K+RWxwtsHNRxllEoA6vPwP9o4866g6YWDLUdnucilZhmkxiHwHr11gAENw+QA==
 
-node-addon-api@^5.0.0:
-  version "5.1.0"
-  resolved "https://registry.yarnpkg.com/node-addon-api/-/node-addon-api-5.1.0.tgz#49da1ca055e109a23d537e9de43c09cca21eb762"
-  integrity sha512-eh0GgfEkpnoWDq+VY8OyvYhFEzBk6jIYbRKdIlyTiAXIVJ8PyBaKb0rp7oDtoddbdoHWhq8wwr+XZ81F1rpNdA==
-
 node-fetch@^2.6.12:
   version "2.7.0"
   resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.7.0.tgz#d0f0fa6e3e2dc1d27efcd8ad99d550bda94d187d"
@@ -1066,13 +1061,13 @@ scrypt-js@3.0.1:
   resolved "https://registry.yarnpkg.com/scrypt-js/-/scrypt-js-3.0.1.tgz#d314a57c2aef69d1ad98a138a21fe9eafa9ee312"
   integrity sha512-cdwTTnqPu0Hyvf5in5asVdZocVDTNRmR7XEcJuIzMjJeSHybHl7vpB66AzwTaIg6CLSbtjcxc8fqcySfnTkccA==
 
-secp256k1@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/secp256k1/-/secp256k1-5.0.0.tgz#be6f0c8c7722e2481e9773336d351de8cddd12f7"
-  integrity sha512-TKWX8xvoGHrxVdqbYeZM9w+izTF4b9z3NhSaDkdn81btvuh+ivbIMGT/zQvDtTFWhRlThpoz6LEYTr7n8A5GcA==
+secp256k1@^4.0.2:
+  version "4.0.3"
+  resolved "https://registry.yarnpkg.com/secp256k1/-/secp256k1-4.0.3.tgz#c4559ecd1b8d3c1827ed2d1b94190d69ce267303"
+  integrity sha512-NLZVf+ROMxwtEj3Xa562qgv2BK5e2WNmXPiOdVIPLgs6lyTzMvBq0aWTYMI5XCP9jZMVKOcqZLw/Wc4vDkuxhA==
   dependencies:
     elliptic "^6.5.4"
-    node-addon-api "^5.0.0"
+    node-addon-api "^2.0.0"
     node-gyp-build "^4.2.0"
 
 set-function-length@^1.2.1:

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@ardrive/turbo-sdk",
-  "version": "1.4.1",
+  "version": "1.4.2",
   "main": "./lib/cjs/node/index.js",
   "types": "./lib/types/node/index.d.ts",
   "module": "./lib/esm/node/index.js",
@@ -58,16 +58,17 @@
     "test": "c8 mocha --config .mocharc --exit",
     "test:web": "c8 mocha --config .mocharc --exclude tests/**/*.node.test.ts --exit",
     "test:node": "c8 mocha --config .mocharc --exclude tests/**/*.web.test.ts --exit",
-    "test:docker": "docker compose up -d ; PAYMENT_SERVICE_URL=http://localhost:4000 UPLOAD_SERVICE_URL=http://localhost:3000 yarn test ; docker compose down -v",
+    "test:docker": "docker compose up --exit-code-from test-runner --build",
     "prepare": "husky install",
-    "example:mjs": "cd examples/mjs && yarn && node index.mjs",
+    "examples": "yarn example:mjs & yarn example:cjs & yarn example:ts:esm & yarn example:ts:cjs",
+    "example:esm": "cd examples/esm && yarn && node index.mjs",
     "example:cjs": "cd examples/cjs && yarn && node index.cjs",
     "example:web": "http-server --port 8080 --host -o examples/web",
     "example:ts:esm": "cd examples/typescript/esm && yarn && yarn test",
     "example:ts:cjs": "cd examples/typescript/cjs && yarn && yarn test"
   },
   "dependencies": {
-    "arbundles": "^0.9.9",
+    "arbundles": "0.9.9",
     "arweave": "^1.14.4",
     "axios": "^1.4.0",
     "axios-retry": "^3.7.0",

diff --git a/src/version.ts b/src/version.ts
@@ -16,4 +16,4 @@
  */
 
 // AUTOMATICALLY GENERATED FILE - DO NOT TOUCH
-export const version = '1.4.1';
+export const version = '1.4.2';
diff --git a/yarn.lock b/yarn.lock
@@ -1780,7 +1780,7 @@ anymatch@~3.1.2:
   resolved "https://registry.yarnpkg.com/aproba/-/aproba-2.0.0.tgz#52520b8ae5b569215b354efc0caa3fe1e45a8adc"
   integrity sha512-lYe4Gx7QT+MKGbDsA+Z+he/Wtef0BiwDOlK/XkBrdfsh9J/jPPXbX0tE9x9cl27Tmu5gg3QUbUrQYa/y+KOHPQ==
 
-arbundles@^0.9.9:
+arbundles@0.9.9:
   version "0.9.9"
   resolved "https://registry.yarnpkg.com/arbundles/-/arbundles-0.9.9.tgz#3b4d6c215a9d022e0805e294287280b2f64fe5c4"
   integrity sha512-2//u+DW2fDGC+5y2gaM4M4Q+Lx6V71YgVvMF869m41eHYPZZC4OU+Oq2iJpcONv7uao9kvVHE8f1VknmW5GpAQ==