Skip to content

Commit

Permalink
removes upgradeState + domainOnly
Browse files Browse the repository at this point in the history
  • Loading branch information
Dev43 committed Mar 20, 2023
1 parent 3e47ac0 commit 647e298
Show file tree
Hide file tree
Showing 11 changed files with 21 additions and 42 deletions.
2 changes: 1 addition & 1 deletion atw/contract/definition/bindings/json/ContractState.json
Original file line number Diff line number Diff line change
@@ -1 +1 @@
{"title":"ContractState","oneOf":[{"type":"object","required":["archiveRequests","archives","function","owner","uploaders"],"properties":{"archiveRequests":{"type":"object","additionalProperties":{"$ref":"#/definitions/ArchiveRequest"}},"archives":{"type":"object","additionalProperties":{"type":"object","additionalProperties":{"$ref":"#/definitions/ArchiveSubmission"}}},"canEvolve":{"type":["boolean","null"]},"evolve":{"type":["string","null"]},"owner":{"type":"string"},"uploaders":{"type":"object","additionalProperties":{"$ref":"#/definitions/Uploader"}}},"$schema":"http://json-schema.org/draft-07/schema#","title":"state"}],"definitions":{"ArchiveOptions":{"type":"object","required":["depth"],"properties":{"crawlType":{"anyOf":[{"$ref":"#/definitions/CrawlType"},{"type":"null"}]},"depth":{"type":"integer","format":"uint8","minimum":0},"domainOnly":{"type":["boolean","null"]}}},"ArchiveRequest":{"type":"object","required":["endTimestamp","frequency","id","latestArchivedTimestamp","options","requestedBy","startTimestamp","uploaderAddress"],"properties":{"endTimestamp":{"type":"integer","format":"int64"},"frequency":{"type":"string"},"id":{"type":"string"},"latestArchivedTimestamp":{"type":"integer","format":"int64"},"options":{"$ref":"#/definitions/ArchiveRequestOptions"},"requestedBy":{"type":"string"},"startTimestamp":{"type":"integer","format":"int64"},"uploaderAddress":{"type":"string"}}},"ArchiveRequestOptions":{"type":"object","required":["depth","urls"],"properties":{"crawlType":{"anyOf":[{"$ref":"#/definitions/CrawlType"},{"type":"null"}]},"depth":{"type":"integer","format":"uint8","minimum":0},"domainOnly":{"type":["boolean","null"]},"urls":{"type":"array","items":{"type":"string"}}}},"ArchiveSubmission":{"type":"object","required":["archiveRequestId","arweaveTx","fullUrl","options","screenshotTx","size","timestamp","title","uploaderAddress"],"properties":{"archiveRequestId":{"type":"string"},"arweaveTx":{"type":"string"},"fullUrl":{"type":"string"},"options":{"$ref":"#/definitions/ArchiveOptions"},"screenshotTx":{"type":"string"},"size":{"type":"integer","format":"uint","minimum":0},"timestamp":{"type":"integer","format":"int64"},"title":{"type":"string"},"uploaderAddress":{"type":"string"}}},"CrawlType":{"type":"string","enum":["domainOnly","domainWithPageLinks","domainAndLinks"]},"Uploader":{"type":"object","required":["friendlyName","uploadCount"],"properties":{"friendlyName":{"type":"string"},"uploadCount":{"type":"integer","format":"uint","minimum":0}}}}}
{"title":"ContractState","oneOf":[{"type":"object","required":["archiveRequests","archives","function","owner","uploaders"],"properties":{"archiveRequests":{"type":"object","additionalProperties":{"$ref":"#/definitions/ArchiveRequest"}},"archives":{"type":"object","additionalProperties":{"type":"object","additionalProperties":{"$ref":"#/definitions/ArchiveSubmission"}}},"canEvolve":{"type":["boolean","null"]},"evolve":{"type":["string","null"]},"owner":{"type":"string"},"uploaders":{"type":"object","additionalProperties":{"$ref":"#/definitions/Uploader"}}},"$schema":"http://json-schema.org/draft-07/schema#","title":"state"}],"definitions":{"ArchiveOptions":{"type":"object","required":["crawlType","depth"],"properties":{"crawlType":{"$ref":"#/definitions/CrawlType"},"depth":{"type":"integer","format":"uint8","minimum":0}}},"ArchiveRequest":{"type":"object","required":["endTimestamp","frequency","id","latestArchivedTimestamp","options","requestedBy","startTimestamp","uploaderAddress"],"properties":{"endTimestamp":{"type":"integer","format":"int64"},"frequency":{"type":"string"},"id":{"type":"string"},"latestArchivedTimestamp":{"type":"integer","format":"int64"},"options":{"$ref":"#/definitions/ArchiveRequestOptions"},"requestedBy":{"type":"string"},"startTimestamp":{"type":"integer","format":"int64"},"uploaderAddress":{"type":"string"}}},"ArchiveRequestOptions":{"type":"object","required":["crawlType","depth","urls"],"properties":{"crawlType":{"$ref":"#/definitions/CrawlType"},"depth":{"type":"integer","format":"uint8","minimum":0},"urls":{"type":"array","items":{"type":"string"}}}},"ArchiveSubmission":{"type":"object","required":["archiveRequestId","arweaveTx","fullUrl","options","screenshotTx","size","timestamp","title","uploaderAddress"],"properties":{"archiveRequestId":{"type":"string"},"arweaveTx":{"type":"string"},"fullUrl":{"type":"string"},"options":{"$ref":"#/definitions/ArchiveOptions"},"screenshotTx":{"type":"string"},"size":{"type":"integer","format":"uint","minimum":0},"timestamp":{"type":"integer","format":"int64"},"title":{"type":"string"},"uploaderAddress":{"type":"string"}}},"CrawlType":{"type":"string","enum":["domainOnly","domainWithPageLinks","domainAndLinks"]},"Uploader":{"type":"object","required":["friendlyName","uploadCount"],"properties":{"friendlyName":{"type":"string"},"uploadCount":{"type":"integer","format":"uint","minimum":0}}}}}
2 changes: 1 addition & 1 deletion atw/contract/definition/bindings/json/View.json
Original file line number Diff line number Diff line change
@@ -1 +1 @@
{"title":"View","oneOf":[{"type":"object","required":["count","function","url"],"properties":{"count":{"type":"integer","format":"uint","minimum":0},"url":{"type":"string"}},"$schema":"http://json-schema.org/draft-07/schema#","title":"archivesByURL"},{"type":"object","required":["archives","function"],"properties":{"archives":{"$ref":"#/definitions/ArchivesByURLInfo"}},"$schema":"http://json-schema.org/draft-07/schema#","title":"archivesByURLResult"},{"type":"object","required":["address","function"],"properties":{"address":{"type":"string"}},"$schema":"http://json-schema.org/draft-07/schema#","title":"archiveRequestsFor"},{"type":"object","required":["archivesRequests","function"],"properties":{"archivesRequests":{"type":"array","items":{"$ref":"#/definitions/ArchiveRequest"}}},"$schema":"http://json-schema.org/draft-07/schema#","title":"archiveRequestsForResult"},{"type":"object","required":["archiveId","function"],"properties":{"archiveId":{"type":"string"}},"$schema":"http://json-schema.org/draft-07/schema#","title":"archiveRequestByID"},{"type":"object","required":["function"],"properties":{"archivesRequest":{"anyOf":[{"$ref":"#/definitions/ArchiveRequest"},{"type":"null"}]}},"$schema":"http://json-schema.org/draft-07/schema#","title":"archiveRequestByIDResult"},{"type":"object","required":["function"],"properties":{},"$schema":"http://json-schema.org/draft-07/schema#","title":"archives"},{"type":"object","required":["archives","function"],"properties":{"archives":{"type":"array","items":{"$ref":"#/definitions/ArchiveInfo"}}},"$schema":"http://json-schema.org/draft-07/schema#","title":"archivesResult"},{"type":"object","required":["function","timestamp","url"],"properties":{"timestamp":{"type":"integer","format":"int64"},"url":{"type":"string"}},"$schema":"http://json-schema.org/draft-07/schema#","title":"archivesByURLAndTimestamp"},{"type":"object","required":["archive","function"],"properties":{"archive":{"$ref":"#/definitions/ArchiveSubmission"}},"$schema":"http://json-schema.org/draft-07/schema#","title":"archivesByURLAndTimestampResult"}],"definitions":{"ArchiveInfo":{"type":"object","required":["archivedCount","lastArchivedTimestamp","screenshotTx","title","url"],"properties":{"archivedCount":{"type":"integer","format":"uint","minimum":0},"lastArchivedTimestamp":{"type":"integer","format":"int64"},"screenshotTx":{"type":"string"},"title":{"type":"string"},"url":{"type":"string"}}},"ArchiveOptions":{"type":"object","required":["depth"],"properties":{"crawlType":{"anyOf":[{"$ref":"#/definitions/CrawlType"},{"type":"null"}]},"depth":{"type":"integer","format":"uint8","minimum":0},"domainOnly":{"type":["boolean","null"]}}},"ArchiveRequest":{"type":"object","required":["endTimestamp","frequency","id","latestArchivedTimestamp","options","requestedBy","startTimestamp","uploaderAddress"],"properties":{"endTimestamp":{"type":"integer","format":"int64"},"frequency":{"type":"string"},"id":{"type":"string"},"latestArchivedTimestamp":{"type":"integer","format":"int64"},"options":{"$ref":"#/definitions/ArchiveRequestOptions"},"requestedBy":{"type":"string"},"startTimestamp":{"type":"integer","format":"int64"},"uploaderAddress":{"type":"string"}}},"ArchiveRequestOptions":{"type":"object","required":["depth","urls"],"properties":{"crawlType":{"anyOf":[{"$ref":"#/definitions/CrawlType"},{"type":"null"}]},"depth":{"type":"integer","format":"uint8","minimum":0},"domainOnly":{"type":["boolean","null"]},"urls":{"type":"array","items":{"type":"string"}}}},"ArchiveSubmission":{"type":"object","required":["archiveRequestId","arweaveTx","fullUrl","options","screenshotTx","size","timestamp","title","uploaderAddress"],"properties":{"archiveRequestId":{"type":"string"},"arweaveTx":{"type":"string"},"fullUrl":{"type":"string"},"options":{"$ref":"#/definitions/ArchiveOptions"},"screenshotTx":{"type":"string"},"size":{"type":"integer","format":"uint","minimum":0},"timestamp":{"type":"integer","format":"int64"},"title":{"type":"string"},"uploaderAddress":{"type":"string"}}},"ArchivesByURLInfo":{"type":"object","required":["archivedInfo","lastArchivedTimestamp","screenshotTx","title","url"],"properties":{"archivedInfo":{"type":"array","items":{"$ref":"#/definitions/ArchiveSubmission"}},"lastArchivedTimestamp":{"type":"integer","format":"int64"},"screenshotTx":{"type":"string"},"title":{"type":"string"},"url":{"type":"string"}}},"CrawlType":{"type":"string","enum":["domainOnly","domainWithPageLinks","domainAndLinks"]}}}
{"title":"View","oneOf":[{"type":"object","required":["count","function","url"],"properties":{"count":{"type":"integer","format":"uint","minimum":0},"url":{"type":"string"}},"$schema":"http://json-schema.org/draft-07/schema#","title":"archivesByURL"},{"type":"object","required":["archives","function"],"properties":{"archives":{"$ref":"#/definitions/ArchivesByURLInfo"}},"$schema":"http://json-schema.org/draft-07/schema#","title":"archivesByURLResult"},{"type":"object","required":["address","function"],"properties":{"address":{"type":"string"}},"$schema":"http://json-schema.org/draft-07/schema#","title":"archiveRequestsFor"},{"type":"object","required":["archivesRequests","function"],"properties":{"archivesRequests":{"type":"array","items":{"$ref":"#/definitions/ArchiveRequest"}}},"$schema":"http://json-schema.org/draft-07/schema#","title":"archiveRequestsForResult"},{"type":"object","required":["archiveId","function"],"properties":{"archiveId":{"type":"string"}},"$schema":"http://json-schema.org/draft-07/schema#","title":"archiveRequestByID"},{"type":"object","required":["function"],"properties":{"archivesRequest":{"anyOf":[{"$ref":"#/definitions/ArchiveRequest"},{"type":"null"}]}},"$schema":"http://json-schema.org/draft-07/schema#","title":"archiveRequestByIDResult"},{"type":"object","required":["function"],"properties":{},"$schema":"http://json-schema.org/draft-07/schema#","title":"archives"},{"type":"object","required":["archives","function"],"properties":{"archives":{"type":"array","items":{"$ref":"#/definitions/ArchiveInfo"}}},"$schema":"http://json-schema.org/draft-07/schema#","title":"archivesResult"},{"type":"object","required":["function","timestamp","url"],"properties":{"timestamp":{"type":"integer","format":"int64"},"url":{"type":"string"}},"$schema":"http://json-schema.org/draft-07/schema#","title":"archivesByURLAndTimestamp"},{"type":"object","required":["archive","function"],"properties":{"archive":{"$ref":"#/definitions/ArchiveSubmission"}},"$schema":"http://json-schema.org/draft-07/schema#","title":"archivesByURLAndTimestampResult"}],"definitions":{"ArchiveInfo":{"type":"object","required":["archivedCount","lastArchivedTimestamp","screenshotTx","title","url"],"properties":{"archivedCount":{"type":"integer","format":"uint","minimum":0},"lastArchivedTimestamp":{"type":"integer","format":"int64"},"screenshotTx":{"type":"string"},"title":{"type":"string"},"url":{"type":"string"}}},"ArchiveOptions":{"type":"object","required":["crawlType","depth"],"properties":{"crawlType":{"$ref":"#/definitions/CrawlType"},"depth":{"type":"integer","format":"uint8","minimum":0}}},"ArchiveRequest":{"type":"object","required":["endTimestamp","frequency","id","latestArchivedTimestamp","options","requestedBy","startTimestamp","uploaderAddress"],"properties":{"endTimestamp":{"type":"integer","format":"int64"},"frequency":{"type":"string"},"id":{"type":"string"},"latestArchivedTimestamp":{"type":"integer","format":"int64"},"options":{"$ref":"#/definitions/ArchiveRequestOptions"},"requestedBy":{"type":"string"},"startTimestamp":{"type":"integer","format":"int64"},"uploaderAddress":{"type":"string"}}},"ArchiveRequestOptions":{"type":"object","required":["crawlType","depth","urls"],"properties":{"crawlType":{"$ref":"#/definitions/CrawlType"},"depth":{"type":"integer","format":"uint8","minimum":0},"urls":{"type":"array","items":{"type":"string"}}}},"ArchiveSubmission":{"type":"object","required":["archiveRequestId","arweaveTx","fullUrl","options","screenshotTx","size","timestamp","title","uploaderAddress"],"properties":{"archiveRequestId":{"type":"string"},"arweaveTx":{"type":"string"},"fullUrl":{"type":"string"},"options":{"$ref":"#/definitions/ArchiveOptions"},"screenshotTx":{"type":"string"},"size":{"type":"integer","format":"uint","minimum":0},"timestamp":{"type":"integer","format":"int64"},"title":{"type":"string"},"uploaderAddress":{"type":"string"}}},"ArchivesByURLInfo":{"type":"object","required":["archivedInfo","lastArchivedTimestamp","screenshotTx","title","url"],"properties":{"archivedInfo":{"type":"array","items":{"$ref":"#/definitions/ArchiveSubmission"}},"lastArchivedTimestamp":{"type":"integer","format":"int64"},"screenshotTx":{"type":"string"},"title":{"type":"string"},"url":{"type":"string"}}},"CrawlType":{"type":"string","enum":["domainOnly","domainWithPageLinks","domainAndLinks"]}}}
2 changes: 1 addition & 1 deletion atw/contract/definition/bindings/json/WriteAction.json
Original file line number Diff line number Diff line change
@@ -1 +1 @@
{"title":"WriteAction","oneOf":[{"type":"object","required":["friendlyName","function"],"properties":{"friendlyName":{"type":"string"}},"$schema":"http://json-schema.org/draft-07/schema#","title":"registerUploader"},{"type":"object","required":["endTimestamp","frequency","function","options","startTimestamp","uploaderAddress"],"properties":{"endTimestamp":{"type":"integer","format":"int64"},"frequency":{"type":"string"},"options":{"$ref":"#/definitions/ArchiveRequestOptions"},"startTimestamp":{"type":"integer","format":"int64"},"uploaderAddress":{"type":"string"}},"$schema":"http://json-schema.org/draft-07/schema#","title":"requestArchiving"},{"type":"object","required":["archiveRequestId","arweaveTx","fullUrl","function","options","screenshotTx","size","timestamp","title"],"properties":{"archiveRequestId":{"type":"string"},"arweaveTx":{"type":"string"},"fullUrl":{"type":"string"},"options":{"$ref":"#/definitions/ArchiveOptions"},"screenshotTx":{"type":"string"},"size":{"type":"integer","format":"uint","minimum":0},"timestamp":{"type":"integer","format":"int64"},"title":{"type":"string"}},"$schema":"http://json-schema.org/draft-07/schema#","title":"submitArchive"},{"type":"object","required":["archiveId","function"],"properties":{"archiveId":{"type":"string"}},"$schema":"http://json-schema.org/draft-07/schema#","title":"deleteArchiveRequest"},{"type":"object","required":["function"],"properties":{},"$schema":"http://json-schema.org/draft-07/schema#","title":"deRegisterUploader"},{"type":"object","required":["function","value"],"properties":{"value":{"type":"string"}},"$schema":"http://json-schema.org/draft-07/schema#","title":"evolve"},{"type":"object","required":["function"],"properties":{},"$schema":"http://json-schema.org/draft-07/schema#","title":"upgradeState"}],"definitions":{"ArchiveOptions":{"type":"object","required":["depth"],"properties":{"crawlType":{"anyOf":[{"$ref":"#/definitions/CrawlType"},{"type":"null"}]},"depth":{"type":"integer","format":"uint8","minimum":0},"domainOnly":{"type":["boolean","null"]}}},"ArchiveRequestOptions":{"type":"object","required":["depth","urls"],"properties":{"crawlType":{"anyOf":[{"$ref":"#/definitions/CrawlType"},{"type":"null"}]},"depth":{"type":"integer","format":"uint8","minimum":0},"domainOnly":{"type":["boolean","null"]},"urls":{"type":"array","items":{"type":"string"}}}},"CrawlType":{"type":"string","enum":["domainOnly","domainWithPageLinks","domainAndLinks"]}}}
{"title":"WriteAction","oneOf":[{"type":"object","required":["friendlyName","function"],"properties":{"friendlyName":{"type":"string"}},"$schema":"http://json-schema.org/draft-07/schema#","title":"registerUploader"},{"type":"object","required":["endTimestamp","frequency","function","options","startTimestamp","uploaderAddress"],"properties":{"endTimestamp":{"type":"integer","format":"int64"},"frequency":{"type":"string"},"options":{"$ref":"#/definitions/ArchiveRequestOptions"},"startTimestamp":{"type":"integer","format":"int64"},"uploaderAddress":{"type":"string"}},"$schema":"http://json-schema.org/draft-07/schema#","title":"requestArchiving"},{"type":"object","required":["archiveRequestId","arweaveTx","fullUrl","function","options","screenshotTx","size","timestamp","title"],"properties":{"archiveRequestId":{"type":"string"},"arweaveTx":{"type":"string"},"fullUrl":{"type":"string"},"options":{"$ref":"#/definitions/ArchiveOptions"},"screenshotTx":{"type":"string"},"size":{"type":"integer","format":"uint","minimum":0},"timestamp":{"type":"integer","format":"int64"},"title":{"type":"string"}},"$schema":"http://json-schema.org/draft-07/schema#","title":"submitArchive"},{"type":"object","required":["archiveId","function"],"properties":{"archiveId":{"type":"string"}},"$schema":"http://json-schema.org/draft-07/schema#","title":"deleteArchiveRequest"},{"type":"object","required":["function"],"properties":{},"$schema":"http://json-schema.org/draft-07/schema#","title":"deRegisterUploader"},{"type":"object","required":["function","value"],"properties":{"value":{"type":"string"}},"$schema":"http://json-schema.org/draft-07/schema#","title":"evolve"}],"definitions":{"ArchiveOptions":{"type":"object","required":["crawlType","depth"],"properties":{"crawlType":{"$ref":"#/definitions/CrawlType"},"depth":{"type":"integer","format":"uint8","minimum":0}}},"ArchiveRequestOptions":{"type":"object","required":["crawlType","depth","urls"],"properties":{"crawlType":{"$ref":"#/definitions/CrawlType"},"depth":{"type":"integer","format":"uint8","minimum":0},"urls":{"type":"array","items":{"type":"string"}}}},"CrawlType":{"type":"string","enum":["domainOnly","domainWithPageLinks","domainAndLinks"]}}}
13 changes: 1 addition & 12 deletions atw/contract/definition/bindings/ts/AtwContract.ts
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,7 @@ import {
SubmitArchive,
DeleteArchiveRequest,
DeRegisterUploader,
Evolve,
UpgradeState
Evolve
} from './WriteAction';
import { State } from './ContractState';

Expand Down Expand Up @@ -181,14 +180,4 @@ export class AtwContract {
async evolve(evolve: Evolve, options?: WriteInteractionOptions): Promise<WriteInteractionResponse | null> {
return await this.contract.writeInteraction<BaseInput & Evolve>({ function: 'evolve', ...evolve }, options);
}

async upgradeState(
upgradeState: UpgradeState,
options?: WriteInteractionOptions
): Promise<WriteInteractionResponse | null> {
return await this.contract.writeInteraction<BaseInput & UpgradeState>(
{ function: 'upgradeState', ...upgradeState },
options
);
}
}
6 changes: 2 additions & 4 deletions atw/contract/definition/bindings/ts/ContractState.ts
Original file line number Diff line number Diff line change
Expand Up @@ -35,9 +35,8 @@ export interface ArchiveRequest {
uploaderAddress: string;
}
export interface ArchiveRequestOptions {
crawlType?: CrawlType | null;
crawlType: CrawlType;
depth: number;
domainOnly?: boolean | null;
urls: string[];
}
export interface ArchiveSubmission {
Expand All @@ -52,9 +51,8 @@ export interface ArchiveSubmission {
uploaderAddress: string;
}
export interface ArchiveOptions {
crawlType?: CrawlType | null;
crawlType: CrawlType;
depth: number;
domainOnly?: boolean | null;
}
export interface Uploader {
friendlyName: string;
Expand Down
Loading

0 comments on commit 647e298

Please sign in to comment.