Skip to content
This repository has been archived by the owner on Dec 13, 2019. It is now read-only.

Rename appCfAddress to appInstanceId #372

Merged
merged 1 commit into from
Dec 26, 2018

Conversation

snario
Copy link
Contributor

@snario snario commented Dec 26, 2018

For clarity, this PR renames appCfAddress to appInstanceId in the executeAppConditionalTransaction method of the StateChannelTransaction contract:

function executeAppConditionalTransaction(
AppRegistry appRegistry,
NonceRegistry nonceRegistry,
bytes32 uninstallKey,
bytes32 appInstanceId,
Transfer.Terms terms
)

@snario snario added 📦 Contracts code related to packages/contracts 🧬 Code Quality labels Dec 26, 2018
@snario snario merged commit 54793be into liam/appInstanceAdjudicator Dec 26, 2018
@snario snario deleted the liam/rename-appcfaddress branch December 26, 2018 12:48
snario added a commit that referenced this pull request Dec 27, 2018
…o facilitate it (#163)

* wip

* wip

* passing tests2

* apps folder tests pass

* lint

* cleaner code

* cleaner code

* install protocol tests

* set state tests

* test improvements

* setup protocol tests

* some fixes

* tests pass for all cf ops

* touch ups

* code cleanup

* start of cleaning up proposer tests

* update waffle

* clean up tests for install proposer

* continue to ensure tests pass

* remove useless file

* remove bad test

* tests for all proposers

* parallelize tests

* rearrange deps

* still wip

* remove warning on yarn

* some cleanups to package

* considerable improvements to code quality in machine

* remove 4447 json network

* checkpointing stuff

* commitment tests passing

* mostly tested machine functionality

* better testing

* make explicit unused files

* nice script stuff

* fix tests after ethers update

* updates

* clean up tests to handle immutable

* code cleanup

* add comment

* remove files that should not be here

* remove files that should not be here

* remove yarn clean

* remove machine dependency on cf.js

* minor readme touch up

* fix lint

* remove bold and normal in build.sh

* Update packages/machine/src/models/state-channel.ts

Co-Authored-By: snario <snario@users.noreply.github.com>

* Update packages/machine/src/ethereum/install.ts

Co-Authored-By: snario <snario@users.noreply.github.com>

* Update packages/machine/src/models/app-instance.ts

Co-Authored-By: snario <snario@users.noreply.github.com>

* move utils to module import

* typo

* add doc

* typo

* replace console.log with tests

* import from ethers/*

* change dependencies to devDepencies for apps package

* switch to resolver map

* type arbitrary state objects better

* use template literals for error messages

* inline Map mutations for cleaner code

* abridge if statement

* Delegatecall -> DelegateCall

* Update packages/machine/src/ethereum/utils/free-balance.ts

Co-Authored-By: snario <snario@users.noreply.github.com>

* remove unused class

* Update packages/machine/src/ethereum/uninstall.ts

Co-Authored-By: snario <snario@users.noreply.github.com>

* Update packages/machine/src/ethereum/uninstall.ts

Co-Authored-By: snario <snario@users.noreply.github.com>

* Update packages/machine/src/ethereum/install.ts

Co-Authored-By: snario <snario@users.noreply.github.com>

* symlink .soliumrc.json

* use ethers module imports some more

* shorten tsconfig in @apps

* add --detectOpenHandles back

* shorten lines in .gitignore

* re-sort .soliumrc.json file

* uncomment critical line in StateChannelTransaction

* Update packages/contracts/contracts/libs/LibStaticCall.sol

Co-Authored-By: snario <snario@users.noreply.github.com>

* better documentation of appStates mapping

* better documentation of appResolutions mapping

* rename _id to id in all .sol files

* better docs on setState method

* remove test:windows because its the same

* re-version @types to 0.0.1

* rename TIMEOUT variable to ONCHAIN_CHALLENGE_TIMEOUT in a test

* import Wallet in constants.ts

* remove some commented out code

* fresh conflict-free yarn.lock file

* rename monotonicSeqNo according to Xuanjis's proposed scheme '#163 (comment)'

* use ReadonlyMap not Readonly<Map

* add ethereum-waffle typescript typings

* remove ts-ignore

* update ethers to 0.4.20

* remove unnecessary build step for @types

* remove some more tsignores

* remove unused imports

* reintroduce script to build types

* add apps to build string

* better variable naming

* fix @types build process

* add ganache-cli to test process of machine

* fix typo

*  undo export of cf

* Add infrastructure to run ganache-cli tests in machine

* Fix ordering of fields in tuple causing encoding to be incorrect

* Fix incorrect block.number / finalizesAt value comparison

* Add MinimumViableMultisig to the migrations (for use with proxyfactory)

* Remove --reset flag on truffle migrate for contracts

* Rename appState to encodedAppState on SetStateCommitment for clarity

* Use encodePacked not encode for getTransactionHash on Multisig

* Add encodedTerms method on AppInstance

* Change default timeouts to 10 not 100 (for tests)

* Update the types folder to correctly export types and enums

* Update yarn.lock

* Working blockchain test

* rename file

* Fix timeout test after value change

* Switch arrow notation to function for encodeTransactions

* Add missing variable usage in test.sh

* more descriptive test description

* Fix a linting error

* add types to front of build.sh string

* use relative importing in contracts as it turns out it is causing double compilation

* fix an incorrect merge from earlier of master

* nearly finished working merge of virtualAppAgreement test

* Remove multisig.ts util file

* testing rename of files to see how git treats the rename

* Rename files to old names to fix git history

* Add build symlink

* ensure tests pass

* fix some linting issues

* update circleci config

* dont delete .env when cleaning

* imrpoved usage of exit signals for bash trap

* ensure circleci runs tests correctly

* update some README

* Update README.md

* Rename truffle.js to truffle-config.js

* Replace ethers usage to always import from module (#364)

* Replace all ethers utils with module imports

* Fixed a few places I missed the first time

* Update rollup for cf.js to include ethers.constants

* Rename appCfAddress to appInstanceId (#372)

* Add @firebase/app-types to devDependencies on node

* fix some linting issues

* Add apps back to build file

* Update packages/machine/test/integration/setup-then-set-state.spec.ts

Co-Authored-By: snario <snario@users.noreply.github.com>

* Revert syntax error from github suggestion

* Remove duplicate code

* yarn.lock

* fix solium to 1.1.8

* update waffle
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
🧬 Code Quality 📦 Contracts code related to packages/contracts
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

1 participant