Skip to content

Commit

Permalink
chore: merge conflicts
Browse files Browse the repository at this point in the history
  • Loading branch information
@aorumbayev
aorumbayev committed Sep 20, 2024
1 parent 84c5ad5 commit 426df3b
Show file tree
Hide file tree
Showing 48 changed files with 170 additions and 8,613 deletions.
64 changes: 0 additions & 64 deletions ...ses/types_algorand_client_transaction_sender.AlgorandClientTransactionSender.md
View file

Large diffs are not rendered by default.

1,858 changes: 56 additions & 1,802 deletions docs/code/classes/types_app_client.AppClient.md
View file

Large diffs are not rendered by default.

1,064 changes: 40 additions & 1,024 deletions docs/code/classes/types_app_client.ApplicationClient.md
View file

Large diffs are not rendered by default.

24 changes: 0 additions & 24 deletions docs/code/classes/types_app_deployer.AppDeployer.md
View file

Large diffs are not rendered by default.

488 changes: 0 additions & 488 deletions docs/code/classes/types_app_factory.AppFactory.md
View file

Large diffs are not rendered by default.

760 changes: 1 addition & 759 deletions docs/code/classes/types_client_manager.ClientManager.md
View file

Large diffs are not rendered by default.

1,222 changes: 0 additions & 1,222 deletions docs/code/classes/types_composer.default.md
View file

Large diffs are not rendered by default.

240 changes: 0 additions & 240 deletions docs/code/interfaces/types_app_arc56.Arc56Contract.md
View file

Large diffs are not rendered by default.

48 changes: 0 additions & 48 deletions docs/code/interfaces/types_app_arc56.Event.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,23 +24,7 @@ The arguments of the event, in order

#### Defined in

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
[src/types/app-arc56.ts:382](https://github.com/algorandfoundation/algokit-utils-ts/blob/main/src/types/app-arc56.ts#L382)
=======
[src/types/app-arc56.ts:183](https://github.com/algorandfoundation/algokit-utils-ts/blob/main/src/types/app-arc56.ts#L183)
>>>>>>> e7c345f (feat: Added `AppClient` as an ARC-56 compatible non-typed application client)
=======
[src/types/app-arc56.ts:219](https://github.com/algorandfoundation/algokit-utils-ts/blob/main/src/types/app-arc56.ts#L219)
>>>>>>> 35253a5 (feat: Added `AppFactory` as an ARC-32/ARC-56 compatible mechanism to create and deploy apps and create app clients)
=======
[src/types/app-arc56.ts:382](https://github.com/algorandfoundation/algokit-utils-ts/blob/main/src/types/app-arc56.ts#L382)
>>>>>>> 5dd8a6c (feat: Proper ARC-56 struct support)
=======
[src/types/app-arc56.ts:381](https://github.com/algorandfoundation/algokit-utils-ts/blob/main/src/types/app-arc56.ts#L381)
>>>>>>> 2504c82 (Linting and PR review)

___

Expand All @@ -52,23 +36,7 @@ Optional, user-friendly description for the event

#### Defined in

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
[src/types/app-arc56.ts:380](https://github.com/algorandfoundation/algokit-utils-ts/blob/main/src/types/app-arc56.ts#L380)
=======
[src/types/app-arc56.ts:181](https://github.com/algorandfoundation/algokit-utils-ts/blob/main/src/types/app-arc56.ts#L181)
>>>>>>> e7c345f (feat: Added `AppClient` as an ARC-56 compatible non-typed application client)
=======
[src/types/app-arc56.ts:217](https://github.com/algorandfoundation/algokit-utils-ts/blob/main/src/types/app-arc56.ts#L217)
>>>>>>> 35253a5 (feat: Added `AppFactory` as an ARC-32/ARC-56 compatible mechanism to create and deploy apps and create app clients)
=======
[src/types/app-arc56.ts:380](https://github.com/algorandfoundation/algokit-utils-ts/blob/main/src/types/app-arc56.ts#L380)
>>>>>>> 5dd8a6c (feat: Proper ARC-56 struct support)
=======
[src/types/app-arc56.ts:379](https://github.com/algorandfoundation/algokit-utils-ts/blob/main/src/types/app-arc56.ts#L379)
>>>>>>> 2504c82 (Linting and PR review)

___

Expand All @@ -80,20 +48,4 @@ The name of the event

#### Defined in

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
[src/types/app-arc56.ts:378](https://github.com/algorandfoundation/algokit-utils-ts/blob/main/src/types/app-arc56.ts#L378)
=======
[src/types/app-arc56.ts:179](https://github.com/algorandfoundation/algokit-utils-ts/blob/main/src/types/app-arc56.ts#L179)
>>>>>>> e7c345f (feat: Added `AppClient` as an ARC-56 compatible non-typed application client)
=======
[src/types/app-arc56.ts:215](https://github.com/algorandfoundation/algokit-utils-ts/blob/main/src/types/app-arc56.ts#L215)
>>>>>>> 35253a5 (feat: Added `AppFactory` as an ARC-32/ARC-56 compatible mechanism to create and deploy apps and create app clients)
=======
[src/types/app-arc56.ts:378](https://github.com/algorandfoundation/algokit-utils-ts/blob/main/src/types/app-arc56.ts#L378)
>>>>>>> 5dd8a6c (feat: Proper ARC-56 struct support)
=======
[src/types/app-arc56.ts:377](https://github.com/algorandfoundation/algokit-utils-ts/blob/main/src/types/app-arc56.ts#L377)
>>>>>>> 2504c82 (Linting and PR review)
128 changes: 0 additions & 128 deletions docs/code/interfaces/types_app_arc56.Method.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,23 +36,7 @@ an action is a combination of call/create and an OnComplete

#### Defined in

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
[src/types/app-arc56.ts:341](https://github.com/algorandfoundation/algokit-utils-ts/blob/main/src/types/app-arc56.ts#L341)
=======
[src/types/app-arc56.ts:142](https://github.com/algorandfoundation/algokit-utils-ts/blob/main/src/types/app-arc56.ts#L142)
>>>>>>> e7c345f (feat: Added `AppClient` as an ARC-56 compatible non-typed application client)
=======
[src/types/app-arc56.ts:178](https://github.com/algorandfoundation/algokit-utils-ts/blob/main/src/types/app-arc56.ts#L178)
>>>>>>> 35253a5 (feat: Added `AppFactory` as an ARC-32/ARC-56 compatible mechanism to create and deploy apps and create app clients)
=======
[src/types/app-arc56.ts:341](https://github.com/algorandfoundation/algokit-utils-ts/blob/main/src/types/app-arc56.ts#L341)
>>>>>>> 5dd8a6c (feat: Proper ARC-56 struct support)
=======
[src/types/app-arc56.ts:340](https://github.com/algorandfoundation/algokit-utils-ts/blob/main/src/types/app-arc56.ts#L340)
>>>>>>> 2504c82 (Linting and PR review)

___

Expand All @@ -64,23 +48,7 @@ The arguments of the method, in order

#### Defined in

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
[src/types/app-arc56.ts:319](https://github.com/algorandfoundation/algokit-utils-ts/blob/main/src/types/app-arc56.ts#L319)
=======
[src/types/app-arc56.ts:120](https://github.com/algorandfoundation/algokit-utils-ts/blob/main/src/types/app-arc56.ts#L120)
>>>>>>> e7c345f (feat: Added `AppClient` as an ARC-56 compatible non-typed application client)
=======
[src/types/app-arc56.ts:156](https://github.com/algorandfoundation/algokit-utils-ts/blob/main/src/types/app-arc56.ts#L156)
>>>>>>> 35253a5 (feat: Added `AppFactory` as an ARC-32/ARC-56 compatible mechanism to create and deploy apps and create app clients)
=======
[src/types/app-arc56.ts:319](https://github.com/algorandfoundation/algokit-utils-ts/blob/main/src/types/app-arc56.ts#L319)
>>>>>>> 5dd8a6c (feat: Proper ARC-56 struct support)
=======
[src/types/app-arc56.ts:318](https://github.com/algorandfoundation/algokit-utils-ts/blob/main/src/types/app-arc56.ts#L318)
>>>>>>> 2504c82 (Linting and PR review)

___

Expand All @@ -92,23 +60,7 @@ Optional, user-friendly description for the method

#### Defined in

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
[src/types/app-arc56.ts:317](https://github.com/algorandfoundation/algokit-utils-ts/blob/main/src/types/app-arc56.ts#L317)
=======
[src/types/app-arc56.ts:118](https://github.com/algorandfoundation/algokit-utils-ts/blob/main/src/types/app-arc56.ts#L118)
>>>>>>> e7c345f (feat: Added `AppClient` as an ARC-56 compatible non-typed application client)
=======
[src/types/app-arc56.ts:154](https://github.com/algorandfoundation/algokit-utils-ts/blob/main/src/types/app-arc56.ts#L154)
>>>>>>> 35253a5 (feat: Added `AppFactory` as an ARC-32/ARC-56 compatible mechanism to create and deploy apps and create app clients)
=======
[src/types/app-arc56.ts:317](https://github.com/algorandfoundation/algokit-utils-ts/blob/main/src/types/app-arc56.ts#L317)
>>>>>>> 5dd8a6c (feat: Proper ARC-56 struct support)
=======
[src/types/app-arc56.ts:316](https://github.com/algorandfoundation/algokit-utils-ts/blob/main/src/types/app-arc56.ts#L316)
>>>>>>> 2504c82 (Linting and PR review)

___

Expand All @@ -120,23 +72,7 @@ ARC-28 events that MAY be emitted by this method

#### Defined in

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
[src/types/app-arc56.ts:350](https://github.com/algorandfoundation/algokit-utils-ts/blob/main/src/types/app-arc56.ts#L350)
=======
[src/types/app-arc56.ts:151](https://github.com/algorandfoundation/algokit-utils-ts/blob/main/src/types/app-arc56.ts#L151)
>>>>>>> e7c345f (feat: Added `AppClient` as an ARC-56 compatible non-typed application client)
=======
[src/types/app-arc56.ts:187](https://github.com/algorandfoundation/algokit-utils-ts/blob/main/src/types/app-arc56.ts#L187)
>>>>>>> 35253a5 (feat: Added `AppFactory` as an ARC-32/ARC-56 compatible mechanism to create and deploy apps and create app clients)
=======
[src/types/app-arc56.ts:350](https://github.com/algorandfoundation/algokit-utils-ts/blob/main/src/types/app-arc56.ts#L350)
>>>>>>> 5dd8a6c (feat: Proper ARC-56 struct support)
=======
[src/types/app-arc56.ts:349](https://github.com/algorandfoundation/algokit-utils-ts/blob/main/src/types/app-arc56.ts#L349)
>>>>>>> 2504c82 (Linting and PR review)

___

Expand All @@ -148,23 +84,7 @@ The name of the method

#### Defined in

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
[src/types/app-arc56.ts:315](https://github.com/algorandfoundation/algokit-utils-ts/blob/main/src/types/app-arc56.ts#L315)
=======
[src/types/app-arc56.ts:116](https://github.com/algorandfoundation/algokit-utils-ts/blob/main/src/types/app-arc56.ts#L116)
>>>>>>> e7c345f (feat: Added `AppClient` as an ARC-56 compatible non-typed application client)
=======
[src/types/app-arc56.ts:152](https://github.com/algorandfoundation/algokit-utils-ts/blob/main/src/types/app-arc56.ts#L152)
>>>>>>> 35253a5 (feat: Added `AppFactory` as an ARC-32/ARC-56 compatible mechanism to create and deploy apps and create app clients)
=======
[src/types/app-arc56.ts:315](https://github.com/algorandfoundation/algokit-utils-ts/blob/main/src/types/app-arc56.ts#L315)
>>>>>>> 5dd8a6c (feat: Proper ARC-56 struct support)
=======
[src/types/app-arc56.ts:314](https://github.com/algorandfoundation/algokit-utils-ts/blob/main/src/types/app-arc56.ts#L314)
>>>>>>> 2504c82 (Linting and PR review)

___

Expand All @@ -176,23 +96,7 @@ If this method does not write anything to the ledger (ARC-22)

#### Defined in

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
[src/types/app-arc56.ts:348](https://github.com/algorandfoundation/algokit-utils-ts/blob/main/src/types/app-arc56.ts#L348)
=======
[src/types/app-arc56.ts:149](https://github.com/algorandfoundation/algokit-utils-ts/blob/main/src/types/app-arc56.ts#L149)
>>>>>>> e7c345f (feat: Added `AppClient` as an ARC-56 compatible non-typed application client)
=======
[src/types/app-arc56.ts:185](https://github.com/algorandfoundation/algokit-utils-ts/blob/main/src/types/app-arc56.ts#L185)
>>>>>>> 35253a5 (feat: Added `AppFactory` as an ARC-32/ARC-56 compatible mechanism to create and deploy apps and create app clients)
=======
[src/types/app-arc56.ts:348](https://github.com/algorandfoundation/algokit-utils-ts/blob/main/src/types/app-arc56.ts#L348)
>>>>>>> 5dd8a6c (feat: Proper ARC-56 struct support)
=======
[src/types/app-arc56.ts:347](https://github.com/algorandfoundation/algokit-utils-ts/blob/main/src/types/app-arc56.ts#L347)
>>>>>>> 2504c82 (Linting and PR review)

___

Expand All @@ -218,23 +122,7 @@ Information that clients can use when calling the method

#### Defined in

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
[src/types/app-arc56.ts:352](https://github.com/algorandfoundation/algokit-utils-ts/blob/main/src/types/app-arc56.ts#L352)
=======
[src/types/app-arc56.ts:153](https://github.com/algorandfoundation/algokit-utils-ts/blob/main/src/types/app-arc56.ts#L153)
>>>>>>> e7c345f (feat: Added `AppClient` as an ARC-56 compatible non-typed application client)
=======
[src/types/app-arc56.ts:189](https://github.com/algorandfoundation/algokit-utils-ts/blob/main/src/types/app-arc56.ts#L189)
>>>>>>> 35253a5 (feat: Added `AppFactory` as an ARC-32/ARC-56 compatible mechanism to create and deploy apps and create app clients)
=======
[src/types/app-arc56.ts:352](https://github.com/algorandfoundation/algokit-utils-ts/blob/main/src/types/app-arc56.ts#L352)
>>>>>>> 5dd8a6c (feat: Proper ARC-56 struct support)
=======
[src/types/app-arc56.ts:351](https://github.com/algorandfoundation/algokit-utils-ts/blob/main/src/types/app-arc56.ts#L351)
>>>>>>> 2504c82 (Linting and PR review)

___

Expand All @@ -254,20 +142,4 @@ Information about the method's return value

#### Defined in

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
[src/types/app-arc56.ts:332](https://github.com/algorandfoundation/algokit-utils-ts/blob/main/src/types/app-arc56.ts#L332)
=======
[src/types/app-arc56.ts:133](https://github.com/algorandfoundation/algokit-utils-ts/blob/main/src/types/app-arc56.ts#L133)
>>>>>>> e7c345f (feat: Added `AppClient` as an ARC-56 compatible non-typed application client)
=======
[src/types/app-arc56.ts:169](https://github.com/algorandfoundation/algokit-utils-ts/blob/main/src/types/app-arc56.ts#L169)
>>>>>>> 35253a5 (feat: Added `AppFactory` as an ARC-32/ARC-56 compatible mechanism to create and deploy apps and create app clients)
=======
[src/types/app-arc56.ts:332](https://github.com/algorandfoundation/algokit-utils-ts/blob/main/src/types/app-arc56.ts#L332)
>>>>>>> 5dd8a6c (feat: Proper ARC-56 struct support)
=======
[src/types/app-arc56.ts:331](https://github.com/algorandfoundation/algokit-utils-ts/blob/main/src/types/app-arc56.ts#L331)
>>>>>>> 2504c82 (Linting and PR review)
64 changes: 0 additions & 64 deletions docs/code/interfaces/types_app_arc56.SourceInfo.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,23 +23,7 @@ The line of the dissasembled TEAL this line of pre-compiled TEAL corresponds to

#### Defined in

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
[src/types/app-arc56.ts:441](https://github.com/algorandfoundation/algokit-utils-ts/blob/main/src/types/app-arc56.ts#L441)
=======
[src/types/app-arc56.ts:242](https://github.com/algorandfoundation/algokit-utils-ts/blob/main/src/types/app-arc56.ts#L242)
>>>>>>> e7c345f (feat: Added `AppClient` as an ARC-56 compatible non-typed application client)
=======
[src/types/app-arc56.ts:278](https://github.com/algorandfoundation/algokit-utils-ts/blob/main/src/types/app-arc56.ts#L278)
>>>>>>> 35253a5 (feat: Added `AppFactory` as an ARC-32/ARC-56 compatible mechanism to create and deploy apps and create app clients)
=======
[src/types/app-arc56.ts:441](https://github.com/algorandfoundation/algokit-utils-ts/blob/main/src/types/app-arc56.ts#L441)
>>>>>>> 5dd8a6c (feat: Proper ARC-56 struct support)
=======
[src/types/app-arc56.ts:440](https://github.com/algorandfoundation/algokit-utils-ts/blob/main/src/types/app-arc56.ts#L440)
>>>>>>> 2504c82 (Linting and PR review)

___

Expand All @@ -51,23 +35,7 @@ A human-readable string that describes the error when the program fails at this

#### Defined in

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
[src/types/app-arc56.ts:439](https://github.com/algorandfoundation/algokit-utils-ts/blob/main/src/types/app-arc56.ts#L439)
=======
[src/types/app-arc56.ts:240](https://github.com/algorandfoundation/algokit-utils-ts/blob/main/src/types/app-arc56.ts#L240)
>>>>>>> e7c345f (feat: Added `AppClient` as an ARC-56 compatible non-typed application client)
=======
[src/types/app-arc56.ts:276](https://github.com/algorandfoundation/algokit-utils-ts/blob/main/src/types/app-arc56.ts#L276)
>>>>>>> 35253a5 (feat: Added `AppFactory` as an ARC-32/ARC-56 compatible mechanism to create and deploy apps and create app clients)
=======
[src/types/app-arc56.ts:439](https://github.com/algorandfoundation/algokit-utils-ts/blob/main/src/types/app-arc56.ts#L439)
>>>>>>> 5dd8a6c (feat: Proper ARC-56 struct support)
=======
[src/types/app-arc56.ts:438](https://github.com/algorandfoundation/algokit-utils-ts/blob/main/src/types/app-arc56.ts#L438)
>>>>>>> 2504c82 (Linting and PR review)

___

Expand All @@ -79,23 +47,7 @@ The program counter offset(s) that correspond to this line of TEAL

#### Defined in

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
[src/types/app-arc56.ts:437](https://github.com/algorandfoundation/algokit-utils-ts/blob/main/src/types/app-arc56.ts#L437)
=======
[src/types/app-arc56.ts:238](https://github.com/algorandfoundation/algokit-utils-ts/blob/main/src/types/app-arc56.ts#L238)
>>>>>>> e7c345f (feat: Added `AppClient` as an ARC-56 compatible non-typed application client)
=======
[src/types/app-arc56.ts:274](https://github.com/algorandfoundation/algokit-utils-ts/blob/main/src/types/app-arc56.ts#L274)
>>>>>>> 35253a5 (feat: Added `AppFactory` as an ARC-32/ARC-56 compatible mechanism to create and deploy apps and create app clients)
=======
[src/types/app-arc56.ts:437](https://github.com/algorandfoundation/algokit-utils-ts/blob/main/src/types/app-arc56.ts#L437)
>>>>>>> 5dd8a6c (feat: Proper ARC-56 struct support)
=======
[src/types/app-arc56.ts:436](https://github.com/algorandfoundation/algokit-utils-ts/blob/main/src/types/app-arc56.ts#L436)
>>>>>>> 2504c82 (Linting and PR review)

___

Expand All @@ -107,20 +59,4 @@ The line of pre-compiled TEAL

#### Defined in

<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
[src/types/app-arc56.ts:435](https://github.com/algorandfoundation/algokit-utils-ts/blob/main/src/types/app-arc56.ts#L435)
=======
[src/types/app-arc56.ts:236](https://github.com/algorandfoundation/algokit-utils-ts/blob/main/src/types/app-arc56.ts#L236)
>>>>>>> e7c345f (feat: Added `AppClient` as an ARC-56 compatible non-typed application client)
=======
[src/types/app-arc56.ts:272](https://github.com/algorandfoundation/algokit-utils-ts/blob/main/src/types/app-arc56.ts#L272)
>>>>>>> 35253a5 (feat: Added `AppFactory` as an ARC-32/ARC-56 compatible mechanism to create and deploy apps and create app clients)
=======
[src/types/app-arc56.ts:435](https://github.com/algorandfoundation/algokit-utils-ts/blob/main/src/types/app-arc56.ts#L435)
>>>>>>> 5dd8a6c (feat: Proper ARC-56 struct support)
=======
[src/types/app-arc56.ts:434](https://github.com/algorandfoundation/algokit-utils-ts/blob/main/src/types/app-arc56.ts#L434)
>>>>>>> 2504c82 (Linting and PR review)
Loading

0 comments on commit 426df3b

Please sign in to comment.