Merge recent developments for 0.3.0 release - [merged] #379

Closed kwannoel closed 3 years ago

In GitLab by @fahree on Sep 8, 2021, 01:41

Merges merger-0.3.0 -> master

Merge recent branch developments into a 0.3.0 release.

In GitLab by @fahree on Sep 8, 2021, 01:41

assigned to @fahree

In GitLab by @fahree on Sep 8, 2021, 01:48

added 1 commit

7b4b9d39 - Update nixpkgs

Compare with previous version

In GitLab by @fahree on Sep 8, 2021, 02:12

added 87 commits

7b4b9d39...a55319d8 - 8 commits from branch master
e82164ef - glow list-contacts can now use the new glow-contacts database
2be64541 - WIP: More glow-contacts integration
90264eaa - Minor cleanup and some error detection
fa44f3f6 - Working add-, generate-, and remove-identity
03bade1a - Replace identities-file with keypairs-file
af37e7f1 - Identities.<-json method
4e03ae5c - Remove keypair on remove-identity
8caef474 - Depend on glow-contacts gerbil package
2a16f278 - Don't depend on glow-contacts gerbil package
1cd17e6c - Copy glow-contacts/contacts.ss → glow/contacts/db.ss
11ce21c3 - Copy over the rest of glow-contacts
ae593e05 - Fix add- & remove-contact commands
3331fbb3 - Move contacts schema into scheme
5fdea44a - Accept relative initial block numbers for start-interaction
e6c119ff - Add --glow-app and --my-identity options to start-interaction
efbd7dbf - Prefix paths in contacts server error messages
6bcaa77d - Make terminal color codes conditional
07e3e6c8 - UI-driven buy/sell signature support
330e40e7 - Accept "nearest multiple of X" for max initial block
ee317e33 - Kill the glow sub-process on transaction timeout
33c9f215 - Add rps transactions, take pseudo-input from environment
af8cda6e - Add dependency on drewc/ftw package
9ef1cec5 - Store encrypted keys in the contacts database
44c48cf5 - Decrypt secret keys from the contacts database
2d63dd1a - Excise JSON keypairs file
74495b3a - Read random bytes directly
34b5ae69 - Look up secret key ciphers by name
12377d5c - Use &add-deposit! to show it doesn't "do" the deposit
8ad4fa67 - consensus-code-generator: Ether -> (lookup-native-asset)
076c09e8 - broken: Use native-asset .commit-withdraw! method instead of &withdraw!
67c2c5f2 - Move &define-commit-contract-call/simple to glow
05243f88 - add StaticBlockCtx
0221ff1f - Program InteractionInfo participant-names
7fbc86d4 - broken: use StaticBlockCtx for withdraw
71629453 - use tmp100 for asset method calls
aa8040ad - asset .commit-withdraw! sub-balance argument
f6be93e3 - rename evm deposit and balance variables
a58702e3 - broken: multiple deposits/withdraws/balances
29633c14 - create-frame-variables: add other balance variables
473622e2 - start multiple assets in participant-runtime
73293e87 - compiler: asset pseudo-records
23592608 - start asset_swap.glow
bd21f182 - start asset-swap-integrationtest
031be0d1 - asset-swap-integrationtest: comment some missing pieces
b806d1d7 - Add some logic to pre-approve deposits.
c1d9c594 - Use the numeric-indexed functions from gerbil-ethereum
173b1806 - Store reified variables in static block context.
ced2ae35 - Avoid separate tables for different ways to access vars.
f5767958 - Switch to &add-var!/&sub-var!
3901252d - Add a TODO comment.
9f9cbc8e - Correctly subtract each balance variable on commit.
ac1879a2 - Move MAX_{ASSETS,PARTICIPANTS} to gerbil-ethereum.
1526640e - Make frame-variables/consecutive-addresses a regular function.
ef5b13cc - check-consecutive-addresses: better error messages.
79b96d46 - Track balances for all assets.
5af6f6c2 - StaticBlockCtx: better method names.
56454744 - Remember to account for deposits in update-contract-balances
f16c8d03 - Add missing stack push of amount.
d97c7cdd - Asset swap test: don't use the same quantity of both assets.
ae3bdb46 - Use assert-equal! instead of assert! (equal? ...)
b111230b - Add missing call to (read-environment) in test.
7b1be960 - Remove stale TODO.
8b6aa6b5 - Add missing checks to asset swap test.
25eb56a7 - Don't explicitly pass in tmp100@.
bccab3f1 - Move &sub-var! call inside .commit-withdraw!
c5861637 - Comment fixes.
9aadf7ff - Comment out accidentally committed debugging feature.
27d44c44 - Use explicit "-p" option to provide port to nc
606fd0ed - Check for keys in keypairs
2361bf96 - Don't use explicit "-p" option to provide port to nc
5bf0aa37 - Support swap UI transactions
751fbc74 - Compute assets list, including non-native tokens
49af46b0 - Update dependencies
ba381714 - Bump version to 0.3.0
653df538 - Transmit all assets on selfdestruct.
90ed5d1d - Add some TODO comments requested by Fare.
f313be49 - Update installation script & docs
89e93487 - Another future project
6202ba2e - Update nixpkgs

Compare with previous version

In GitLab by @fahree on Sep 8, 2021, 02:12

marked this merge request as draft from 2be64541cc832e4d6de62b409582b286585c76fa

In GitLab by @fahree on Sep 8, 2021, 02:47

added 84 commits

9b4a467b - glow list-contacts can now use the new glow-contacts database
47c0037e - WIP: More glow-contacts integration
c279c3ea - Minor cleanup and some error detection
1c26a5fb - Working add-, generate-, and remove-identity
c006feb8 - Replace identities-file with keypairs-file
303eb58b - Identities.<-json method
0a035add - Remove keypair on remove-identity
1ca388e9 - Depend on glow-contacts gerbil package
1d453a8a - Don't depend on glow-contacts gerbil package
c0bde7d8 - Copy glow-contacts/contacts.ss → glow/contacts/db.ss
e95e3175 - Copy over the rest of glow-contacts
7cbfbff0 - Fix add- & remove-contact commands
c0b61742 - Move contacts schema into scheme
b06e348c - Accept relative initial block numbers for start-interaction
f79255a8 - Add --glow-app and --my-identity options to start-interaction
a80fa347 - Prefix paths in contacts server error messages
3cf593d8 - Make terminal color codes conditional
6ba25a64 - UI-driven buy/sell signature support
f02a126b - Accept "nearest multiple of X" for max initial block
e4de359c - Kill the glow sub-process on transaction timeout
385e3281 - Add rps transactions, take pseudo-input from environment
c1fd1110 - Add dependency on drewc/ftw package
fb7e5432 - Use &add-deposit! to show it doesn't "do" the deposit
6d4e0100 - consensus-code-generator: Ether -> (lookup-native-asset)
6872f325 - broken: Use native-asset .commit-withdraw! method instead of &withdraw!
3f839ae7 - Move &define-commit-contract-call/simple to glow
63313649 - add StaticBlockCtx
af631cb3 - Program InteractionInfo participant-names
6898d873 - broken: use StaticBlockCtx for withdraw
3f0ce4ba - use tmp100 for asset method calls
4eb02584 - asset .commit-withdraw! sub-balance argument
7449366f - rename evm deposit and balance variables
11cba463 - broken: multiple deposits/withdraws/balances
8d41d015 - create-frame-variables: add other balance variables
0b39d094 - start multiple assets in participant-runtime
461a6145 - compiler: asset pseudo-records
b7a17b3c - start asset_swap.glow
85db0bcb - start asset-swap-integrationtest
a3b7d3cf - asset-swap-integrationtest: comment some missing pieces
8211f9fb - Store encrypted keys in the contacts database
b561fbfc - Decrypt secret keys from the contacts database
0204751f - Excise JSON keypairs file
fa371a39 - Read random bytes directly
5c916809 - Look up secret key ciphers by name
b6095340 - Add some logic to pre-approve deposits.
8a07972a - Use the numeric-indexed functions from gerbil-ethereum
09087d1e - Store reified variables in static block context.
7b88ab7c - Avoid separate tables for different ways to access vars.
af747fc7 - Switch to &add-var!/&sub-var!
e6d67887 - Add a TODO comment.
e7db06b4 - Correctly subtract each balance variable on commit.
0518f9de - Move MAX_{ASSETS,PARTICIPANTS} to gerbil-ethereum.
01d053fb - Make frame-variables/consecutive-addresses a regular function.
33a8219b - check-consecutive-addresses: better error messages.
979a3f7d - Track balances for all assets.
724aa2ed - StaticBlockCtx: better method names.
c00700ed - Remember to account for deposits in update-contract-balances
1b074186 - Add missing stack push of amount.
ec52b7ef - Asset swap test: don't use the same quantity of both assets.
64c08327 - Use assert-equal! instead of assert! (equal? ...)
a007b325 - Add missing call to (read-environment) in test.
17184305 - Remove stale TODO.
171678a2 - Add missing checks to asset swap test.
0a673811 - Don't explicitly pass in tmp100@.
f0a92888 - Move &sub-var! call inside .commit-withdraw!
9607da5a - Comment fixes.
8a7b9cd6 - Comment out accidentally committed debugging feature.
08ee3f9b - Use explicit "-p" option to provide port to nc
7466beeb - Merge branch 'multi-assets' into afp/keys+multi-assets
0bb380c8 - Check for keys in keypairs
34a0f9ec - Don't use explicit "-p" option to provide port to nc
a1f75942 - Merge branch 'multi-assets' into afp/keys+multi-assets
b3ead79c - Support swap UI transactions
46bb40f1 - Transmit all assets on selfdestruct.
0f256d20 - Compute assets list, including non-native tokens
b01fd8e8 - Add some TODO comments requested by Fare.
531d9b5a - Update installation script & docs
e017f37f - Another future project
5d51b83a - Update dependencies
6b61591a - Bump version to 0.3.0
057b56ba - Merge remote-tracking branch 'origin/multi-assets' into merger
98878dc9 - Merge branch 'master' into merger
7b4b9d39 - Update nixpkgs
1ce02fec - CI: don't force a rebase

Compare with previous version

In GitLab by @fahree on Sep 8, 2021, 02:48

marked this merge request as ready

In GitLab by @fahree on Sep 8, 2021, 03:55

added 1 commit

096e882f - Don't use nc option -p

Compare with previous version

In GitLab by @fahree on Sep 8, 2021, 04:09

mentioned in commit f52c97f4a002533b059b1bf7cbe9905d373f1e9a

In GitLab by @fahree on Sep 8, 2021, 05:10

mentioned in merge request !171

In GitLab by @plotnick on Sep 8, 2021, 05:45

mentioned in merge request !167

In GitLab by @plotnick on Sep 8, 2021, 05:46

mentioned in merge request !162

kwannoel / urban-octo-carnival

Merge recent developments for 0.3.0 release - [merged] #379