Skip to content

Commit c079c61

Browse files
algochoialgochoi
authored
Align transaction fields to transaction reference spec (#804)
1 parent 81ab6eb commit c079c61

32 files changed

+891
-880
lines changed

‎examples/accounts.ts‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,8 @@ async function main() {
4242
// example: MULTISIG_CREATE
4343

4444
const fundMsigTxn = algosdk.makePaymentTxnWithSuggestedParamsFromObject({
45-
from: funder.addr,
46-
to: multisigAddr,
45+
sender: funder.addr,
46+
receiver: multisigAddr,
4747
amount: 1_000_000,
4848
suggestedParams,
4949
});
@@ -53,8 +53,8 @@ async function main() {
5353

5454
// example: MULTISIG_SIGN
5555
const msigTxn = algosdk.makePaymentTxnWithSuggestedParamsFromObject({
56-
from: multisigAddr,
57-
to: funder.addr,
56+
sender: multisigAddr,
57+
receiver: funder.addr,
5858
amount: 100,
5959
suggestedParams,
6060
});
@@ -88,8 +88,8 @@ async function main() {
8888
// rekey the original account to the new signer via a payment transaction
8989
// Note any transaction type can be used to rekey an account
9090
const rekeyTxn = algosdk.makePaymentTxnWithSuggestedParamsFromObject({
91-
from: acct1.addr,
92-
to: acct1.addr,
91+
sender: acct1.addr,
92+
receiver: acct1.addr,
9393
amount: 0,
9494
suggestedParams,
9595
rekeyTo: acct2.addr, // set the rekeyTo field to the new signer
@@ -110,8 +110,8 @@ async function main() {
110110
// the transaction is from originalAccount, but signed with newSigner private key
111111

112112
const rekeyBack = algosdk.makePaymentTxnWithSuggestedParamsFromObject({
113-
from: acct1.addr,
114-
to: acct1.addr,
113+
sender: acct1.addr,
114+
receiver: acct1.addr,
115115
amount: 0,
116116
suggestedParams,
117117
rekeyTo: acct1.addr,

‎examples/app.ts‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ async function main() {
4949

5050
// example: APP_CREATE
5151
const appCreateTxn = algosdk.makeApplicationCreateTxnFromObject({
52-
from: creator.addr,
52+
sender: creator.addr,
5353
approvalProgram: new Uint8Array(compiledApprovalProgram),
5454
clearProgram: new Uint8Array(compiledClearProgram),
5555
numGlobalByteSlices,
@@ -78,7 +78,7 @@ async function main() {
7878

7979
// example: APP_OPTIN
8080
const appOptInTxn = algosdk.makeApplicationOptInTxnFromObject({
81-
from: caller.addr,
81+
sender: caller.addr,
8282
appIndex: appId,
8383
suggestedParams,
8484
});
@@ -95,7 +95,7 @@ async function main() {
9595

9696
// example: APP_NOOP
9797
const appNoOpTxn = algosdk.makeApplicationNoOpTxnFromObject({
98-
from: caller.addr,
98+
sender: caller.addr,
9999
appIndex: appId,
100100
suggestedParams,
101101
});
@@ -113,7 +113,7 @@ async function main() {
113113
const anotherCaller = accounts[2];
114114

115115
const anotherAppOptInTxn = algosdk.makeApplicationOptInTxnFromObject({
116-
from: anotherCaller.addr,
116+
sender: anotherCaller.addr,
117117
appIndex: appId,
118118
suggestedParams,
119119
});
@@ -130,7 +130,7 @@ async function main() {
130130
// example: APP_CALL
131131
const now = new Date().toString();
132132
const simpleAddTxn = algosdk.makeApplicationNoOpTxnFromObject({
133-
from: caller.addr,
133+
sender: caller.addr,
134134
suggestedParams,
135135
appIndex: appId,
136136
appArgs: [new TextEncoder().encode(now)],
@@ -175,7 +175,7 @@ async function main() {
175175

176176
// example: APP_CLOSEOUT
177177
const appCloseOutTxn = algosdk.makeApplicationCloseOutTxnFromObject({
178-
from: caller.addr,
178+
sender: caller.addr,
179179
appIndex: appId,
180180
suggestedParams,
181181
});
@@ -198,7 +198,7 @@ async function main() {
198198
const compiledNewProgram = await compileProgram(algodClient, newProgram);
199199

200200
const appUpdateTxn = algosdk.makeApplicationUpdateTxnFromObject({
201-
from: creator.addr,
201+
sender: creator.addr,
202202
suggestedParams,
203203
appIndex: appId,
204204
// updates must define both approval and clear programs, even if unchanged
@@ -218,7 +218,7 @@ async function main() {
218218

219219
// example: APP_CLEAR
220220
const appClearTxn = algosdk.makeApplicationClearStateTxnFromObject({
221-
from: anotherCaller.addr,
221+
sender: anotherCaller.addr,
222222
suggestedParams,
223223
appIndex: appId,
224224
});
@@ -235,7 +235,7 @@ async function main() {
235235

236236
// example: APP_DELETE
237237
const appDeleteTxn = algosdk.makeApplicationDeleteTxnFromObject({
238-
from: creator.addr,
238+
sender: creator.addr,
239239
suggestedParams,
240240
appIndex: appId,
241241
});

‎examples/asa.ts‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ async function main() {
1717
// example: ASSET_CREATE
1818
const suggestedParams = await algodClient.getTransactionParams().do();
1919
const txn = algosdk.makeAssetCreateTxnWithSuggestedParamsFromObject({
20-
from: creator.addr,
20+
sender: creator.addr,
2121
suggestedParams,
2222
defaultFrozen: false,
2323
unitName: 'rug',
@@ -61,7 +61,7 @@ async function main() {
6161
const manager = accounts[1];
6262

6363
const configTxn = algosdk.makeAssetConfigTxnWithSuggestedParamsFromObject({
64-
from: creator.addr,
64+
sender: creator.addr,
6565
manager: manager.addr,
6666
freeze: manager.addr,
6767
clawback: manager.addr,
@@ -87,8 +87,8 @@ async function main() {
8787

8888
// opt-in is simply a 0 amount transfer of the asset to oneself
8989
const optInTxn = algosdk.makeAssetTransferTxnWithSuggestedParamsFromObject({
90-
from: receiver.addr,
91-
to: receiver.addr,
90+
sender: receiver.addr,
91+
receiver: receiver.addr,
9292
suggestedParams,
9393
assetIndex,
9494
amount: 0,
@@ -101,8 +101,8 @@ async function main() {
101101

102102
// example: ASSET_XFER
103103
const xferTxn = algosdk.makeAssetTransferTxnWithSuggestedParamsFromObject({
104-
from: creator.addr,
105-
to: receiver.addr,
104+
sender: creator.addr,
105+
receiver: receiver.addr,
106106
suggestedParams,
107107
assetIndex,
108108
amount: 1,
@@ -115,11 +115,11 @@ async function main() {
115115

116116
// example: ASSET_FREEZE
117117
const freezeTxn = algosdk.makeAssetFreezeTxnWithSuggestedParamsFromObject({
118-
from: manager.addr,
118+
sender: manager.addr,
119119
suggestedParams,
120120
assetIndex,
121-
// freezeState: false would unfreeze the account's asset holding
122-
freezeState: true,
121+
// assetFrozen: false would unfreeze the account's asset holding
122+
assetFrozen: true,
123123
// freezeTarget is the account that is being frozen or unfrozen
124124
freezeTarget: receiver.addr,
125125
});
@@ -136,10 +136,10 @@ async function main() {
136136
// example: ASSET_CLAWBACK
137137
const clawbackTxn = algosdk.makeAssetTransferTxnWithSuggestedParamsFromObject(
138138
{
139-
from: manager.addr,
140-
to: creator.addr,
141-
// revocationTarget is the account that is being clawed back from
142-
revocationTarget: receiver.addr,
139+
sender: manager.addr,
140+
receiver: creator.addr,
141+
// assetSender is the account that is being clawed back from
142+
assetSender: receiver.addr,
143143
suggestedParams,
144144
assetIndex,
145145
amount: 1,
@@ -161,8 +161,8 @@ async function main() {
161161
// any account that can receive the asset.
162162
// note that closing to the asset creator will always succeed
163163
const optOutTxn = algosdk.makeAssetTransferTxnWithSuggestedParamsFromObject({
164-
from: receiver.addr,
165-
to: creator.addr,
164+
sender: receiver.addr,
165+
receiver: creator.addr,
166166
closeRemainderTo: creator.addr,
167167
suggestedParams,
168168
assetIndex,
@@ -180,7 +180,7 @@ async function main() {
180180

181181
// example: ASSET_DELETE
182182
const deleteTxn = algosdk.makeAssetDestroyTxnWithSuggestedParamsFromObject({
183-
from: manager.addr,
183+
sender: manager.addr,
184184
suggestedParams,
185185
assetIndex,
186186
});

‎examples/atc.ts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ async function main() {
2727
const compiledClearProgram = await compileProgram(client, clearProgram);
2828

2929
const createTxn = algosdk.makeApplicationCreateTxnFromObject({
30-
from: sender.addr,
30+
sender: sender.addr,
3131
suggestedParams,
3232
onComplete: algosdk.OnApplicationComplete.NoOpOC,
3333
approvalProgram: compiledApprovalProgram,
@@ -61,9 +61,9 @@ async function main() {
6161
// example: ATC_ADD_TRANSACTION
6262
// construct a transaction
6363
const paymentTxn = algosdk.makePaymentTxnWithSuggestedParamsFromObject({
64-
from: sender.addr,
64+
sender: sender.addr,
6565
suggestedParams,
66-
to: sender.addr,
66+
receiver: sender.addr,
6767
amount: 1000,
6868
});
6969

‎examples/atomics.ts‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,15 +16,15 @@ async function main() {
1616
const suggestedParams = await client.getTransactionParams().do();
1717

1818
const alicesTxn = algosdk.makePaymentTxnWithSuggestedParamsFromObject({
19-
from: acct1.addr,
20-
to: acct2.addr,
19+
sender: acct1.addr,
20+
receiver: acct2.addr,
2121
amount: 1e6,
2222
suggestedParams,
2323
});
2424

2525
const bobsTxn = algosdk.makePaymentTxnWithSuggestedParamsFromObject({
26-
from: acct2.addr,
27-
to: acct1.addr,
26+
sender: acct2.addr,
27+
receiver: acct1.addr,
2828
amount: 1e6,
2929
suggestedParams,
3030
});

‎examples/codec.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,8 @@ async function main() {
3535

3636
// example: CODEC_TRANSACTION_UNSIGNED
3737
const txn = algosdk.makePaymentTxnWithSuggestedParamsFromObject({
38-
from: sender.addr,
39-
to: receiver.addr,
38+
sender: sender.addr,
39+
receiver: receiver.addr,
4040
amount: 1e6,
4141
suggestedParams,
4242
});

‎examples/indexer.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,8 +64,8 @@ async function main() {
6464
const sender = accounts[0];
6565

6666
const txn = algosdk.makePaymentTxnWithSuggestedParamsFromObject({
67-
from: sender.addr,
68-
to: sender.addr,
67+
sender: sender.addr,
68+
receiver: sender.addr,
6969
amount: 1e6,
7070
note: new TextEncoder().encode('Hello World!'),
7171
suggestedParams,

‎examples/lsig.ts‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,8 @@ async function main() {
3333
// example: LSIG_PASS_ARGS
3434

3535
const fundSmartSigTxn = algosdk.makePaymentTxnWithSuggestedParamsFromObject({
36-
from: funder.addr,
37-
to: smartSig.address(),
36+
sender: funder.addr,
37+
receiver: smartSig.address(),
3838
amount: 1e6,
3939
suggestedParams,
4040
});
@@ -50,8 +50,8 @@ async function main() {
5050

5151
// example: LSIG_SIGN_FULL
5252
const smartSigTxn = algosdk.makePaymentTxnWithSuggestedParamsFromObject({
53-
from: smartSig.address(),
54-
to: funder.addr,
53+
sender: smartSig.address(),
54+
receiver: funder.addr,
5555
amount: 0.1e6,
5656
suggestedParams,
5757
});
@@ -72,8 +72,8 @@ async function main() {
7272
smartSig.sign(userAccount.privateKey);
7373

7474
const delegatedTxn = algosdk.makePaymentTxnWithSuggestedParamsFromObject({
75-
from: userAccount.addr,
76-
to: funder.addr,
75+
sender: userAccount.addr,
76+
receiver: funder.addr,
7777
amount: 0.1e6,
7878
suggestedParams,
7979
});

‎examples/overview.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,9 @@ async function main() {
2222
// example: TRANSACTION_PAYMENT_CREATE
2323
const suggestedParams = await algodClient.getTransactionParams().do();
2424
const ptxn = algosdk.makePaymentTxnWithSuggestedParamsFromObject({
25-
from: acct.addr,
25+
sender: acct.addr,
2626
suggestedParams,
27-
to: acct2.addr,
27+
receiver: acct2.addr,
2828
amount: 10000,
2929
note: new TextEncoder().encode('hello world'),
3030
});

‎examples/participation.ts‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,12 +27,12 @@ async function main() {
2727
// create transaction
2828
const onlineKeyreg = algosdk.makeKeyRegistrationTxnWithSuggestedParamsFromObject(
2929
{
30-
from: addr,
30+
sender: addr,
3131
voteKey,
3232
selectionKey,
3333
stateProofKey,
34-
voteFirst: params.firstRound,
35-
voteLast: params.firstRound + numRounds,
34+
voteFirst: params.firstValid,
35+
voteLast: params.firstValid + numRounds,
3636
voteKeyDilution: keyDilution,
3737
suggestedParams: params,
3838
}
@@ -47,7 +47,7 @@ async function main() {
4747
// create keyreg transaction to take this account offline
4848
const offlineKeyReg = algosdk.makeKeyRegistrationTxnWithSuggestedParamsFromObject(
4949
{
50-
from: addr,
50+
sender: addr,
5151
suggestedParams,
5252
nonParticipation: true,
5353
}

0 commit comments

Comments
 (0)