Skip to content
Merged
Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
7a41699
add authorized publishers
paulo-ocean Feb 18, 2025
ab9b858
update test addresses, publishers and decryters
paulo-ocean Feb 18, 2025
3181573
Update test/consumeFlow.test.ts
paulo-ocean Feb 21, 2025
292a924
minor change on validate call
paulo-ocean Feb 24, 2025
1dd9694
no need to supply the provider url param, get it from .env
paulo-ocean Feb 25, 2025
4f84414
Merge branch 'main' into issue-authorized-publisher
paulo-ocean Mar 3, 2025
5368fef
update for sdk 4.0
paulo-ocean Mar 18, 2025
15a52d0
redo package-lock
paulo-ocean Mar 18, 2025
58c245f
use latest ocean.js
alexcos20 Mar 18, 2025
c91531d
redo package-lock
paulo-ocean Mar 19, 2025
3395333
add id prefix did:op due to DDO jS changes
paulo-ocean Mar 19, 2025
4ee0dd5
add also needed chain id
paulo-ocean Mar 19, 2025
19b2e93
more changes, fix tests running
paulo-ocean Mar 19, 2025
d7d6c49
missing update
paulo-ocean Mar 19, 2025
aae0928
set inferred type
paulo-ocean Mar 19, 2025
730af28
try downgrade tsx
paulo-ocean Mar 19, 2025
9b563ca
restore version
paulo-ocean Mar 19, 2025
b64cb41
same version that is on the node
paulo-ocean Mar 19, 2025
ef7013b
update node version on ci
paulo-ocean Mar 19, 2025
8e3d0a5
restore previous version
paulo-ocean Mar 19, 2025
7d70376
fix js lib
paulo-ocean Mar 19, 2025
0b54402
set ref to main
paulo-ocean Mar 19, 2025
9a16ac0
merge main & fix conflicts
paulo-ocean Mar 24, 2025
3aeb7ac
revert changes
paulo-ocean Mar 24, 2025
0f4c2af
restore previous change on ci
paulo-ocean Mar 24, 2025
bd95c4c
remove new line changes from file
paulo-ocean Mar 24, 2025
c415ad4
update validate call
paulo-ocean Mar 24, 2025
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
3 changes: 2 additions & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,8 @@ jobs:
DB_URL: 'http://localhost:8108/?apiKey=xyz'
FEE_TOKENS: '{ "1": "0x967da4048cD07aB37855c090aAF366e4ce1b9F48", "137": "0x282d8efCe846A88B159800bd4130ad77443Fa1A1", "80001": "0xd8992Ed72C445c35Cb4A2be468568Ed1079357c8", "56": "0xDCe07662CA8EbC241316a15B611c89711414Dd1a" }'
FEE_AMOUNT: '{ "amount": 1, "unit": "MB" }'
AUTHORIZED_DECRYPTERS: '["0xe2DD09d719Da89e5a3D0F2549c7E24566e947260"]'
AUTHORIZED_DECRYPTERS: '["0xe2DD09d719Da89e5a3D0F2549c7E24566e947260","0x529043886F21D9bc1AE0feDb751e34265a246e47"]'
AUTHORIZED_PUBLISHERS: '["0xe2DD09d719Da89e5a3D0F2549c7E24566e947260","0x529043886F21D9bc1AE0feDb751e34265a246e47"]'
ALLOWED_ADMINS: '["0xe2DD09d719Da89e5a3D0F2549c7E24566e947260"]'
MAX_REQ_PER_MINUTE: 320
- name: Check Ocean Node is running
Expand Down
2 changes: 1 addition & 1 deletion src/helpers.ts
Original file line number Diff line number Diff line change
Expand Up @@ -109,8 +109,8 @@
name: string,
symbol: string,
owner: Signer,
assetUrl: any,

Check warning on line 112 in src/helpers.ts

View workflow job for this annotation

GitHub Actions / lint

Unexpected any. Specify a different type
ddo: any,

Check warning on line 113 in src/helpers.ts

View workflow job for this annotation

GitHub Actions / lint

Unexpected any. Specify a different type
providerUrl: string,
config: Config,
aquariusInstance: Aquarius,
Expand Down Expand Up @@ -162,7 +162,7 @@
const nft = new Nft(owner, (await owner.provider.getNetwork()).chainId);
let flags;
let metadata;
const validateResult = await aquariusInstance.validate(updatedDdo);
const validateResult = await aquariusInstance.validate(updatedDdo, owner);

Check failure on line 165 in src/helpers.ts

View workflow job for this annotation

GitHub Actions / build

Argument of type 'Signer' is not assignable to parameter of type 'AbortSignal'.

Check failure on line 165 in src/helpers.ts

View workflow job for this annotation

GitHub Actions / test_system

Argument of type 'Signer' is not assignable to parameter of type 'AbortSignal'.
if (encryptDDO) {
const providerResponse = await ProviderInstance.encrypt(
updatedDdo,
Expand Down
1 change: 1 addition & 0 deletions test/consumeFlow.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@ describe("Ocean CLI Publishing", function() {
}

process.env.PRIVATE_KEY = "0x1d751ded5a32226054cd2e71261039b65afb9ee1c746d055dd699b1150a5befc";
// Using this account: 0x529043886F21D9bc1AE0feDb751e34265a246e47
process.env.RPC = "http://127.0.0.1:8545";
process.env.AQUARIUS_URL = "http://127.0.0.1:8001";
process.env.PROVIDER_URL = "http://127.0.0.1:8001";
Expand Down
Loading