Skip to content
This repository was archived by the owner on Nov 5, 2024. It is now read-only.

Commit 962b535

Browse files
jribbinkjribbink
authored
Bump @onflow/flow-cadut to 0.2.0-alpha.7 (#164)
1 parent 99cac5c commit 962b535

File tree

8 files changed

+362
-493
lines changed

8 files changed

+362
-493
lines changed

‎.changeset/friendly-snails-push.md‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
"@onflow/flow-js-testing": patch
3+
---
4+
5+
Bump @onflow/flow-cadut to 0.2.0-alpha.7 (fixes bug where optional array, dictionary, path arguments did not work)

‎package-lock.json‎

Lines changed: 238 additions & 406 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎package.json‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@
5151
"@onflow/config": "^1.0.3-alpha.0",
5252
"@onflow/fcl": "^1.1.1-alpha.1",
5353
"@onflow/fcl-config": "^0.0.1",
54-
"@onflow/flow-cadut": "0.2.0-alpha.7",
54+
"@onflow/flow-cadut": "0.2.0-alpha.8",
5555
"@onflow/types": "^1.0.3-alpha.0",
5656
"elliptic": "^6.5.4",
5757
"esm": "^3.2.25",
@@ -67,6 +67,7 @@
6767
"@babel/preset-env": "^7.14.5",
6868
"@changesets/changelog-github": "^0.4.5",
6969
"@changesets/cli": "^2.23.0",
70+
"@onflow/flow-cadut-generator": "0.0.1",
7071
"babel-jest": "^27.0.2",
7172
"eslint": "^7.24.0",
7273
"eslint-config-prettier": "^8.5.0",

‎src/generated/contracts/index.js‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
11
import { FlowManagerTemplate, deployFlowManager } from "./FlowManager";
2-
3-
export default {
4-
FlowManagerTemplate,
5-
deployFlowManager,
6-
};
2+
export { FlowManagerTemplate, deployFlowManager };
3+
export default { FlowManagerTemplate, deployFlowManager };
4+

‎src/generated/index.js‎

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,6 @@
11
import contracts from "./contracts";
2-
import scripts from "./scripts";
3-
import transactions from "./transactions";
4-
5-
export default {
6-
contracts,
7-
scripts,
8-
transactions,
9-
};
2+
import scripts from "./scripts";
3+
import transactions from "./transactions";
4+
export { contracts, scripts, transactions };
5+
export default { contracts, scripts, transactions };
6+

‎src/generated/scripts/index.js‎

Lines changed: 39 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,40 @@
11
import { checkManagerTemplate, checkManager } from "./checkManager";
2-
import { getAccountAddressTemplate, getAccountAddress } from "./getAccountAddress";
3-
import { getBalanceTemplate, getBalance } from "./getBalance";
4-
import { getBlockOffsetTemplate, getBlockOffset } from "./getBlockOffset";
5-
import { getContractAddressTemplate, getContractAddress } from "./getContractAddress";
6-
import { getManagerAddressTemplate, getManagerAddress } from "./getManagerAddress";
7-
import { getTimestampOffsetTemplate, getTimestampOffset } from "./getTimestampOffset";
8-
9-
export default {
10-
checkManagerTemplate,
11-
checkManager,
12-
getAccountAddressTemplate,
13-
getAccountAddress,
14-
getBalanceTemplate,
15-
getBalance,
16-
getBlockOffsetTemplate,
17-
getBlockOffset,
18-
getContractAddressTemplate,
19-
getContractAddress,
20-
getManagerAddressTemplate,
21-
getManagerAddress,
22-
getTimestampOffsetTemplate,
23-
getTimestampOffset,
24-
};
2+
import { getAccountAddressTemplate, getAccountAddress } from "./getAccountAddress";
3+
import { getBalanceTemplate, getBalance } from "./getBalance";
4+
import { getBlockOffsetTemplate, getBlockOffset } from "./getBlockOffset";
5+
import { getContractAddressTemplate, getContractAddress } from "./getContractAddress";
6+
import { getManagerAddressTemplate, getManagerAddress } from "./getManagerAddress";
7+
import { getTimestampOffsetTemplate, getTimestampOffset } from "./getTimestampOffset";
8+
export {
9+
checkManagerTemplate,
10+
checkManager,
11+
getAccountAddressTemplate,
12+
getAccountAddress,
13+
getBalanceTemplate,
14+
getBalance,
15+
getBlockOffsetTemplate,
16+
getBlockOffset,
17+
getContractAddressTemplate,
18+
getContractAddress,
19+
getManagerAddressTemplate,
20+
getManagerAddress,
21+
getTimestampOffsetTemplate,
22+
getTimestampOffset,
23+
};
24+
export default {
25+
checkManagerTemplate,
26+
checkManager,
27+
getAccountAddressTemplate,
28+
getAccountAddress,
29+
getBalanceTemplate,
30+
getBalance,
31+
getBlockOffsetTemplate,
32+
getBlockOffset,
33+
getContractAddressTemplate,
34+
getContractAddress,
35+
getManagerAddressTemplate,
36+
getManagerAddress,
37+
getTimestampOffsetTemplate,
38+
getTimestampOffset,
39+
};
40+

‎src/generated/transactions/createAccount.js‎

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -9,27 +9,27 @@ import {
99
} from '@onflow/flow-cadut'
1010

1111
export const CODE = `
12-
import FlowManager from 0x01
13-
14-
transaction (_ name: String?, pubKey: [String], manager: Address) {
15-
prepare( admin: AuthAccount) {
16-
let newAccount = AuthAccount(payer:admin)
17-
for key in pubKey {
18-
newAccount.addPublicKey(key.decodeHex())
19-
}
20-
21-
if name != nil {
22-
let linkPath = FlowManager.accountManagerPath
23-
let accountManager = getAccount(manager)
24-
.getCapability(linkPath)!
25-
.borrow<&FlowManager.Mapper>()!
26-
27-
// Create a record in account database
28-
let address = newAccount.address
29-
accountManager.setAddress(name!, address: address)
30-
}
31-
}
32-
}
12+
import FlowManager from 0x01
13+
14+
transaction (_ name: String?, pubKey: [String], manager: Address) {
15+
prepare( admin: AuthAccount) {
16+
let newAccount = AuthAccount(payer:admin)
17+
for key in pubKey {
18+
newAccount.addPublicKey(key.decodeHex())
19+
}
20+
21+
if name != nil {
22+
let linkPath = FlowManager.accountManagerPath
23+
let accountManager = getAccount(manager)
24+
.getCapability(linkPath)!
25+
.borrow<&FlowManager.Mapper>()!
26+
27+
// Create a record in account database
28+
let address = newAccount.address
29+
accountManager.setAddress(name!, address: address)
30+
}
31+
}
32+
}
3333
3434
`;
3535

‎src/generated/transactions/index.js‎

Lines changed: 49 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,50 @@
11
import { createAccountTemplate, createAccount } from "./createAccount";
2-
import { deployContractTemplate, deployContract } from "./deployContract";
3-
import { initManagerTemplate, initManager } from "./initManager";
4-
import { mintTokensTemplate, mintTokens } from "./mintTokens";
5-
import { registerContractTemplate, registerContract } from "./registerContract";
6-
import { scratchTemplate, scratch } from "./scratch";
7-
import { setBlockOffsetTemplate, setBlockOffset } from "./setBlockOffset";
8-
import { setTimestampOffsetTemplate, setTimestampOffset } from "./setTimestampOffset";
9-
import { updateContractTemplate, updateContract } from "./updateContract";
10-
11-
export default {
12-
createAccountTemplate,
13-
createAccount,
14-
deployContractTemplate,
15-
deployContract,
16-
initManagerTemplate,
17-
initManager,
18-
mintTokensTemplate,
19-
mintTokens,
20-
registerContractTemplate,
21-
registerContract,
22-
scratchTemplate,
23-
scratch,
24-
setBlockOffsetTemplate,
25-
setBlockOffset,
26-
setTimestampOffsetTemplate,
27-
setTimestampOffset,
28-
updateContractTemplate,
29-
updateContract,
30-
};
2+
import { deployContractTemplate, deployContract } from "./deployContract";
3+
import { initManagerTemplate, initManager } from "./initManager";
4+
import { mintTokensTemplate, mintTokens } from "./mintTokens";
5+
import { registerContractTemplate, registerContract } from "./registerContract";
6+
import { scratchTemplate, scratch } from "./scratch";
7+
import { setBlockOffsetTemplate, setBlockOffset } from "./setBlockOffset";
8+
import { setTimestampOffsetTemplate, setTimestampOffset } from "./setTimestampOffset";
9+
import { updateContractTemplate, updateContract } from "./updateContract";
10+
export {
11+
createAccountTemplate,
12+
createAccount,
13+
deployContractTemplate,
14+
deployContract,
15+
initManagerTemplate,
16+
initManager,
17+
mintTokensTemplate,
18+
mintTokens,
19+
registerContractTemplate,
20+
registerContract,
21+
scratchTemplate,
22+
scratch,
23+
setBlockOffsetTemplate,
24+
setBlockOffset,
25+
setTimestampOffsetTemplate,
26+
setTimestampOffset,
27+
updateContractTemplate,
28+
updateContract,
29+
};
30+
export default {
31+
createAccountTemplate,
32+
createAccount,
33+
deployContractTemplate,
34+
deployContract,
35+
initManagerTemplate,
36+
initManager,
37+
mintTokensTemplate,
38+
mintTokens,
39+
registerContractTemplate,
40+
registerContract,
41+
scratchTemplate,
42+
scratch,
43+
setBlockOffsetTemplate,
44+
setBlockOffset,
45+
setTimestampOffsetTemplate,
46+
setTimestampOffset,
47+
updateContractTemplate,
48+
updateContract,
49+
};
50+

0 commit comments

Comments
 (0)