Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
48 commits
Select commit Hold shift + click to select a range
f466c57
feat!: drop legacy storage
benjlevesque Jun 20, 2023
9e69da3
fix build + split files
benjlevesque Jun 20, 2023
41abda8
fix keys undefined
benjlevesque Jun 20, 2023
12ec9d4
fix inmemoryindexer
benjlevesque Jun 20, 2023
27dad8e
lint
benjlevesque Jun 20, 2023
bdcc101
config cleanup
benjlevesque Jun 23, 2023
6dffc82
reorganize node/storage
benjlevesque Jun 23, 2023
f4a4ab6
ipfs
benjlevesque Jun 23, 2023
81be91e
remove dependency to currency package
benjlevesque Jun 23, 2023
5c60984
remove unnecessary dep
benjlevesque Jul 12, 2023
88e1bd2
self review & fixes
benjlevesque Jul 25, 2023
154ad35
fix transaction-manager
benjlevesque Jul 25, 2023
4a8f5ad
tests and fixes
benjlevesque Jul 25, 2023
6197a3f
remove duplicate tests CI
benjlevesque Jul 25, 2023
6391871
tiny test adjustments
benjlevesque Jul 25, 2023
70d1f52
fix CI
benjlevesque Jul 25, 2023
d6e3750
ci fix
benjlevesque Jul 25, 2023
62cae2f
fix pending store
benjlevesque Jul 26, 2023
b5226b5
misc fixes
benjlevesque Jul 26, 2023
e9276d2
fix keys field
benjlevesque Jul 26, 2023
ee8e871
wait for thegraph indexing
benjlevesque Jul 26, 2023
d4f29a7
layers
benjlevesque Jul 26, 2023
eb32fdc
retrieve pending items per topic
benjlevesque Jul 27, 2023
c606a19
fix topics & co
benjlevesque Jul 27, 2023
f95b822
fix confirmation
benjlevesque Jul 27, 2023
4260a28
increase ratio
benjlevesque Sep 15, 2023
c8a9504
chore: upgrade ethers
benjlevesque Sep 15, 2023
0f86822
fix build
benjlevesque Oct 3, 2023
3fdbcea
misc
benjlevesque Oct 3, 2023
2643456
fix updatedBetween condition + test shutdown
benjlevesque Oct 4, 2023
edae63f
revert ethereum-waffle
benjlevesque Oct 4, 2023
4684f76
await confirmation
benjlevesque Oct 4, 2023
26b80fe
fix import paths
benjlevesque Oct 4, 2023
46b99f5
add mocha
benjlevesque Oct 4, 2023
c019853
Revert "add mocha"
benjlevesque Oct 4, 2023
6bdccf5
revert mocha
benjlevesque Oct 4, 2023
103d23f
revert package upgrades
benjlevesque Oct 5, 2023
2e83f6b
fix layers
benjlevesque Oct 5, 2023
5d00315
cache test
benjlevesque Oct 5, 2023
461a3a1
Merge branch 'master' into feat/drop-legacy-storage
benjlevesque Oct 5, 2023
c25e171
fit
benjlevesque Oct 5, 2023
dc28218
Merge branch 'master' into feat/drop-legacy-storage
benjlevesque Oct 6, 2023
4231ec2
Merge branch 'master' into feat/drop-legacy-storage
benjlevesque Oct 6, 2023
5557a89
fix version
benjlevesque Oct 6, 2023
4b9d881
nullish coalescing operator
benjlevesque Oct 11, 2023
e3ad460
Merge branch 'master' into feat/drop-legacy-storage
benjlevesque Oct 11, 2023
21f35fe
fix test
benjlevesque Oct 25, 2023
ffb2a23
revert log
benjlevesque Oct 25, 2023
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
60 changes: 7 additions & 53 deletions .circleci/config.yml
Original file line numberDiff line numberDiff line change
Expand Up@@ -96,7 +96,6 @@ jobs:
- run:
name: Generate Payment Detection queries
command: yarn workspace @requestnetwork/payment-detection run codegen

- run:
name: Build all packages (tsc)
command: yarn build:tsc
Expand DownExpand Up@@ -372,6 +371,8 @@ jobs:
- *node_image
- *ipfs_image
- *ganache_image
- *postgres_image
- *graph_image
working_directory: *working_directory
steps:
- attach_workspace:
Expand All@@ -382,6 +383,7 @@ jobs:
- run:
name: 'Deploy test contract from smart-contracts'
command: 'yarn workspace @requestnetwork/smart-contracts run deploy'
- run: *step_graph_deploy
- run:
name: 'Start request-node'
command: 'yarn workspace @requestnetwork/request-node run start'
Expand All@@ -393,44 +395,6 @@ jobs:
- run:
name: 'Test integration-test (layers)'
command: 'yarn workspace @requestnetwork/integration-test run test:layers --ci --maxWorkers=1'
# This test runs the node-client tests against a node backed by TheGraph data access
test-integration-graph-node:
docker:
- *node_image
- *ipfs_image
- *ganache_image
- *postgres_image
- *graph_image
working_directory: *working_directory
steps:
- attach_workspace:
at: *working_directory
- run:
name: 'Build integration-test'
command: 'yarn workspace @requestnetwork/integration-test run build'
- run:
name: 'Deploy test contract from smart-contracts'
command: 'yarn workspace @requestnetwork/smart-contracts run deploy'
- run: *step_graph_deploy
- run:
name: 'Start request-node'
command: 'yarn workspace @requestnetwork/request-node run start'
background: true
environment:
GRAPH_NODE_URL: http://localhost:8000/subgraphs/name/RequestNetwork/request-storage
- run: *step_wait_for_node
- run:
name: 'Confirm TheGraph mode'
command: |
NODE_ENDPOINT=$(wget -O- http://localhost:3000/status | jq .dataAccess.endpoint -r)
if [ "$NODE_ENDPOINT" != "http://localhost:8000/subgraphs/name/RequestNetwork/request-storage" ] ; then
print "Graph node URL mismatch"
print $NODE_ENDPOINT
exit 1
fi
- run:
name: 'Test integration-test'
command: 'yarn workspace @requestnetwork/integration-test run test:node'
test-usage-examples:
docker:
- *node_image
Expand DownExpand Up@@ -528,6 +492,8 @@ jobs:
- *node_image
- *ipfs_image
- *ganache_image
- *postgres_image
- *graph_image
working_directory: *working_directory
steps:
- attach_workspace:
Expand All@@ -538,20 +504,12 @@ jobs:
- run:
name: 'Deploy test contract from smart-contracts'
command: 'yarn workspace @requestnetwork/smart-contracts run deploy'
- run: *step_graph_deploy
- run:
name: 'Start request-node'
command: 'yarn workspace @requestnetwork/request-node run start'
background: true
- run:
name: Waiting for Request Node to be ready
command: |
for i in `seq 1 10`;
do
curl -s -o /dev/null -f http://localhost:3000/readyz > /dev/null && echo Success && exit 0
echo -n .
sleep 1
done
echo Failed waiting for Node initialization && exit 1
- run: *step_wait_for_node
- run:
name: 'Test integration-test (erc20)'
command: 'yarn workspace @requestnetwork/integration-test run test:erc20 --ci --maxWorkers=1'
Expand DownExpand Up@@ -659,9 +617,6 @@ workflows:
- test-integration-test:
requires:
- build
- test-integration-graph-node:
requires:
- build
- test-payment-detection:
requires:
- build
Expand DownExpand Up@@ -699,7 +654,6 @@ workflows:
- test-epk-signature
- test-ethereum-storage
- test-integration-test
- test-integration-graph-node
- test-smart-contracts
- test-multi-format
- test-request-client
Expand Down
11 changes: 5 additions & 6 deletions README.md
Original file line numberDiff line numberDiff line change
Expand Up@@ -41,12 +41,11 @@ Join the [Request Discord][request-discord-url] to get in touch with us.

### Private Packages

| Package | Description |
| ---------------------------------------------------------------------- | ----------------------------------------------------------- |
| [`@requestnetwork/integration-test`](/packages/integration-test) | Integration test for the Request system |
| [`@requestnetwork/prototype-estimator`](/packages/prototype-estimator) | Give estimates of size and throughput of the Request system |
Comment thread
MantisClone marked this conversation as resolved.
| [`@requestnetwork/toolbox`](/packages/toolbox) | Toolbox for Request Network |
| [`@requestnetwork/usage-example`](/packages/usage-example) | Usage examples of Request Network |
| Package | Description |
| ---------------------------------------------------------------- | --------------------------------------- |
| [`@requestnetwork/integration-test`](/packages/integration-test) | Integration test for the Request system |
| [`@requestnetwork/toolbox`](/packages/toolbox) | Toolbox for Request Network |
| [`@requestnetwork/usage-example`](/packages/usage-example) | Usage examples of Request Network |

## Contributing

Expand Down
4 changes: 1 addition & 3 deletions packages/advanced-logic/package.json
Original file line numberDiff line numberDiff line change
Expand Up@@ -42,13 +42,11 @@
"@requestnetwork/currency": "0.10.0",
"@requestnetwork/types": "0.37.0",
"@requestnetwork/utils": "0.37.0",
"@types/node": "16.11.7",
"lodash": "4.17.21",
"tslib": "2.5.0"
},
"devDependencies": {
"@types/jest": "26.0.13",
"@types/lodash": "4.14.161",
"@types/node": "16.11.7",
"jest": "26.4.2",
"nyc": "15.1.0",
"shx": "0.3.2",
Expand Down
4 changes: 0 additions & 4 deletions packages/data-access/package.json
Original file line numberDiff line numberDiff line change
Expand Up@@ -42,14 +42,10 @@
"@requestnetwork/multi-format": "0.15.11",
"@requestnetwork/types": "0.37.0",
"@requestnetwork/utils": "0.37.0",
"bluebird": "3.7.2",
"keyv": "4.0.3",
"tslib": "2.5.0"
},
"devDependencies": {
"@types/bluebird": "3.5.33",
"@types/jest": "26.0.13",
"@types/keyv": "3.1.1",
"@types/node": "16.11.7",
"jest": "26.4.2",
"nyc": "15.1.0",
Expand Down
2 changes: 0 additions & 2 deletions packages/data-access/src/combined-data-access.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -39,6 +39,4 @@ export abstract class CombinedDataAccess implements DataAccessTypes.IDataAccess
channelId: string,
topics?: string[] | undefined,
) => Promise<DataAccessTypes.IReturnPersistTransaction>;

abstract _getStatus(): Promise<any>;
}
Loading