Skip to content

Commit

Permalink
Merge main into release
Browse files Browse the repository at this point in the history
  • Loading branch information
github-actions[bot] authored Mar 15, 2024
2 parents 6942919 + 51c913f commit fc669c5
Show file tree
Hide file tree
Showing 11 changed files with 256 additions and 159 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ ___

### signature

**signature**: `string`
`Optional` **signature**: `string`

[s] The signature

Expand Down
16 changes: 8 additions & 8 deletions docs/code/modules/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -349,7 +349,7 @@ the estimated rate.

#### Defined in

[src/transaction/transaction.ts:667](https://github.com/algorandfoundation/algokit-utils-ts/blob/main/src/transaction/transaction.ts#L667)
[src/transaction/transaction.ts:757](https://github.com/algorandfoundation/algokit-utils-ts/blob/main/src/transaction/transaction.ts#L757)

___

Expand Down Expand Up @@ -405,7 +405,7 @@ Allows for control of fees on a `Transaction` or `SuggestedParams` object

#### Defined in

[src/transaction/transaction.ts:690](https://github.com/algorandfoundation/algokit-utils-ts/blob/main/src/transaction/transaction.ts#L690)
[src/transaction/transaction.ts:780](https://github.com/algorandfoundation/algokit-utils-ts/blob/main/src/transaction/transaction.ts#L780)

___

Expand Down Expand Up @@ -1477,7 +1477,7 @@ The array of transactions with signers

#### Defined in

[src/transaction/transaction.ts:722](https://github.com/algorandfoundation/algokit-utils-ts/blob/main/src/transaction/transaction.ts#L722)
[src/transaction/transaction.ts:812](https://github.com/algorandfoundation/algokit-utils-ts/blob/main/src/transaction/transaction.ts#L812)

___

Expand Down Expand Up @@ -1810,7 +1810,7 @@ The suggested transaction parameters

#### Defined in

[src/transaction/transaction.ts:713](https://github.com/algorandfoundation/algokit-utils-ts/blob/main/src/transaction/transaction.ts#L713)
[src/transaction/transaction.ts:803](https://github.com/algorandfoundation/algokit-utils-ts/blob/main/src/transaction/transaction.ts#L803)

___

Expand Down Expand Up @@ -2145,7 +2145,7 @@ The dryrun result

#### Defined in

[src/transaction/transaction.ts:547](https://github.com/algorandfoundation/algokit-utils-ts/blob/main/src/transaction/transaction.ts#L547)
[src/transaction/transaction.ts:637](https://github.com/algorandfoundation/algokit-utils-ts/blob/main/src/transaction/transaction.ts#L637)

___

Expand Down Expand Up @@ -2436,7 +2436,7 @@ An object with transaction IDs, transactions, group transaction ID (`groupTransa

#### Defined in

[src/transaction/transaction.ts:419](https://github.com/algorandfoundation/algokit-utils-ts/blob/main/src/transaction/transaction.ts#L419)
[src/transaction/transaction.ts:509](https://github.com/algorandfoundation/algokit-utils-ts/blob/main/src/transaction/transaction.ts#L509)

___

Expand All @@ -2461,7 +2461,7 @@ An object with transaction IDs, transactions, group transaction ID (`groupTransa

#### Defined in

[src/transaction/transaction.ts:565](https://github.com/algorandfoundation/algokit-utils-ts/blob/main/src/transaction/transaction.ts#L565)
[src/transaction/transaction.ts:655](https://github.com/algorandfoundation/algokit-utils-ts/blob/main/src/transaction/transaction.ts#L655)

___

Expand Down Expand Up @@ -2740,4 +2740,4 @@ Throws an error if the transaction is not confirmed or rejected in the next `tim

#### Defined in

[src/transaction/transaction.ts:610](https://github.com/algorandfoundation/algokit-utils-ts/blob/main/src/transaction/transaction.ts#L610)
[src/transaction/transaction.ts:700](https://github.com/algorandfoundation/algokit-utils-ts/blob/main/src/transaction/transaction.ts#L700)
31 changes: 16 additions & 15 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@
"algosdk": "^2.7.0"
},
"devDependencies": {
"@algorandfoundation/tealscript": "^0.78.1",
"@algorandfoundation/tealscript": "^0.87.0",
"@commitlint/cli": "^18.4.2",
"@commitlint/config-conventional": "^17.7.0",
"@makerx/eslint-config": "^3.1.0",
Expand Down
34 changes: 26 additions & 8 deletions src/transaction/transaction.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -421,7 +421,7 @@ const tests = (version: 8 | 9) => () => {

await appClient.create({ method: 'createApplication', methodArgs: [] })

await appClient.fundAppAccount(algokit.microAlgos(2305800))
await appClient.fundAppAccount(algokit.microAlgos(2334300))

await appClient.call({ method: 'bootstrap', methodArgs: [], sendParams: { fee: algokit.microAlgos(3_000) } })

Expand Down Expand Up @@ -592,10 +592,9 @@ const tests = (version: 8 | 9) => () => {
})
}

// Temporarily skip these tests until this algod bug is fixed: https://github.com/algorand/go-algorand/issues/5914
describe.skip('Resource Packer: AVM8', tests(8))
describe.skip('Resource Packer: AVM9', tests(9))
describe.skip('Resource Packer: Mixed', () => {
describe('Resource Packer: AVM8', tests(8))
describe('Resource Packer: AVM9', tests(9))
describe('Resource Packer: Mixed', () => {
const fixture = algorandFixture()

let v9Client: ApplicationClient
Expand Down Expand Up @@ -638,7 +637,8 @@ describe.skip('Resource Packer: Mixed', () => {
algokit.Config.configure({ populateAppCallResources: false })
})

test('same account', async () => {
// Temporarily skip this until this algod bug is fixed: https://github.com/algorand/go-algorand/issues/5914
test.skip('same account', async () => {
const { algod, testAccount } = fixture.context
const acct = algosdk.generateAccount()
const atc = new algosdk.AtomicTransactionComposer()
Expand Down Expand Up @@ -689,7 +689,7 @@ describe.skip('Resource Packer: Mixed', () => {
test('app account', async () => {
const { algod, testAccount } = fixture.context

await v8Client.fundAppAccount(algokit.microAlgos(300000))
await v8Client.fundAppAccount(algokit.microAlgos(328500))
await v8Client.call({ method: 'bootstrap', methodArgs: [], sendParams: { fee: algokit.microAlgos(3_000) } })

const externalAppID = (await v8Client.getGlobalState()).externalAppID!.value as bigint
Expand Down Expand Up @@ -726,7 +726,7 @@ describe.skip('Resource Packer: Mixed', () => {
await packedAtc.execute(algod, 3)
})
})
describe.skip('Resource Packer: meta', () => {
describe('Resource Packer: meta', () => {
const fixture = algorandFixture()

let externalClient: ApplicationClient
Expand All @@ -736,6 +736,7 @@ describe.skip('Resource Packer: meta', () => {
beforeAll(async () => {
await fixture.beforeEach()
const { testAccount, algod } = fixture.context
algokit.Config.configure({ populateAppCallResources: true })

externalClient = new ApplicationClient(
{
Expand All @@ -750,6 +751,10 @@ describe.skip('Resource Packer: meta', () => {
await externalClient.create({ method: 'createApplication', methodArgs: [] })
})

afterAll(() => {
algokit.Config.configure({ populateAppCallResources: false })
})

test('error during simulate', async () => {
await expect(externalClient.call({ method: 'error', methodArgs: [] })).rejects.toThrow(
'Error during resource population simulation in transaction 0',
Expand All @@ -770,4 +775,17 @@ describe.skip('Resource Packer: meta', () => {

await externalClient.call({ method: 'boxWithPayment', methodArgs: [{ transaction: payment, signer: testAccount }] })
})

test('sender asset holding', async () => {
await externalClient.fundAppAccount(algokit.microAlgos(200_000))

await externalClient.call({
method: 'createAsset',
methodArgs: [],
sendParams: { fee: algokit.microAlgos(2_000) },
})
const res = await externalClient.call({ method: 'senderAssetBalance', methodArgs: [] })

expect(res.transaction.appAccounts?.length || 0).toBe(0)
})
})
Loading

0 comments on commit fc669c5

Please sign in to comment.