Skip to content

Commit

Permalink
feat: Include option for outputting arc56 json files
Browse files Browse the repository at this point in the history
  • Loading branch information
tristanmenzel committed Nov 27, 2024
1 parent 7df6574 commit 48590b4
Show file tree
Hide file tree
Showing 16 changed files with 1,857 additions and 0 deletions.
1 change: 1 addition & 0 deletions src/cli.ts
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ const cliOptionsSchema = z.object({
// Puya options
outputTeal: z.boolean(),
outputArc32: z.boolean(),
outputArc56: z.boolean(),
outputSsaIr: z.boolean(),
outputOptimizationIr: z.boolean(),
outputDestructuredIr: z.boolean(),
Expand Down
3 changes: 3 additions & 0 deletions src/puya/options.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ export type CompilationSetMapping = Record<string, string>
export const defaultPuyaOptions: PuyaPassThroughOptions = {
outputTeal: true,
outputArc32: true,
outputArc56: true,
outputSsaIr: false,
outputOptimizationIr: false,
outputDestructuredIr: false,
Expand All @@ -26,6 +27,7 @@ export type PuyaPassThroughOptions = Omit<PuyaOptions, 'compilationSet'>
export class PuyaOptions {
outputTeal: boolean
outputArc32: boolean
outputArc56: boolean
outputSsaIr: boolean
outputOptimizationIr: boolean
outputDestructuredIr: boolean
Expand All @@ -50,6 +52,7 @@ export class PuyaOptions {
this.compilationSet = compilationSet
this.outputTeal = passThroughOptions.outputTeal
this.outputArc32 = passThroughOptions.outputArc32
this.outputArc56 = passThroughOptions.outputArc56
this.outputSsaIr = passThroughOptions.outputSsaIr
this.outputOptimizationIr = passThroughOptions.outputOptimizationIr
this.outputDestructuredIr = passThroughOptions.outputDestructuredIr
Expand Down
1 change: 1 addition & 0 deletions tests/approvals.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ describe('Approvals', () => {
optimizationLevel: 0,
outputTeal: true,
outputArc32: true,
outputArc56: true,
},
)
invariant(result.ast, 'Compilation must result in ast')
Expand Down
190 changes: 190 additions & 0 deletions tests/approvals/out/abi-decorators/AbiDecorators.arc56.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,190 @@
{
"name": "AbiDecorators",
"structs": {},
"methods": [
{
"name": "justNoop",
"args": [],
"returns": {
"type": "void"
},
"actions": {
"create": [],
"call": [
"NoOp"
]
},
"readonly": false,
"events": [],
"recommendations": {}
},
{
"name": "createMethod",
"args": [],
"returns": {
"type": "void"
},
"actions": {
"create": [
"NoOp"
],
"call": []
},
"readonly": false,
"events": [],
"recommendations": {}
},
{
"name": "allActions",
"args": [],
"returns": {
"type": "void"
},
"actions": {
"create": [],
"call": [
"NoOp",
"OptIn",
"CloseOut",
"DeleteApplication",
"UpdateApplication"
]
},
"readonly": false,
"events": [],
"recommendations": {}
},
{
"name": "overrideReadonlyName",
"args": [],
"returns": {
"type": "uint64"
},
"actions": {
"create": [],
"call": [
"NoOp"
]
},
"readonly": true,
"events": [],
"recommendations": {}
},
{
"name": "methodWithDefaults",
"args": [
{
"type": "uint64",
"name": "a",
"defaultValue": {
"source": "global",
"data": "Z2xvYmFsVmFsdWU=",
"type": "AVMString"
}
},
{
"type": "uint64",
"name": "b",
"defaultValue": {
"source": "method",
"data": "readonly()uint64"
}
},
{
"type": "uint64",
"name": "c"
}
],
"returns": {
"type": "uint64"
},
"actions": {
"create": [],
"call": [
"NoOp"
]
},
"readonly": false,
"events": [],
"recommendations": {}
}
],
"arcs": [
22,
28
],
"networks": {},
"state": {
"schema": {
"global": {
"ints": 1,
"bytes": 0
},
"local": {
"ints": 0,
"bytes": 0
}
},
"keys": {
"global": {
"globalValue": {
"keyType": "AVMString",
"valueType": "AVMUint64",
"key": "Z2xvYmFsVmFsdWU="
}
},
"local": {},
"box": {}
},
"maps": {
"global": {},
"local": {},
"box": {}
}
},
"bareActions": {
"create": [],
"call": []
},
"sourceInfo": {
"approval": {
"sourceInfo": [
{
"pc": [
108,
123,
148,
168
],
"errorMessage": "OnCompletion is not NoOp"
},
{
"pc": [
128
],
"errorMessage": "can only call when creating"
},
{
"pc": [
113,
138,
153,
173
],
"errorMessage": "can only call when not creating"
}
],
"pcOffsetMethod": "none"
},
"clear": {
"sourceInfo": [],
"pcOffsetMethod": "none"
}
},
"source": {
"approval": "#pragma version 10

tests/approvals/abi-decorators.algo.ts::AbiDecorators.approvalProgram:
    intcblock 0 1
    bytecblock 0x151f7c75
    txn ApplicationID
    bnz main_after_if_else@2
    callsub constructor

main_after_if_else@2:
    callsub __puya_arc4_router__
    return


// tests/approvals/abi-decorators.algo.ts::AbiDecorators.constructor() -> void:
constructor:
    // tests/approvals/abi-decorators.algo.ts:4
    // export default class AbiDecorators extends Contract {
    proto 0 0
    // tests/approvals/abi-decorators.algo.ts:16
    // globalValue = GlobalState({ initialValue: Uint64(123) })
    pushbytes "globalValue"
    pushint 123 // 123
    app_global_put
    retsub


// tests/approvals/abi-decorators.algo.ts::AbiDecorators.__puya_arc4_router__() -> uint64:
__puya_arc4_router__:
    // tests/approvals/abi-decorators.algo.ts:4
    // export default class AbiDecorators extends Contract {
    proto 0 1
    txn NumAppArgs
    intc_0 // 0
    !=
    bz __puya_arc4_router___bare_routing@9
    txna ApplicationArgs 0
    pushbytes 0xf9020d5a // method "justNoop()void"
    pushbytes 0xe179f9d4 // method "createMethod()void"
    pushbytes 0x63c27aba // method "allActions()void"
    pushbytes 0x14d1b6ea // method "overrideReadonlyName()uint64"
    pushbytes 0xc1367374 // method "methodWithDefaults(uint64,uint64,uint64)uint64"
    uncover 5
    match __puya_arc4_router___justNoop_route@2 __puya_arc4_router___createMethod_route@3 __puya_arc4_router___allActions_route@4 __puya_arc4_router___overrideReadonlyName_route@5 __puya_arc4_router___methodWithDefaults_route@6
    b __puya_arc4_router___switch_case_default@7

__puya_arc4_router___justNoop_route@2:
    // tests/approvals/abi-decorators.algo.ts:5
    // @abimethod({ allowActions: 'NoOp' })
    txn OnCompletion
    intc_0 // NoOp
    ==
    assert // OnCompletion is not NoOp
    txn ApplicationID
    intc_0 // 0
    !=
    assert // can only call when not creating
    callsub justNoop
    intc_1 // 1
    retsub

__puya_arc4_router___createMethod_route@3:
    // tests/approvals/abi-decorators.algo.ts:7
    // @abimethod({ onCreate: 'require' })
    txn OnCompletion
    intc_0 // NoOp
    ==
    assert // OnCompletion is not NoOp
    txn ApplicationID
    intc_0 // 0
    ==
    assert // can only call when creating
    callsub createMethod
    intc_1 // 1
    retsub

__puya_arc4_router___allActions_route@4:
    // tests/approvals/abi-decorators.algo.ts:9
    // @abimethod({ allowActions: ['NoOp', 'OptIn', 'CloseOut', 'DeleteApplication', 'UpdateApplication'] })
    txn ApplicationID
    intc_0 // 0
    !=
    assert // can only call when not creating
    callsub allActions
    intc_1 // 1
    retsub

__puya_arc4_router___overrideReadonlyName_route@5:
    // tests/approvals/abi-decorators.algo.ts:11
    // @abimethod({ readonly: true, name: 'overrideReadonlyName' })
    txn OnCompletion
    intc_0 // NoOp
    ==
    assert // OnCompletion is not NoOp
    txn ApplicationID
    intc_0 // 0
    !=
    assert // can only call when not creating
    callsub readonly
    itob
    bytec_0 // 0x151f7c75
    swap
    concat
    log
    intc_1 // 1
    retsub

__puya_arc4_router___methodWithDefaults_route@6:
    // tests/approvals/abi-decorators.algo.ts:18
    // @abimethod({ defaultArguments: { a: { from: 'globalValue' }, b: { from: 'readonly' }, c: { constant: 145 } } })
    txn OnCompletion
    intc_0 // NoOp
    ==
    assert // OnCompletion is not NoOp
    txn ApplicationID
    intc_0 // 0
    !=
    assert // can only call when not creating
    // tests/approvals/abi-decorators.algo.ts:4
    // export default class AbiDecorators extends Contract {
    txna ApplicationArgs 1
    btoi
    txna ApplicationArgs 2
    btoi
    txna ApplicationArgs 3
    btoi
    // tests/approvals/abi-decorators.algo.ts:18
    // @abimethod({ defaultArguments: { a: { from: 'globalValue' }, b: { from: 'readonly' }, c: { constant: 145 } } })
    uncover 2
    uncover 2
    uncover 2
    callsub methodWithDefaults
    itob
    bytec_0 // 0x151f7c75
    swap
    concat
    log
    intc_1 // 1
    retsub

__puya_arc4_router___switch_case_default@7:
    b __puya_arc4_router___after_if_else@10

__puya_arc4_router___bare_routing@9:

__puya_arc4_router___after_if_else@10:
    // tests/approvals/abi-decorators.algo.ts:4
    // export default class AbiDecorators extends Contract {
    intc_0 // 0
    retsub


// tests/approvals/abi-decorators.algo.ts::AbiDecorators.justNoop() -> void:
justNoop:
    // tests/approvals/abi-decorators.algo.ts:5-6
    // @abimethod({ allowActions: 'NoOp' })
    // public justNoop(): void {}
    proto 0 0
    retsub


// tests/approvals/abi-decorators.algo.ts::AbiDecorators.createMethod() -> void:
createMethod:
    // tests/approvals/abi-decorators.algo.ts:7-8
    // @abimethod({ onCreate: 'require' })
    // public createMethod(): void {}
    proto 0 0
    retsub


// tests/approvals/abi-decorators.algo.ts::AbiDecorators.allActions() -> void:
allActions:
    // tests/approvals/abi-decorators.algo.ts:9-10
    // @abimethod({ allowActions: ['NoOp', 'OptIn', 'CloseOut', 'DeleteApplication', 'UpdateApplication'] })
    // public allActions(): void {}
    proto 0 0
    retsub


// tests/approvals/abi-decorators.algo.ts::AbiDecorators.readonly() -> uint64:
readonly:
    // tests/approvals/abi-decorators.algo.ts:11-12
    // @abimethod({ readonly: true, name: 'overrideReadonlyName' })
    // public readonly(): uint64 {
    proto 0 1
    // tests/approvals/abi-decorators.algo.ts:13
    // return 5
    pushint 5 // 5
    retsub


// tests/approvals/abi-decorators.algo.ts::AbiDecorators.methodWithDefaults(a: uint64, b: uint64, c: uint64) -> uint64:
methodWithDefaults:
    // tests/approvals/abi-decorators.algo.ts:18-19
    // @abimethod({ defaultArguments: { a: { from: 'globalValue' }, b: { from: 'readonly' }, c: { constant: 145 } } })
    // public methodWithDefaults(a: uint64, b: uint64, c: uint64): uint64 {
    proto 3 1
    // tests/approvals/abi-decorators.algo.ts:20
    // return a * b + c
    frame_dig -3
    frame_dig -2
    *
    frame_dig -1
    +
    retsub
",
"clear": "I3ByYWdtYSB2ZXJzaW9uIDEwCgp0ZXN0cy9hcHByb3ZhbHMvYWJpLWRlY29yYXRvcnMuYWxnby50czo6QWJpRGVjb3JhdG9ycy5jbGVhclN0YXRlUHJvZ3JhbToKICAgIHB1c2hpbnQgMSAvLyAxCiAgICByZXR1cm4K"
},
"events": [],
"templateVariables": {}
}
Loading

0 comments on commit 48590b4

Please sign in to comment.